Merge revisions 35951:35992 from trunk.

svn path=/branches/kill-bonobo/; revision=35994
author: Matthew Barnes <mbarnes@src.gnome.org> 2008-08-15 04:19:12 +0800
committer: Matthew Barnes <mbarnes@src.gnome.org> 2008-08-15 04:19:12 +0800
commit: 7ade227e6409c98a4010992450e111cf7bb10520 (patch)
tree: bdd716d894ae2f3b1affaa6bb68950a89441db13 /po
parent: cca29c3424aede2bb3c9ec5a6d255ce490d3511b (diff)
download: gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar
gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.gz
gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.bz2
gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.lz
gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.xz
gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.zst
gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.zip
6 files changed, 15544 insertions, 13536 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 1e40d888cd..34eeeaaa98 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,39 @@
+2008-08-14  Shankar Prasad  <svenkate@redhat.com>
+
+	* kn.po: Updated Kannada Translation.
+
+2008-08-13  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-08-13  Shankar Prasad  <svenkate@redhat.com>
+
+	* kn.po: Updated Kannada Translation.
+
+2008-08-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+
+	* es.po: Updated Spanish translation
+
+2008-08-12  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-12  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	 gl.po: Updated Galician translation
+
+2008-08-12  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-08-11  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2008-08-11  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation
+
 2008-08-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
         * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
@@ -13,7 +49,7 @@
 
 2008-08-07  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	 gl.po: Updated Galician translation
+	* gl.po: Updated Galician translation
 
 2008-08-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
diff --git a/po/es.po b/po/es.po
index dc8eb4c181..aaf50c1e30 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,7 +2,6 @@
 # Copyright © 2000-2002, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 #
-#: ../shell/main.c:683
 # Carlos Perelló Marín <carlos@gnome-db.org>, 2000-2001.
 # Héctor García Álvarez <hector@scouts-es.org>, 2000-2002.
 # Ismael Olea <ismael@olea.org>, 2001, (revisiones) 2003.
@@ -11,16 +10,17 @@
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2003 (revisión).
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004, 2005, 2006.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008.
+#: ../shell/main.c:683
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-07 16:19+0000\n"
-"PO-Revision-Date: 2008-08-07 18:34+0200\n"
+"POT-Creation-Date: 2008-08-12 10:37+0000\n"
+"PO-Revision-Date: 2008-08-12 14:52+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"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type:  text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
@@ -158,7 +158,7 @@ msgid "calendar view for one or more days"
 msgstr "vista de calendario para uno o más días"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:758
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A, %e de %b de %Y"
 
@@ -169,7 +169,7 @@ msgstr "%A, %e 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:761
+#: ../calendar/gui/calendar-component.c:760
 #: ../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 +178,9 @@ msgstr "%a, %e 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:763
-#: ../calendar/gui/calendar-component.c:768
-#: ../calendar/gui/calendar-component.c:770
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a, %e de %b de %Y"
 
@@ -188,10 +188,10 @@ msgstr "%a, %e de %b de %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:782
-#: ../calendar/gui/calendar-component.c:789
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:797
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%e de %B de %Y"
 
@@ -201,7 +201,7 @@ msgstr "%e 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:787
+#: ../calendar/gui/calendar-component.c:786
 #: ../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"
@@ -423,7 +423,7 @@ msgstr "No es posible autenticar con el servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Falló al borrar el contacto"
 
@@ -450,7 +450,8 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "La libreta de direcciones de Evolution ha terminado inesperadamente."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid "The image you have selected is large. Do you want to resize and store it?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "La imagen que ha seleccionado es grande. ¿Quiere redimensionarla y "
 "almacenarla?"
@@ -528,7 +529,8 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:35
 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."
+msgstr ""
+"No tiene permisos para borrar este contacto en esta Libreta de direcciones."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -537,7 +539,8 @@ msgid ""
 msgstr "Ha modificado este contacto. ¿Desea guardar estos cambios?"
 
 #: ../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 ""
 "Los contactos para {0} no estarán disponibles hasta que Evolution se "
 "reinicie."
@@ -608,8 +611,8 @@ msgstr "Configure el autocompletado aquí"
 
 #. 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
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
@@ -636,7 +639,7 @@ msgid "Evolution Address Book component"
 msgstr "Componente de libreta de direcciones de Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Control de gestión de certificados S/MIME de Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -651,13 +654,13 @@ msgstr "Gestione sus certificados S/MIME aquí"
 #. 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/calendar-component.c:236
+#: ../calendar/gui/memos-component.c:199 ../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
+#: ../calendar/gui/tasks-component.c:195 ../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
+#: ../mail/message-list.c:1457
 msgid "On This Computer"
 msgstr "En este equipo"
 
@@ -670,10 +673,10 @@ msgstr "En este equipo"
 #: ../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/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:208 ../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/migration.c:1099 ../calendar/gui/tasks-component.c:204
 #: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Privado"
@@ -740,13 +743,13 @@ msgstr "Copiar la li_breta localmente para trabajar desconectado"
 #: ../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
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Libreta de direcciones"
@@ -766,7 +769,7 @@ msgid "Details"
 msgstr "Detalles"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:965
+#: ../mail/em-folder-browser.c:982
 msgid "Searching"
 msgstr "Búsqueda"
 
@@ -785,9 +788,9 @@ msgid "Migrating..."
 msgstr "Migrando…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "Migrando «%s»:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
@@ -841,67 +844,72 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus datos Pilot Sync…"
 
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar la carpeta «%s» a:"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "Renombrar carpeta"
 
-#: ../addressbook/gui/component/addressbook-view.c:438
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "Los nombres de carpetas no pueden contener el carácter «/»"
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "Libreta de direcciones _nueva"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 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
+#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/calendar-component.c:619
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1696 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
 #: ../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 "_Borrar"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-msgid "_Properties..."
-msgstr "_Propiedades…"
+#: ../addressbook/gui/component/addressbook-view.c:949
+#: ../calendar/gui/calendar-component.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Propiedades"
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Selector de origen de contactos"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accediendo al servidor LDAP anónimamente"
 
-#: ../addressbook/gui/component/addressbook.c:200
+#: ../addressbook/gui/component/addressbook.c:207
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "No es posible autenticar.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
+#: ../addressbook/gui/component/addressbook.c:214
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduzca la contraseña para %s (usuario %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
 #: ../plugins/google-account-setup/google-source.c:498
 #: ../plugins/publish-calendar/publish-calendar.c:190
@@ -1029,8 +1037,10 @@ msgid "Email address"
 msgstr "Dirección de correo-e"
 
 #: ../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."
+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:21
 msgid "Find Possible Search Bases"
@@ -1341,7 +1351,7 @@ msgid "Image"
 msgstr "Imagen"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1354,7 +1364,7 @@ msgid "Nic_kname:"
 msgstr "Apo_do:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
@@ -1394,8 +1404,8 @@ msgid "_Birthday:"
 msgstr "_Cumpleaños:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:788
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Calendario:"
@@ -1484,15 +1494,15 @@ msgstr "_Dónde:"
 msgid "_Zip/Postal Code:"
 msgstr "_Código postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Dirección"
 
-#: ../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-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #: ../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
@@ -1507,975 +1517,975 @@ msgstr "Dirección"
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Afganistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Argelia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Antártida"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "Antigua y Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Austria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Azerbaiyán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Bután"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia y Herzegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Isla Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Territorios británicos en el océano Indico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Sultanato de Brunei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Camboya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Camerún"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Islas Caimán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "República Central Africana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Chad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Isla de Navidad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Isla Cocos (Keeling)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Comores"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, República Democrática del"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Islas Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Costa de Marfil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Croacia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Egipto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Guinea Ecuatorial"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Islas Malvinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Islas Feroe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Francia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Guinea Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Territorios Sur Franceses"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Georgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Alemania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Haití"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Islas Heard y McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Holy See"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "Hungría"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "India"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Irán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Iraq"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Isla de Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Italia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Japón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Jordania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazajistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "República Democrática Popular de Corea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "República de Corea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Kirgizstán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Letonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Líbano"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesoto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Libia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Malasia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Islas Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martinica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Mauricio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "México"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "República Moldava"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Mónaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Marruecos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Holanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Antillas holandesas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Nueva Caledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Nueva Zelanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Níger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Islas Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "Islas al Noreste de Mariana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Omán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Pakistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Territorios palestinos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Panamá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Papúa Nueva Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Perú"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Reunión"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Rumanía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Federación Rusa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Sant Kitts y Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "Santa Lucia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "San Vicente y los Granadinos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "Santo Tomé y Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Arabia Saudí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Serbia y Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "Sierra Leona"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Islas Salomón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Sudáfrica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Georgia del Sur y las Islas Sandwich Meridionales"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "España"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre y Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Surinám"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard y Jan Mayen, Islas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Swazilandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Suiza"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Siria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Taiwán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Tajikistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania, República Unida de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trinidad y Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Túnez"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Turquía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turkmenistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Islas Turks y Caicos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "Ucrania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "Emiratos Árabes Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Uzbekistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Islas Vírgenes, Británicas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "Islas Vírgenes, EE. UU."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Islas Wallis y Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Sáhara occidental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Yemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Zambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
 #: ../mail/em-mailer-prefs.c:466
 #: ../plugins/exchange-operations/exchange-delegates.c:952
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
@@ -2487,35 +2497,35 @@ msgstr "Zimbabwe"
 msgid "Name"
 msgstr "Nombre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "Mensajería AOL"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 #: ../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:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Mensajería Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Mensajería Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 #: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:111
 msgid "Service"
 msgstr "Servicio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
 #: ../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
@@ -2523,7 +2533,7 @@ msgstr "Servicio"
 msgid "Location"
 msgstr "Lugar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "Usuario"
 
@@ -2808,7 +2818,8 @@ msgstr "_Nombre de la lista:"
 
 #: ../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 "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
+msgstr ""
+"_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "Contact List Members"
@@ -2822,7 +2833,7 @@ msgstr "_Miembros"
 #: ../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-addressbook-view.c:212
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
 #: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
@@ -2889,14 +2900,14 @@ msgid "Email"
 msgstr "Correo-e"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
@@ -2917,7 +2928,7 @@ 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:227
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
 #: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
@@ -2940,15 +2951,15 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Error al modificar la tarjeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "El nombre empieza por"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Fuente"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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
@@ -2956,92 +2967,92 @@ msgstr "Fuente"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Guardar como vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1674 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "Contacto _nuevo…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "_Lista de contactos nueva…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "G_uardar como vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Enviar un _mensaje al contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Enviar un _mensaje a la lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Enviar un _mensaje a los contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "Im_primir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "_Copiar a la libreta de direcciones…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver a la libreta de direcciones…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
 #: ../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-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "_Pegar"
 
 #. 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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 #: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Otro error"
@@ -3354,16 +3365,16 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Tiene el cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "_Enviar un mensaje nuevo a…"
 
@@ -3407,7 +3418,7 @@ msgstr "Charla por vídeo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/calendar-component.c:805
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2376
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
@@ -3423,7 +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:114
+#: ../calendar/gui/dialogs/event-editor.c:113
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
@@ -3445,13 +3456,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:2352
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2346
 #: ../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:2353
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2347
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Aniversario"
@@ -3565,7 +3576,12 @@ msgstr "No disponible en modo desconectado"
 msgid "Invalid server version"
 msgstr "Versión del servidor inválida"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Método de autenticación no soportado"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 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 "
@@ -3576,7 +3592,7 @@ msgstr ""
 "uso desconectado. Por favor, cargue la libreta de direcciones una vez en "
 "modo conectado para descargar su contenido"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3585,7 +3601,7 @@ msgstr ""
 "No es posible abrir esta libreta de direcciones. Compruebe que la ruta %s "
 "exista y que tenga permisos para acceder a ella."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3593,7 +3609,7 @@ msgstr ""
 "No es posible abrir esta libreta de direcciones.  Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 "
@@ -3603,7 +3619,7 @@ msgstr ""
 "usar LDAP en Evolution debe instalar un paquete de Evolution con LDAP "
 "activado."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3611,7 +3627,11 @@ msgstr ""
 "No es posible abrir esta libreta de direcciones. Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+msgid "Detailed error:"
+msgstr "Detalle del error:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3624,7 +3644,7 @@ msgstr ""
 "aumente el límite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3637,45 +3657,47 @@ msgstr ""
 "tiempo en las opciones del servidor de directorios para esta libreta\n"
 " de direcciones."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "El backend de esta libreta de direcciones no pudo analizar esta consulta."
+msgstr ""
+"El backend de esta libreta de direcciones no pudo analizar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "El backend para esta libreta de direcciones rehusó a efectuar esta consulta."
+msgstr ""
+"El backend para esta libreta de direcciones rehusó a efectuar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "Esta consulta no se completó con éxito."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "Error al añadir la lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "Error al añadir el contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "Error al modificar la lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "Error al modificar el contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "Error al eliminar la lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "Error al eliminar el contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3690,16 +3712,16 @@ msgstr[1] ""
 "Abrir %d contactos abrirá %d ventanas nuevas también.\n"
 "¿Quiere realmente mostrar todos estos contactos?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
 msgstr "_No mostrar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "Mostrar t_odos los contactos"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3708,65 +3730,65 @@ msgstr ""
 "%s ya existe\n"
 "¿Quiere sobreescribirlo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
 #. 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
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contacto"
 msgstr[1] "contactos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "Seleccione la libreta de direcciones"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr "vCards múltiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
 #, c-format
 msgid "Contact information"
 msgstr "Información de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, c-format
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
@@ -4098,7 +4120,8 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: ../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 ""
 "Error en los argumentos de la línea de comandos, use la opción --help para "
 "ver el uso."
@@ -4169,25 +4192,30 @@ msgstr "Toda la información de estas citas se borrará y no se podrá recuperar
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "Toda la información de estas tareas se borrará y no se podrá recuperar."
+msgstr ""
+"Toda la información de estas tareas se borrará y no se podrá recuperar."
 
 #: ../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 "Toda la información de esta cita se borrará y no se podrá recuperar."
 
 #: ../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 ""
 "Toda la información acerca de esta reunión se borrará y no se podrá "
 "recuperar."
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
-msgstr "Toda la información acerca de esta nota se borrará y no se podrá recuperar."
+msgstr ""
+"Toda la información acerca de esta nota se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
-msgstr "Toda la información acerca de esta tarea se borrará y no se podrá recuperar."
+msgstr ""
+"Toda la información acerca de esta tarea se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -4218,19 +4246,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "¿Seguro que quiere borrar esta cita?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:179
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "¿Seguro que quiere borrar esta reunión?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "¿Seguro que quiere borrar esta nota?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "¿Seguro que quiere borrar esta tarea?"
@@ -4292,7 +4320,8 @@ msgstr ""
 "permitirá aceptar esta tarea."
 
 #: ../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 ""
 "Se enviarán invitaciones por correo-e a todos los participantes y se les "
 "permitirá responder."
@@ -4425,7 +4454,8 @@ msgstr "¿Quiere enviar una notificación de cancelación para esta nota?"
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "¿Quiere enviar a todos los participantes una notificación de cancelación?"
+msgstr ""
+"¿Quiere enviar a todos los participantes una notificación de cancelación?"
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
@@ -4437,11 +4467,13 @@ msgstr "¿Quiere enviar esta tarea a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "¿Quiere enviar información de la reunión actualizada a los participantes?"
+msgstr ""
+"¿Quiere enviar información de la reunión actualizada a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
-msgstr "¿Quiere enviar información actualizada de las tareas a los participantes?"
+msgstr ""
+"¿Quiere enviar información actualizada de las tareas a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:68
 msgid ""
@@ -4520,7 +4552,8 @@ msgstr "No se ha podido iniciar el servidor evolution-data-server"
 #: ../calendar/conduits/calendar/calendar-conduit.c:1629
 #: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
-msgstr "No es posible leer información de la aplicación de calendario del Pilot"
+msgstr ""
+"No es posible leer información de la aplicación de calendario del Pilot"
 
 #: ../calendar/conduits/memo/memo-conduit.c:914
 #: ../calendar/conduits/memo/memo-conduit.c:917
@@ -4547,12 +4580,12 @@ 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:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1403
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Calendarios"
 
@@ -4594,8 +4627,8 @@ msgstr "_Notas"
 
 #: ../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/gnome-cal.c:1702 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
 #: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Notas"
@@ -4603,8 +4636,8 @@ msgstr "Notas"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../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-component.c:539
+#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
@@ -4629,13 +4662,13 @@ msgstr "_Tareas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servicio de notificación por alerta del Calendario de Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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
@@ -4647,7 +4680,7 @@ msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Hora de inicio"
 
@@ -4658,8 +4691,8 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4690,32 +4723,32 @@ msgstr "_Posponer"
 msgid "location of appointment"
 msgstr "lugar de la cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "No hay resumen disponible."
 
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
 #: ../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:1478
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "No hay información del lugar disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Tiene %d alertas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4727,7 +4760,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:1718
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4744,7 +4777,7 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
@@ -4807,14 +4840,16 @@ msgstr "Color de fondo para las tareas que vencen hoy, en formato «#rrggbb»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Color de fondo para las tareas que están retrasadas, en formato «#rrggbb»."
+msgstr ""
+"Color de fondo para las tareas que están retrasadas, en formato «#rrggbb»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Los calendarios ejecutarán alertas durante"
 
 #: ../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 ""
 "Color para dibujar la línea de Marcus Bains en la barra de Tiempo (vacía por "
 "omisión)."
@@ -4833,7 +4868,8 @@ msgstr "Confirmar compactación"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr "Días en los cuales debe indicarse el inicio y fin de las horas de trabajo."
+msgstr ""
+"Días en los cuales debe indicarse el inicio y fin de las horas de trabajo."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
@@ -5012,7 +5048,8 @@ msgstr "Directorio donde guardar los sonidos de las alertas"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
@@ -5036,7 +5073,8 @@ msgstr "Mostrar el visor de la alerta en una bandeja de notificación"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
-msgstr "Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
+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:124
@@ -5050,11 +5088,13 @@ msgstr "Mostrar el panel de vista previa."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
-msgstr "Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
+msgstr ""
+"Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
-msgstr "Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
@@ -5096,7 +5136,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "La hora en que la última alerta sonó, en time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Zona horaria "
 
@@ -5119,7 +5159,8 @@ msgstr ""
 "\"."
 
 #: ../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 ""
 "Unidades para determinar cuándo ocultar tareas, \"minutes\", \"hours\" o "
 "\"days\"."
@@ -5130,11 +5171,13 @@ msgstr "Comienzo de la semana"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
+msgstr ""
+"El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Indica si se debe usar o no la bandeja de notificación para mostrar alertas."
+msgstr ""
+"Indica si se debe usar o no la bandeja de notificación para mostrar alertas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -5159,7 +5202,8 @@ msgstr ""
 "vistas semanales y mensuales."
 
 #: ../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 ""
 "Indica si debe dibujar la línea Marcus Bains (línea a la hora actual) en el "
 "calendario."
@@ -5170,7 +5214,8 @@ msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
-msgstr "Indica si debe establecer un recordatorio predeterminado para las citas."
+msgstr ""
+"Indica si debe establecer un recordatorio predeterminado para las citas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
@@ -5197,7 +5242,8 @@ msgstr ""
 "tareas/reuniones"
 
 #: ../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 ""
 "Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
 "usar am/pm."
@@ -5216,11 +5262,13 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
-msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas."
+msgstr ""
+"Indica si debe mostrar los números de la semana en el navegador de fechas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
-msgstr "Indica si se deben usar la hora del horario de verano al mostrar eventos."
+msgstr ""
+"Indica si se deben usar la hora del horario de verano al mostrar eventos."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
@@ -5246,56 +5294,56 @@ msgstr "Minuto de comienzo de la jornada laboral"
 msgid "daylight savings time"
 msgstr "Hora de verano"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Categoría es"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "El lugar contiene"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Tareas de los próximos 7 días"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Tareas activas"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Tareas fuera de plazo"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Tareas completadas"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Tareas con adjuntos"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Citas de los próximos 7 días"
 
@@ -5332,107 +5380,100 @@ msgstr "días"
 #. 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/calendar-component.c:273
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:232
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "En la web"
 
-#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Cumpleaños y aniversarios"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:324
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Meteorología"
 
-#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "Calendario _nuevo"
 
-#: ../calendar/gui/calendar-component.c:617
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copiar…"
 
-#: ../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:950
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Falló al actualizar calendarios."
 
-#: ../calendar/gui/calendar-component.c:1249
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "No es posible abrir el calendario «%s» para crear acontecimientos y reuniones"
+msgstr ""
+"No es posible abrir el calendario «%s» para crear acontecimientos y reuniones"
 
-#: ../calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay un calendario disponible para crear acontecimientos y reuniones"
 
-#: ../calendar/gui/calendar-component.c:1378
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Selector de origen del calendario"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1595
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1596
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1597
 msgid "Create a new appointment"
 msgstr "Crea una cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1603
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1604
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1605
 msgid "Create a new meeting request"
 msgstr "Crea una solicitud de reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1611
 msgid "New all day appointment"
 msgstr "Cita nueva para todo el día"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1612
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Cita para todo el _día"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1613
 msgid "Create a new all-day appointment"
 msgstr "Crea una cita nueva para todo el día"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1619
 msgid "New calendar"
 msgstr "Calendario nuevo"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1620
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Create a new calendar"
 msgstr "Crea un calendario nuevo"
 
@@ -5594,7 +5635,7 @@ msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:298
+#: ../calendar/gui/dialogs/event-editor.c:297
 msgid "Recurrence"
 msgstr "Repetición"
 
@@ -5682,7 +5723,7 @@ msgstr "Permiso denegado para abrir el calendario"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:602
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Editar alerta"
 
@@ -5796,7 +5837,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "comienzo de cita"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "Acción/Disparador"
 
@@ -5810,12 +5851,12 @@ msgstr "Aña_dir"
 msgid "Alarms"
 msgstr "Alertas"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
 #: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerir mostrar automáticamente el adjunto"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
@@ -5839,7 +5880,8 @@ 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 y %d se reemplazarán por el usuario y el dominio de la dirección de "
 "correo-e.</i>"
@@ -5977,7 +6019,7 @@ msgid "Thursday"
 msgstr "jueves"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
@@ -6051,7 +6093,8 @@ msgstr "_Sáb"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Show appointment end times in week and month view"
-msgstr "_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
+msgstr ""
+"_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Time divisions:"
@@ -6073,7 +6116,8 @@ msgstr "antes de cada cita"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:269
 msgid "Cop_y calendar contents locally for offline operation"
-msgstr "_Copiar el contenido del calendario localmente para trabajar desconectado"
+msgstr ""
+"_Copiar el contenido del calendario localmente para trabajar desconectado"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y task list contents locally for offline operation"
@@ -6123,48 +6167,48 @@ msgstr "Propiedades de lista de notas"
 msgid "New Memo List"
 msgstr "Lista de notas nueva"
 
-#: ../calendar/gui/dialogs/changed-comp.c:58
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Se ha borrado este acontecimiento."
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Se ha borrado esta tarea."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Se ha borrado esta nota."
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Ha hecho cambios. ¿Quiere olvidar esos cambios y cerrar el editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  No ha hecho cambios, ¿quiere cerrar el editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:82
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Este acontecimiento ha cambiado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Esta tarea ha cambiado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Esta nota ha cambiado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Ha realizado cambios. ¿Quiere olvidar esos cambios y actualizar el "
 "editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
@@ -6201,22 +6245,22 @@ msgstr "Mensaje adjunto: %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
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1771
+#: ../composer/e-msg-composer.c:1990
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensaje adjunto"
 msgstr[1] "%d mensajes adjuntos"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
@@ -6430,8 +6474,8 @@ msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de adjuntos"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-page.c:1871
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
@@ -6439,13 +6483,13 @@ msgid "_Remove"
 msgstr "_Quitar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../composer/e-msg-composer.c:1049
+#: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Añadir adjunto…"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../mail/em-format-html-display.c:2194
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Mostrar adjuntos"
 
@@ -6477,55 +6521,55 @@ msgstr "No se puede abrir el destino"
 msgid "Destination is read only"
 msgstr "El destino es de sólo lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:202
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "¿_Borrar este elemento de todos los otros buzones del destinatario?"
 
-#: ../calendar/gui/dialogs/delete-error.c:53
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "No se pudo borrar el acontecimiento debido a un error de CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "No se pudo borrar la tarea debido a un error de CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "No se pudo borrar la nota debido a un error de CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "No se pudo borrar el elemento debido a un error de CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "No se pudo borrar el acontecimiento porque se ha denegado el permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "No se pudo borrar la tarea porque se ha denegado el permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "No se pudo borrar la nota porque se ha denegado el permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "No se pudo borrar el elemento porque se ha denegado el permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "No se pudo borrar el acontecimiento debido a un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "No se pudo borrar la tarea debido a un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "No se pudo borrar el elemento debido a un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "No se pudo borrar el elemento debido a un error"
 
@@ -6542,178 +6586,178 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir un delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:194
 msgid "_Alarms"
 msgstr "_Alertas"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:196
 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
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Recurrence"
 msgstr "_Repetición"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Make this a recurring event"
 msgstr "Convertir en acontecimiento repetitivo"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
 msgid "Insert advanced send options"
 msgstr "Opciones de envío avanzadas"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "All _Day Event"
 msgstr "Acontecimiento para todo el _día"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:220
 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
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
 msgstr "Mostrar hora como _ocupada"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:228
 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
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Free/Busy"
 msgstr "_Disponibilidad"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar información de disponibilidad para los participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-page.c:732
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Este acontecimiento tiene alertas."
 
-#: ../calendar/gui/dialogs/event-page.c:795
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../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:841
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1027
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Acontecimiento sin fecha de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1198
 #: ../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:1209
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "La fecha de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1232
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1239
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "La hora de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/event-page.c:1401
 #: ../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:1408
+#: ../calendar/gui/dialogs/event-page.c:1407
 #: ../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:1433
+#: ../calendar/gui/dialogs/event-page.c:1432
 #: ../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:1873
+#: ../calendar/gui/dialogs/event-page.c:1872
 #: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Añadir"
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No es posible abrir el calendario «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2634
 #: ../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:2915
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:2921
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:2927
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:2940
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../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: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
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
 #: ../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
+#: ../plugins/itip-formatter/itip-formatter.c:2021
 #: ../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
@@ -6741,23 +6785,25 @@ msgid "Custom Alarm:"
 msgstr "Alerta personalizada:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "_Descripción:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Descripción del acontecimiento"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Resu_men:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Alerta"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Description:"
+msgstr "_Descripción:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Hora:"
@@ -6818,10 +6864,6 @@ msgstr "Fecha de ini_cio:"
 msgid "T_o:"
 msgstr "_Para:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Descripción:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
@@ -6831,7 +6873,8 @@ msgstr "_Grupo:"
 #: ../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 acontecimiento que se repite. ¿Qué quiere modificar?"
+msgstr ""
+"Está modificando un acontecimiento que se repite. ¿Qué quiere modificar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
@@ -7068,7 +7111,7 @@ 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:567 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "Alta"
 
@@ -7085,14 +7128,14 @@ 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:569 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1063
 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:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "Normal"
 
@@ -7132,24 +7175,24 @@ msgstr "_Prioridad:"
 msgid "_Web Page:"
 msgstr "Página _web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:111
 msgid "_Status Details"
 msgstr "Detalles de _estado"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:113
 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
+#: ../calendar/gui/dialogs/task-editor.c:121
 #: ../composer/e-composer-actions.c:528
 msgid "_Send Options"
 msgstr "Opciones de _envío"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "Detalles"
 
@@ -7176,17 +7219,13 @@ msgid "Categor_ies..."
 msgstr "_Categorías…"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "De_scripción:"
+msgid "D_ue date:"
+msgstr "Fecha de _vencimiento:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Zona horaria:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "Fecha de _vencimiento:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:392
 #, c-format
@@ -7264,7 +7303,7 @@ 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:3330
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
@@ -7370,8 +7409,8 @@ msgstr "No"
 #: ../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/itip-formatter/itip-formatter.c:409
+#: ../plugins/itip-formatter/itip-formatter.c:2046
 #: ../plugins/plugin-manager/plugin-manager.c:73
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
@@ -7386,27 +7425,27 @@ msgstr "Repetición"
 msgid "Assigned"
 msgstr "Asignado"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2028
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagen-_sin-título.%s"
 
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1675 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "Guardar _como…"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Establecer como _fondo"
 
@@ -7414,7 +7453,7 @@ msgstr "Establecer como _fondo"
 msgid "_Save Selected"
 msgstr "_Guardar seleccionados"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:837
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s…"
@@ -7425,7 +7464,7 @@ 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
+#: ../calendar/gui/e-calendar-view.c:2218
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
@@ -7433,7 +7472,7 @@ 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
+#: ../calendar/gui/e-calendar-view.c:2222
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
@@ -7491,23 +7530,23 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-view.c:668 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
 #: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-view.c:798 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
 #: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../calendar/gui/e-calendar-view.c:1224 ../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:1571
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1657
 msgid "New _Task"
 msgstr "_Tarea nueva"
 
@@ -7516,20 +7555,20 @@ msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
 #: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-view.c:1660 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "_Imprimir…"
 
 #: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-view.c:1680 ../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:1583
-#: ../calendar/gui/e-calendar-view.c:1669
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1682 ../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"
@@ -7596,93 +7635,93 @@ msgstr "Prioridad"
 msgid "Start date"
 msgstr "Fecha de inicio"
 
-#: ../calendar/gui/e-calendar-view.c:1349
+#: ../calendar/gui/e-calendar-view.c:1343
 msgid "Moving items"
 msgstr "Moviendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1351
+#: ../calendar/gui/e-calendar-view.c:1345
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Appointment..."
 msgstr "_Cita nueva…"
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1655
 msgid "New All Day _Event"
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-view.c:1656
 msgid "New _Meeting"
 msgstr "_Reunión nueva"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Current View"
 msgstr "Vista _actual"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1669
 msgid "Select T_oday"
 msgstr "Seleccionar _hoy"
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1670
 msgid "_Select Date..."
 msgstr "_Seleccionar fecha…"
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "Pri_nt..."
 msgstr "_Imprimir…"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1689
 msgid "_Schedule Meeting..."
 msgstr "_Concertar una reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1690
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar…"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1691
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-calendar-view.c:1692 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta repetición _movible"
 
-#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1698 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _repetición"
 
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-calendar-view.c:1699
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2238 ../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:2278
+#: ../calendar/gui/e-calendar-view.c:2272
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -7830,12 +7869,12 @@ msgstr "Error de iCalendar"
 
 #: ../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:344
 #: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:432
 #: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:520
 #: ../plugins/itip-formatter/itip-view.c:521
-#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
@@ -7852,12 +7891,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:2035
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
@@ -7865,7 +7904,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:2041
+#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Declined"
 msgstr "Rehusado"
 
@@ -7878,7 +7917,8 @@ msgstr ""
 "calendarios"
 
 #: ../calendar/gui/e-itip-control.c:1285
-msgid "The task has been canceled, however it could not be found in your task lists"
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "La tarea ha sido cancelada, sin embargo no pudo encontrarse en sus listas de "
 "tareas"
@@ -8074,18 +8114,20 @@ msgstr "El objeto es inválido y no puede ser actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Esta respuesta no es de un participante. ¿Desea añadirlo como participante?"
+msgstr ""
+"Esta respuesta no es de un participante. ¿Desea añadirlo como participante?"
 
 #: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "El estado del participante no pudo actualizarse debido a un estado inválido\n"
+msgstr ""
+"El estado del participante no pudo actualizarse debido a un estado inválido\n"
 
 #: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Estado del participante actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado del participante no pudo actualizarse porque ya no existe el "
@@ -8245,7 +8287,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:2044
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -8422,7 +8464,7 @@ msgstr "Terminando tareas…"
 msgid "Expunging"
 msgstr "Compactando"
 
-#: ../calendar/gui/e-timezone-entry.c:130
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Seleccione la zona horaria"
 
@@ -8583,79 +8625,79 @@ msgstr "Información de iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante en el acontecimiento."
 
-#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "Lista de notas _nueva"
 
-#: ../calendar/gui/memos-component.c:545
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
-#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d seleccionado"
 msgstr[1] ", %d seleccionados"
 
-#: ../calendar/gui/memos-component.c:594
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "Fallo al actualizar las notas."
 
-#: ../calendar/gui/memos-component.c:954
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "No es posible abrir la lista de notas «%s» para crear acontecimientos y "
 "reuniones"
 
-#: ../calendar/gui/memos-component.c:967
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "No hay un calendario disponible para crear notas"
 
-#: ../calendar/gui/memos-component.c:1077
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "Selector de origen de notas"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1259
 msgid "New memo"
 msgstr "Nota nueva"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1260
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Nota"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1261
 msgid "Create a new memo"
 msgstr "Crea una nota nueva"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1267
 msgid "New shared memo"
 msgstr "Nota nueva compartida"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1268
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "Nota _compartida"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1269
 msgid "Create a shared new memo"
 msgstr "Crea una nota compartida nueva"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1275
 msgid "New memo list"
 msgstr "Lista de notas nueva"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1276
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "_Lista de notas"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1277
 msgid "Create a new memo list"
 msgstr "Crea una lista de notas nueva"
 
@@ -8695,7 +8737,8 @@ msgstr ""
 #: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "No es posible migrar la configuración antigua desde evolution/config.xmldb"
+msgstr ""
+"No es posible migrar la configuración antigua desde evolution/config.xmldb"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:804
@@ -8920,72 +8963,72 @@ msgstr "Contactos: "
 msgid "Upcoming Appointments"
 msgstr "Eventos próximos"
 
-#: ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "Lista de tareas _nueva"
 
-#: ../calendar/gui/tasks-component.c:536
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: ../calendar/gui/tasks-component.c:585
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "Fallo al actualizar las tareas."
 
-#: ../calendar/gui/tasks-component.c:942
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "No es posible abrir la lista de tareas «%s» para crear acontecimientos y "
 "reuniones"
 
-#: ../calendar/gui/tasks-component.c:955
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "No hay un calendario disponible para crear tareas"
 
-#: ../calendar/gui/tasks-component.c:1066
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "Selector de origen de tareas"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1324
 msgid "New task"
 msgstr "Tarea nueva"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1325
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1326
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1332
 msgid "New assigned task"
 msgstr "Nueva tarea asignada"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1333
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarea _asignada"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Create a new assigned task"
 msgstr "Crea una tarea nueva asignada"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1340
 msgid "New task list"
 msgstr "Lista de tareas nueva"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1341
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Lista de ta_reas"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
@@ -9001,7 +9044,7 @@ msgstr ""
 "\n"
 "¿Borrar realmente esas tareas?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
@@ -9036,7 +9079,7 @@ msgstr "Reuniones y citas"
 
 #: ../calendar/importers/icalendar-importer.c:331
 #: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Apertura del calendario"
 
@@ -10631,9 +10674,9 @@ msgstr "_Cerrar"
 msgid "Close the current file"
 msgstr "Cierra el archivo actual"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1337
 #: ../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-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Imprimir…"
@@ -10864,17 +10907,18 @@ msgstr "Pulse aquí para seleccionar carpetas en las que publicar"
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../composer/e-msg-composer.c:873
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:872
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No es posible firmar el mensaje saliente: No hay establecido un certificado "
 "de firma para esta cuenta"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10882,23 +10926,23 @@ 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:1912
-#: ../mail/em-format-html-display.c:2402 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
+#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Adjunto"
 msgstr[1] "Adjuntos"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "Ocultar _barra de adjuntos"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:4056
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10922,11 +10966,13 @@ msgstr "Todas las cuentas han sido eliminadas."
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "¿Seguro que quiere descartar el mensaje titulado «{0}» que está redactando?"
+msgstr ""
+"¿Seguro que quiere descartar el mensaje titulado «{0}» que está redactando?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
+msgstr ""
+"Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
 
 #: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
@@ -11000,7 +11046,8 @@ msgstr "Opciones de envío no disponibles."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "El archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
+msgstr ""
+"El archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid ""
@@ -11124,10 +11171,12 @@ msgstr "Ocurrió un error al imprimir"
 
 #: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
-msgstr "El sistema de impresión informó de los siguientes detalles sobre el error:"
+msgstr ""
+"El sistema de impresión informó de los siguientes detalles sobre el error:"
 
 #: ../e-util/e-print.c:171
-msgid "The printing system did not report any additional details about the error."
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr ""
 "El sistema de impresión no proporcionó ningún detalle adicional acerca del "
 "error."
@@ -11531,7 +11580,8 @@ msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
 #: ../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 ""
 "Configure las preferencias de correo incluyendo seguridad y visualización de "
 "mensajes, aquí"
@@ -11576,7 +11626,7 @@ 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:612
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
 #: ../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
@@ -11910,7 +11960,7 @@ msgstr "Reproducir un sonido"
 
 #. 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
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Leído"
 
@@ -11984,7 +12034,7 @@ msgstr "Parar de procesar"
 
 #: ../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
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -12043,11 +12093,11 @@ msgstr "Mensajes importantes"
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son SPAM"
 
-#: ../mail/em-folder-browser.c:1153
+#: ../mail/em-folder-browser.c:1170
 msgid "Account Search"
 msgstr "Búsqueda en la cuenta"
 
-#: ../mail/em-folder-browser.c:1206
+#: ../mail/em-folder-browser.c:1223
 msgid "All Account Search"
 msgstr "Búsqueda en todas las cuentas"
 
@@ -12158,12 +12208,12 @@ msgstr "Moviendo la carpeta %s"
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
@@ -12172,11 +12222,11 @@ msgstr "Copiando los mensajes a la carpeta %s"
 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:1003 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
@@ -12214,206 +12264,206 @@ msgstr "Enviar correos pe_ndientes"
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando «%s» a «%s»"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta «%s»"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Ha fallado el borrado del correo"
 
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../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:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../ui/evolution-mail-message.xml.h:109
 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:1342 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo…"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta…"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta…"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Marcar como no _importante"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Marcar como _SPAM"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _no SPAM"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimiento…"
 
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
 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:1362 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Ninguna"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "Etiqueta _nueva"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 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:1375
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Carpeta de búsqueda según el a_sunto"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Carpeta de búsqueda según el re_mitente"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Carpeta de búsqueda según los des_tinatarios"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filtro según el _asunto"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filtro según el _remitente"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filtro según los _destinatarios"
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
 #. 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
+#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
 #: ../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:2531
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "No se pudo obtener el mensaje"
 
-#: ../mail/em-folder-view.c:2550
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Obteniendo mensaje…"
 
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "Ll_amar a…"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Crear carpeta de _búsqueda"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Desde esta dirección"
 
-#: ../mail/em-folder-view.c:2814
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_A esta dirección"
 
-#: ../mail/em-folder-view.c:3311
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: ../mail/em-folder-view.c:3323
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Pulse para llamar a %s"
 
-#: ../mail/em-folder-view.c:3328
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Pulse para ocultar/mostrar las direcciones"
 
@@ -12560,79 +12610,79 @@ msgstr "_Ver certificado"
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:1370
+#: ../mail/em-format-html-display.c:1371
 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:1378
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1381
+#: ../mail/em-format-html-display.c:1382
 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:1459
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "_Ajustar al ancho"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _original"
 
-#: ../mail/em-format-html-display.c:1982
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Guarda los adjuntos como"
 
-#: ../mail/em-format-html-display.c:1986
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Seleccione la carpeta donde guardar todos los adjuntos"
 
-#: ../mail/em-format-html-display.c:2037
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_Guardar seleccionados…"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2104
+#: ../mail/em-format-html-display.c:2105
 #, 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:2111 ../mail/em-format-html-display.c:2200
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "_Guardar"
 
-#: ../mail/em-format-html-display.c:2122
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "Guardar _todo"
 
-#: ../mail/em-format-html-display.c:2196
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Sin adjunto"
 
-#: ../mail/em-format-html-display.c:2337 ../mail/em-format-html-display.c:2375
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:2339
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:2394
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "Abrir _con"
 
-#: ../mail/em-format-html-display.c:2465
+#: ../mail/em-format-html-display.c:2468
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12729,7 +12779,7 @@ msgstr "Este mensaje lo envió <b>%s</b> en nombre de <b>%s</b>"
 
 #: ../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
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "De"
 
@@ -12842,8 +12892,10 @@ msgstr "El complemento %s está disponible y el binario está instalado."
 #. 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 "El complemento %s no está disponible. Compruebe si el paquete está instalado."
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+"El complemento %s no está disponible. Compruebe si el paquete está instalado."
 
 #: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
@@ -12859,11 +12911,6 @@ msgstr "Tareas pendientes"
 msgid "Later"
 msgstr "Más tarde"
 
-#: ../mail/em-migrate.c:1247
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migrando «%s»:"
-
 #: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
@@ -12936,17 +12983,17 @@ msgstr ""
 "No es posible leer la configuración de la instalación anterior de Evolution, "
 "«evolution/config.xmldb» no existe o está corrompido."
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Responder al remitente"
 
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:858
 msgid "_Add to Address Book"
 msgstr "_Añadir a la libreta de direcciones"
 
@@ -13029,7 +13076,8 @@ msgstr "Siempre solicitar confirmación de lectura"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Tiempo en segundos que deberá mostrarse el error en la barra de estado."
+msgstr ""
+"Tiempo en segundos que deberá mostrarse el error en la barra de estado."
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
@@ -13175,7 +13223,8 @@ msgstr ""
 
 #: ../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"
+msgstr ""
+"Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
 
 #: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
@@ -13409,7 +13458,8 @@ msgstr "Lista de cabeceras personalizadas y si están activadas."
 
 #: ../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."
+msgstr ""
+"Lista de los códigos de diccionario usados para la corrección ortográfica."
 
 #: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
@@ -13518,12 +13568,14 @@ 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:100
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un mensaje sin un asunto."
 
 #: ../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"
+msgstr ""
+"Preguntar para comprobar si el usuario quiere desconectarse inmediatamente"
 
 #: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
@@ -13935,7 +13987,7 @@ msgstr "Importador de carpetas en formato buzón de Berkeley"
 msgid "Importing mailbox"
 msgstr "Importando buzón de correo"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando «%s»"
@@ -14119,7 +14171,7 @@ msgstr "Nivel de sucesos"
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2435
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensajes"
@@ -14502,7 +14554,8 @@ msgid "No _Proxy for:"
 msgstr "Sin _proxy para:"
 
 #: ../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 ""
 "Nota: El guión bajo en el nombre de la etiqueta se usa como un identificador "
 "mnemónico en el menú."
@@ -14700,7 +14753,7 @@ msgstr "_Usuario:"
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
 #: ../plugins/google-account-setup/google-source.c:678
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
@@ -14742,7 +14795,8 @@ msgstr "Conexión _directa a Internet"
 
 #: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
+msgstr ""
+"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
@@ -14886,7 +14940,7 @@ msgstr "_Buscar:"
 msgid "Find in Message"
 msgstr "Buscar en el mensaje"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "Marcar para seguimiento"
 
@@ -14985,11 +15039,11 @@ msgstr "Enviando mensaje %d de %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Falló al enviar %d de %d mensajes"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Completado."
 
@@ -15128,27 +15182,27 @@ msgstr "Preparando la cuenta «%s» para desconexión"
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: ../mail/mail-send-recv.c:182
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Cancelando…"
 
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: ../mail/mail-send-recv.c:396
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:505
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Actualizando…"
 
-#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Esperando…"
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
@@ -15267,7 +15321,8 @@ msgstr ""
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr "Ya existe una firma con el nombre «{0}». Especifique un nombre diferente."
+msgstr ""
+"Ya existe una firma con el nombre «{0}». Especifique un nombre diferente."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -15286,8 +15341,10 @@ msgid "Are you sure you want to delete this account?"
 msgstr "¿Seguro que quiere borrar esta cuenta?"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "¿Seguro que quiere desactivar esta esta cuenta y borrar todos sus proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"¿Seguro que quiere desactivar esta esta cuenta y borrar todos sus proxies?"
 
 #: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
@@ -15467,7 +15524,8 @@ msgstr "No desactivar"
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
-msgstr "¿Quiere sincronizar localmente las carpetas marcadas para uso en desconexión?"
+msgstr ""
+"¿Quiere sincronizar localmente las carpetas marcadas para uso en desconexión?"
 
 #: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
@@ -15736,8 +15794,10 @@ msgstr ""
 "está activada"
 
 #: ../mail/mail.error.xml.h:115
-msgid "This message cannot be sent because you have not specified any recipients"
-msgstr "Este mensaje no puede enviarse porque no ha especificado ningún destinatario"
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+"Este mensaje no puede enviarse porque no ha especificado ningún destinatario"
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
@@ -15847,79 +15907,79 @@ msgstr "C_ompactar"
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "La más baja"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "Más baja"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "Más alta"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "La más alta"
 
-#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1596 ../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
+#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1624 ../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
+#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %e %l:%M %p"
 
-#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%e %b %Y"
 
 #. 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
+#: ../mail/message-list.c:3897 ../mail/message-list.c:4354
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: ../mail/message-list.c:4179
+#: ../mail/message-list.c:4204
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15927,7 +15987,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:4181
+#: ../mail/message-list.c:4206
 msgid "There are no messages in this folder."
 msgstr "No hay mensajes en esta carpeta."
 
@@ -15960,39 +16020,39 @@ msgstr "Mensajes enviados"
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Llamar"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "No reenviar"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Seguimiento"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "Para su información"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Revisar"
 
@@ -16017,6 +16077,10 @@ msgid "Subject contains"
 msgstr "El asunto contiene"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "El asunto o el destinatarios contiene"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "El asunto o el remitente contiene"
 
@@ -16100,7 +16164,8 @@ msgstr "_Reiniciar Evolution después del respaldo"
 
 #: ../plugins/backup-restore/backup-restore.c:159
 msgid "Select name of the Evolution backup file to restore"
-msgstr "Seleccione el nombre del archivo de respaldo de Evolution para restaurar"
+msgstr ""
+"Seleccione el nombre del archivo de respaldo de Evolution para restaurar"
 
 #: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
@@ -16233,7 +16298,8 @@ msgstr "Espere mientras Evolution restaura sus datos."
 
 #: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
-msgstr "Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta."
+msgstr ""
+"Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
@@ -16251,7 +16317,8 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "¿Seguro que quiere cerrar 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?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
 "¿Seguro que quiere restaurar Evolution desde el archivo de respaldo "
 "seleccionado?"
@@ -16310,39 +16377,40 @@ msgstr "R_estaurar ajustes…"
 msgid "_Backup Settings..."
 msgstr "_Respaldar ajustes…"
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
+#: ../plugins/bbdb/bbdb.c:567
 msgid "_Auto-create addressbook entries when replying to messages"
 msgstr ""
 "Crear entradas _automáticamente en la libreta de direcciones al responder "
 "correos"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione la libreta para contactos automáticos"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensajería instantánea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
+#: ../plugins/bbdb/bbdb.c:603
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sincronizar información e imágenes de contactos desde la lista de contactos "
 "de Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
-msgstr "Seleccione la libreta de direcciones para la lista de contactos de Pidgin"
+msgstr ""
+"Seleccione la libreta de direcciones para la lista de contactos de Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar con la lista de _contactos de MI ahora"
 
@@ -16374,7 +16442,8 @@ msgstr "El proceso hijo de Bogofilter no está respondiendo, matándolo..."
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "Espere a que el proceso hijo de Bogofilter se interrumpa, terminando..."
+msgstr ""
+"Espere a que el proceso hijo de Bogofilter se interrumpa, terminando..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
 #, c-format
@@ -16409,16 +16478,16 @@ msgstr "Complemento de filtro de SPAM Bogofilter"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtra mensajes SPAM usando Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/caldav/caldav-source.c:249
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/caldav/caldav-source.c:271
 #: ../plugins/google-account-setup/google-source.c:671
 msgid "Use _SSL"
 msgstr "Usar _SSL"
@@ -16531,14 +16600,16 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Comprobar si Evolution es la aplicación de correo predeterminada"
 
 #: ../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 ""
 "Cada vez que Evolution se inicie, comprobar si es o no el cliente de correo "
 "predeterminado."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "Comprueba si Evolution es el cliente de correo predeterminado al iniciar."
+msgstr ""
+"Comprueba si Evolution es el cliente de correo predeterminado al iniciar."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
@@ -17230,7 +17301,8 @@ msgstr "Operaciones de Exchange"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
-msgstr "No es posible cambiar la contraseña debido a problemas de configuración."
+msgstr ""
+"No es posible cambiar la contraseña debido a problemas de configuración."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot display folders."
@@ -17396,7 +17468,8 @@ 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 "Asegúrese de que el usuario y contraseña son correctos e intente de nuevo."
+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:46
 msgid "No Global Catalog server configured for this account."
@@ -17416,11 +17489,13 @@ msgstr "Contraseña cambiada con éxito."
 
 #: ../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."
+msgstr ""
+"Introduzca la Id del delegado o deseleccione la opción Enviar como delegado."
 
 #: ../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."
+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:53
 msgid "Please restart Evolution for changes to take effect"
@@ -17499,13 +17574,15 @@ msgstr "Operación no soportada"
 
 #: ../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."
+msgstr ""
+"Está cerca de su cuota disponible para almacenar correo en este servidor."
 
 #: ../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."
+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:75
 msgid "You cannot make yourself your own delegate"
@@ -17729,7 +17806,8 @@ msgstr "Actualizar cada"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "A plugin to setup google calendar and contacts."
-msgstr "Un complemento para configurar el calendario y los contactos de Google."
+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"
@@ -17911,11 +17989,13 @@ 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;"
+msgstr ""
+"No puede compartir la carpeta con el 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 "Tiene que especificar el nombre de usuario que quiere añadir a la lista"
+msgstr ""
+"Tiene que especificar el nombre de usuario que quiere añadir a la lista"
 
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
@@ -18032,11 +18112,13 @@ msgstr "Sesión _proxy…"
 
 #: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada."
+msgstr ""
+"La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada."
 
 #: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
+msgstr ""
+"La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
 
 #: ../plugins/groupwise-features/share-folder-common.c:319
 #: ../plugins/groupwise-features/share-folder.c:750
@@ -18186,28 +18268,28 @@ msgstr "Un complemento para las características en las cuentas IMAP."
 msgid "IMAP Features"
 msgstr "Características IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "_Importar al calendario"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "_Importar a las tareas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:201
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "Importar ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:224
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "Seleccione la lista de tareas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "Seleccione el calendario"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:700
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr "_Importar"
 
@@ -18252,7 +18334,8 @@ msgstr "Formato iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
 msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr "Sincronizar la tarea/nota/calendario/libreta de direcciones con Apple iPod"
+msgstr ""
+"Sincronizar la tarea/nota/calendario/libreta de direcciones con Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -18262,130 +18345,130 @@ msgstr "Sincronizar con iPod"
 msgid "iPod Synchronization"
 msgstr "Sincronización con iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "No es posible cargar el calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Una cita en el calendario «%s» entra en conflicto con esta reunión"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Se encontró la cita en el calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "No se puede encontrar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "No se puede encontrar esta reunión en ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "No se puede encontrar esta tarea en ninguna lista de tareas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "No se puede encontrar esta nota en ninguna lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando una versión existente de esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "No es posible interpretar el elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "No es posible enviar el elemento al calendario «%s»: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado al calendario «%s» como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado al calendario «%s» como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado al calendario «%s» como rehusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado al calendario «%s» como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "El organizador ha quitado al delegado %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No es posible enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "El estado de asistencia no pudo actualizarse debido a que el estado es "
 "inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Información de reunión enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Información de la tarea enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Información de la nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No se puede enviar la información de la reunión, la reunión no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "No se puede enviar la información de la tarea, la tarea no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "No se puede enviar la información de la nota, la nota no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18393,15 +18476,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "El elemento en el calendario no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
-#: ../plugins/itip-formatter/itip-formatter.c:1437
-#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18409,11 +18492,11 @@ msgstr ""
 "El mensaje contiene un calendario, pero el calendario no contiene ningún "
 "acontecimiento, tarea o información de disponibilidad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos múltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18421,227 +18504,228 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Esta reunión se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2152
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 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:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Borrar el mensaje después de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2394
-#: ../plugins/itip-formatter/itip-formatter.c:2426
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Búsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2409
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "Hoy"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Hoy a las %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Hoy a las %H:%M %S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Hoy a las %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:218
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Mañana"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Mañana a las %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Mañana a las %H:%M %S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Mañana a las %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañana a las %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
+#: ../plugins/itip-formatter/itip-view.c:254
 #, 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
+#: ../plugins/itip-formatter/itip-view.c:259
 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
+#: ../plugins/itip-formatter/itip-view.c:263
 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
+#: ../plugins/itip-formatter/itip-view.c:268
 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
+#: ../plugins/itip-formatter/itip-view.c:272
 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
+#: ../plugins/itip-formatter/itip-view.c:281
 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:288
+#: ../plugins/itip-formatter/itip-view.c:287
 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:292
+#: ../plugins/itip-formatter/itip-view.c:291
 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:297
+#: ../plugins/itip-formatter/itip-view.c:296
 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:301
+#: ../plugins/itip-formatter/itip-view.c:300
 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:307
+#: ../plugins/itip-formatter/itip-view.c:306
 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:312
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y a las %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:315
 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:321
+#: ../plugins/itip-formatter/itip-view.c:320
 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:325
+#: ../plugins/itip-formatter/itip-view.c:324
 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
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:525
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Responda en nombre de <b>%s</b>"
 
-#: ../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:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Recibido en nombre de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> ha publicado información de reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> ha publicado la siguiente información de reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> ha delegado la reunión siguiente en usted:"
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> solicita su presencia en la siguiente reunión a través de %s:"
+msgstr ""
+"<b>%s</b> solicita su presencia en la siguiente reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> solicita su presencia en la siguiente reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> desea apuntarse a una reunión existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> desea apuntarse a una reunión existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18650,87 +18734,91 @@ msgstr ""
 "<b>%s</b> desea recibir la última información de la siguiente reunión a "
 "través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, 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> desea recibir la última información de la reunión siguiente:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la reunión a través de %s:"
+msgstr ""
+"<b>%s</b> ha devuelto la siguiente respuesta a la reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> ha cancelado la siguiente reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ha cancelado la reunión siguiente."
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> ha propuesto los cambios siguientes para la reunión a través de %s."
+msgstr ""
+"<b>%s</b> ha propuesto los cambios siguientes para la reunión a través de %s."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ha propuesto los cambios siguientes para la reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> ha rehusado los siguientes cambios para la reunión a través de %s:"
+msgstr ""
+"<b>%s</b> ha rehusado los siguientes cambios para la reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> ha rehusado los cambios siguientes para la reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ha publicado la siguiente tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> ha publicado la tarea siguiente:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> solicita la asignación de %s para la siguiente tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> le ha asignado una tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> le ha asignado a usted una tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:463
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> desea añadirse a una tarea existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> desea añadirse a una tarea existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18739,7 +18827,7 @@ msgstr ""
 "<b>%s</b> desea recibir la última información para la siguiente tarea "
 "asignada a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18748,131 +18836,135 @@ msgstr ""
 "<b>%s</b> quiere recibir la última información para la siguiente tarea "
 "asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:474
 #, 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> ha devuelto la siguiente respuesta a la tarea asignada a través de "
 "%s:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> ha cancelado la siguiente asignación de tarea a través de %s:"
+msgstr ""
+"<b>%s</b> ha cancelado la siguiente asignación de tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ha cancelado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:486
 #, 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> ha propuesto los siguientes cambios en la asignación de tareas a "
 "través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas:"
+msgstr ""
+"<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> ha rehusado la siguiente tarea asignada a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> ha rehusado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> ha publicado la siguiente nota a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> ha publicado la nota siguiente:"
 
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> desea añadir algo a una nota existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> desea añadir algo a una nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:545
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> ha cancelado la siguiente nota compartida a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> ha cancelado la siguiente nota compartida:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:819
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:824
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
 msgid "_Decline"
 msgstr "_Rehusar"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Rehusar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../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
+#: ../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 "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Enviar información"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Actualizar el estado del participante"
 
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Actualizar"
 
@@ -18935,7 +19027,8 @@ msgid "This meeting has been delegated"
 msgstr "Esta reunión se ha delegado"
 
 #: ../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 "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -19008,7 +19101,8 @@ msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Whether play sound or beep when new messages arrive."
-msgstr "Indica si se debe reproducir un sonido o pitar cuando llega un mensaje nuevo."
+msgstr ""
+"Indica si se debe reproducir un sonido o pitar cuando llega un mensaje nuevo."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
@@ -19026,20 +19120,20 @@ msgstr ""
 "Indica si se deben notificar sólo los mensajes en la carpeta bandeja de "
 "entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:254
 msgid "Generate a _D-Bus message"
 msgstr "Generar un mensaje _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:378
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Evolution's Mail Notification"
 msgstr "Notificación de correo de Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:399
+#: ../plugins/mail-notification/mail-notification.c:398
 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:458
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19054,55 +19148,55 @@ msgstr[1] ""
 "Ha recibido %d mensajes nuevos\n"
 "en %s."
 
-#: ../plugins/mail-notification/mail-notification.c:463
+#: ../plugins/mail-notification/mail-notification.c:462
 #, 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:480
-#: ../plugins/mail-notification/mail-notification.c:485
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Nuevo correo-e"
 
-#: ../plugins/mail-notification/mail-notification.c:542
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Mostrar icono en el área de _notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "Icono pa_rpadeante en el área de notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:547
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "_Mensaje emergente junto con el icono"
 
-#: ../plugins/mail-notification/mail-notification.c:728
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "Re_producir un sonido cuando llegue correo nuevo"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Pitar"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Reproducir archivo de _sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Especificar nombre de a_rchivo:"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Seleccione un arhivo de sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "Reprod_ucir"
 
-#: ../plugins/mail-notification/mail-notification.c:805
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar nuevos mensajes sólo para la _bandeja de entrada"
 
@@ -19190,7 +19284,8 @@ msgid "Mailing _List"
 msgstr "_Lista de correo"
 
 #: ../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 ""
 "Proporciona acciones para comandos comunes de listas de correo (suscribirse, "
 "desuscribirse…)."
@@ -19312,11 +19407,13 @@ msgstr "Obtener un archivador de la lista a la que pertenece este mensaje"
 
 #: ../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 "Obtiene información sobre el uso de la lista a la que pertenece este mensaje"
+msgstr ""
+"Obtiene información sobre el uso de la lista a la que pertenece este mensaje"
 
 #: ../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 "Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
+msgstr ""
+"Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
@@ -19347,8 +19444,8 @@ 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?"
+"¿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"
@@ -19636,7 +19733,8 @@ msgstr "El proceso hijo de SpamAssasin no está respondiendo, matándolo..."
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:246
 #, c-format
 msgid "Wait for Spamassassin child process interrupted, terminating..."
-msgstr "Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando..."
+msgstr ""
+"Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:255
 #, c-format
@@ -19841,15 +19939,15 @@ msgstr "Le guía a través de su configuración inicial de cuenta."
 msgid "Setup Assistant"
 msgstr "Asistente de configuración"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuración de Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Bienvenido"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -19862,29 +19960,29 @@ msgstr ""
 "\n"
 "Por favor pulse el botón «Adelante» para continuar. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Importando archivos"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:144
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:143
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione la información que quiera importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:397
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid "Importing data."
 msgstr "Importando datos."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "Por favor espere"
 
@@ -20010,8 +20108,10 @@ msgid "Default window width"
 msgstr "Anchura predeterminada de la ventana"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "Activa los ajustes del proxy al acceder a HTTP/Secure HTTP en Internet."
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Activa los ajustes del proxy al acceder a HTTP/Secure HTTP en Internet."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
@@ -20050,7 +20150,8 @@ msgid "Last upgraded configuration version"
 msgstr "Última versión de la configuración actualizada"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de rutas a las carpetas que se sincronizarán al disco para usar "
 "desconectado"
@@ -20245,7 +20346,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "Indica si la barra de herramientas debe ser visible."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indica si se omite el diálogo de advertencia en las versiones de desarrollo "
 "de Evolution."
@@ -20280,11 +20382,11 @@ msgstr "Conexiones activas"
 msgid "Click OK to close these connections and go offline"
 msgstr "Pulse «Aceptar» para cerrar estas conexiones y desconectarse"
 
-#: ../shell/e-shell-importer.c:132
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Elija el tipo de importador a ejecutar:"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:134
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -20297,11 +20399,11 @@ msgstr ""
 "\n"
 "Si no lo sabe, puede elegir «Automático» y Evolution tratará de encargarse."
 
-#: ../shell/e-shell-importer.c:141
+#: ../shell/e-shell-importer.c:140
 msgid "Choose the destination for this import"
 msgstr "Elija el destino de esta importación"
 
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:146
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20313,23 +20415,23 @@ msgstr ""
 "configuración que se pueda importar. Si quiere intentarlo de nuevo, pulse\n"
 "el botón «Atrás».\n"
 
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:284
 msgid "F_ilename:"
 msgstr "Nombre del _archivo:"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:289
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:298
 msgid "File _type:"
 msgstr "_Tipo de archivo:"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:334
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuración de programas _antiguos"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:337
 msgid "Import a _single file"
 msgstr "Importar un _único archivo"
 
@@ -20339,14 +20441,15 @@ msgstr "Preferencias de Evolution"
 
 #. 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
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - 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."
-msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+msgstr ""
+"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
 #: ../shell/e-shell-window-commands.c:83
 #, c-format
@@ -21037,7 +21140,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
 #: ../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 ""
 "Tiene archivados los certificados que identifican a estas autoridades de "
 "certificación:"
@@ -21616,7 +21720,8 @@ msgstr "Mueve la carpeta seleccionada a otra carpeta"
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr ""
+"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
@@ -21739,8 +21844,10 @@ msgid "Hide _Read Messages"
 msgstr "Ocultar mensajes _leídos"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
@@ -21824,7 +21931,7 @@ msgstr "Lista de mensajes por conversaciones"
 msgid "_Group By Threads"
 msgstr "A_grupar por conversaciones"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Mensaje"
@@ -22160,123 +22267,119 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Muestra un cursor parpadeante en el cuerpo de los mensajes mostrados"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Muestra los mensajes en el estilo normal"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Muestra los mensajes con todas las cabeceras de correo-e"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Muestra mensaje de correo-e en bruto"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Recupera los mensajes seleccionados"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "_No importante"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Adjunto"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "Activar _cursor"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "_Quitar marca"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Borrar el mensaje"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "B_uscar en el mensaje…"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Incluido en línea"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "_SPAM"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "Cargar _imágenes"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "Mensaje en _bruto"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_No es SPAM"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Abrir en una ventana nueva"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "Mensaje a_nterior"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Citado"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Leído"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Guardar mensaje…"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Recuperar mensaje"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_No leído"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Ampliar"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
@@ -23053,11 +23156,11 @@ msgstr "Etiqueta del widget"
 msgid "A widget to display in place of the usual expander label"
 msgstr "Un widget para mostrar en lugar de la etiqueta usual del expansor"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Tamaño del expansor"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Tamaño de la flecha del expansor"
 
@@ -23165,35 +23268,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:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Buscar"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Pulse aquí para cambiar el tipo de búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Buscar"
 
 # En conflicto con _Buscar del menu principal
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "B_uscar ahora"
 
 # Conflicto con _Ver del menú principal
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "Vacia_r"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Texto"
@@ -23201,19 +23304,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:1007
+#: ../widgets/misc/e-search-bar.c:1006
 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:1024
+#: ../widgets/misc/e-search-bar.c:1023
 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:1036
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " e_n "
 
@@ -23369,19 +23472,19 @@ 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:278
+#: ../widgets/misc/e-task-widget.c:255
 #, 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
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Pulse aquí para ir a la URL"
 
@@ -23605,7 +23708,7 @@ msgstr "Alternar colores de las filas"
 #: ../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
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Dibujar rejilla horizontal"
 
@@ -23614,7 +23717,7 @@ msgstr "Dibujar rejilla horizontal"
 #: ../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
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Dibujar rejilla vertical"
 
@@ -23623,7 +23726,7 @@ msgstr "Dibujar rejilla vertical"
 #: ../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
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Dibujar el foco"
 
@@ -23648,8 +23751,8 @@ msgstr "Modelo de selección"
 #: ../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
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "Umbral de longitud"
 
@@ -23658,8 +23761,8 @@ msgstr "Umbral de longitud"
 #: ../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
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "Altura uniforme de la fila"
 
@@ -23754,8 +23857,8 @@ msgstr "Modelo de la tabla"
 msgid "Cursor row"
 msgstr "Fila del cursor"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Buscar siempre"
 
@@ -23763,15 +23866,15 @@ msgstr "Buscar siempre"
 msgid "Use click to add"
 msgstr "Pulsar para añadir"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "Adaptador de tabla Etree"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Apariencia retro"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Dibujar líneas y expansores +/−."
 
@@ -23879,3 +23982,17 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
+#~ msgid "Migrating `%s':"
+#~ msgstr "Migrando «%s»:"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propiedades…"
+
+#~ msgid "D_escription:"
+#~ msgstr "_Descripción:"
+
+#~ msgid "De_scription:"
+#~ msgstr "De_scripción:"
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "Muestra los mensajes en el estilo normal"
diff --git a/po/fi.po b/po/fi.po
index 8ce3b63164..e3dcae0df4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-27 14:33+0300\n"
-"PO-Revision-Date: 2008-07-03 10:48+0300\n"
+"POT-Creation-Date: 2008-08-14 16:46+0300\n"
+"PO-Revision-Date: 2008-08-13 15:30+0300\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -155,7 +155,7 @@ msgid "calendar view for one or more days"
 msgstr "Kalenteri näkymä yhdelle tai useammalle päivälle"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d. %Bta %Y"
 
@@ -166,8 +166,8 @@ msgstr "%A %d. %Bta %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:1540
+#: ../calendar/gui/calendar-component.c:760
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1568
 #: ../calendar/gui/e-week-view-main-item.c:340
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -175,9 +175,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:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -185,10 +185,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:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d. %Bta %Y"
 
@@ -198,8 +198,8 @@ msgstr "%d. %Bta %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:1556
+#: ../calendar/gui/calendar-component.c:786
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1584
 #: ../calendar/gui/e-week-view-main-item.c:354
 msgid "%d %b"
 msgstr "%d %b"
@@ -341,11 +341,11 @@ msgstr "ota käyttöön"
 #. 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}\" on vain luettavissa oleva osoitekirjan lähde. Siirry yhteystietojen "
-"näkymään ja valitse osoitekirja, johon voit lisätä yhteystietoja."
+"\"{0}\" on vain luettavissa oleva osoitekirja eikä sitä voi muokata. Valitse "
+"yhteystietonäkymän sivupalkista toinen osoitekirja."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -393,12 +393,12 @@ msgstr "Osoitekirjaa ei voi poistaa."
 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 ""
 "Voit tällä hetkellä käyttää vain GroupWisen järjestelmäosoitekirjaa "
 "Evolutionista. Käytä jotain toista GroupWise-asiakasta kerran, jotta saat "
 "GroupWisen \"Toistuvat yhteystiedot\"- ja \"Henkilökohtaiset yhteystiedot\"-"
-"kansiot."
+"kansiot käyttöösi."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -418,7 +418,7 @@ msgstr "LDAP-palvelimelle tunnistautuminen epäonnistui."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
@@ -519,9 +519,9 @@ msgstr ""
 "palvelin päivittää tuettuun versioon"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You do not have enough permissions to delete contact in this Address Book."
-msgstr "Oikeutesi eivät riitä yhteystiedon poistamiseen tässä osoitekirjassa."
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+"Oikeutesi eivät riitä yhteystietojen poistamiseen tästä osoitekirjasta."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -562,7 +562,7 @@ msgstr "Käytä _sellaisenaan"
 
 #. 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}"
 
@@ -603,8 +603,8 @@ msgstr "Määrittele automaattinen täydennys"
 
 #. 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
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
@@ -631,8 +631,8 @@ msgid "Evolution Address Book component"
 msgstr "Evolutionin osoitekirjan komponentti"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime-varmenteiden hallinta"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolution S/MIME-varmenteiden hallintatyökalu"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -646,12 +646,13 @@ msgstr "Hallitse S/Mime-varmenteita"
 #. 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/calendar-component.c:236
+#: ../calendar/gui/memos-component.c:199 ../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
+#: ../calendar/gui/tasks-component.c:195 ../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:1457
 msgid "On This Computer"
 msgstr "Tällä tietokoneella"
 
@@ -664,44 +665,33 @@ msgstr "Tällä tietokoneella"
 #: ../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:247 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:208 ../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:204
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
 #. 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-palvelimilla"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_Yhteystieto"
-
 #: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Luo uusi yhteystieto"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "_Yhteystietoluettelo"
-
 #: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
 #: ../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 "Uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "_Osoitekirja"
-
 #: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Luo uusi osoitekirja"
@@ -710,75 +700,75 @@ msgstr "Luo uusi osoitekirja"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Osoitekirjan asetusten tai kansioiden päivitys epäonnistui."
 
-#: ../addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Kanta"
 
-#: ../addressbook/gui/component/addressbook-config.c:516
+#: ../addressbook/gui/component/addressbook-config.c:517
 #: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Tyyppi:"
 
-#: ../addressbook/gui/component/addressbook-config.c:618
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopioi _kirjan sisältö yhteydettömään käyttöön"
 
-#: ../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:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Yleiset"
 
-#: ../addressbook/gui/component/addressbook-config.c:968
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-config.c:972
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../addressbook/gui/component/addressbook-config.c:974
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../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 "Yksityiskohtaiset"
 
-#: ../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:982
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../addressbook/gui/component/addressbook-config.c:980
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Haetaan"
 
-#: ../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 "Osoitekirjan ominaisuudet"
 
 #: ../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 "Siirretään..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "Siirretään  \"%s\""
+msgid "Migrating '%s':"
+msgstr "Siirretään  \"%s\":"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -831,68 +821,74 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti kun Evolution muuntaa Pilotin synkronointitietojasi..."
 
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeä \"%s\" uudestaan: "
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "Nimeä kansio uudestaan"
 
-#: ../addressbook/gui/component/addressbook-view.c:438
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "Kansion nimi ei voi sisältää merkkiä '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_Uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Tallenna vCard-muodossa..."
 
-#: ../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/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
+#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/calendar-component.c:619
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1693 ../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
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
 #: ../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 "_Poista"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-msgid "_Properties..."
+#: ../addressbook/gui/component/addressbook-view.c:949
+#: ../calendar/gui/calendar-component.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
 msgstr "_Ominaisuudet..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Yhteystietojen lähdevalinta"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
 
-#: ../addressbook/gui/component/addressbook.c:200
+#: ../addressbook/gui/component/addressbook.c:207
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "Kirjautuminen epäonnistui.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
+#: ../addressbook/gui/component/addressbook.c:214
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Syötä salasana palvelulle %s (käyttäjä %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../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"
@@ -996,74 +992,79 @@ msgstr "Aina"
 msgid "Anonymously"
 msgstr "Anonyymisti"
 
-#: ../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 "S_elaa tätä kirjaa, kunnes raja tulee vastaan"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Yleistä"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Yksikäsitteinen nimi"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
-#: ../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 käyttää tätä sähköpostiosoitetta sinun todentamiseksesi "
 "palvelimelle."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Etsi mahdolliset hakupohjat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "_Kirjautuminen:"
 
-#: ../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 "Ei koskaan"
 
 #. 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 "Ei salausta"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Yksi"
 
 #. 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 "SSL-salattu"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Hakusuodatin"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "Haku_pohja:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "Hakusuodatin:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Hakusuodatin"
 
-#: ../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 "
@@ -1072,7 +1073,7 @@ msgstr ""
 "Haun suodatin on haettavien kohteiden tyyppi suoritettaessa hakua. Jos "
 "asetusta ei muuteta, haetaan oletuksena \"person\"-tyypin kohderyhmästä."
 
-#: ../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."
@@ -1080,7 +1081,7 @@ msgstr ""
 "Tämän vaihtoehdon valinta tarkoittaa, että Evolution ottaa yhteyttä LDAP-"
 "palvelimeen vain, jos se tukee SSL-salausta."
 
-#: ../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."
@@ -1088,7 +1089,7 @@ msgstr ""
 "Tämän vaihtoehdon valinta tarkoittaa, että Evolution ottaa yhteyttä LDAP-"
 "palvelimeen vain, jos se tukee TLS-salausta."
 
-#: ../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 "
@@ -1098,23 +1099,23 @@ msgstr ""
 "salausta. Tämä tarkoittaa, että yhteytesi on turvaton ja että olet "
 "haavoittuvainen yhteyden turvaan kohdistuville hyökkäyksille."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Ali"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Tuetut hakupohjat"
 
 #. 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 "TLS-salattu"
 
-#: ../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 "
@@ -1123,7 +1124,7 @@ msgstr ""
 "Hakupohja on yksilöllinen nimi (DN) kentälle, josta hakusi alkavat. Jos "
 "jätät tämän tyhjäksi, haku alkaa hakemistopuun juuresta."
 
-#: ../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 "
@@ -1135,13 +1136,13 @@ msgstr ""
 "alipuissa, kun taas kattavuus \"Yksi\" kattaa kentät yhden tason "
 "hakupohjastasi alaspäin."
 
-#: ../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"
 "\"."
 msgstr "LDAP-palvelimesi koko nimi, esimerkiksi \"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."
@@ -1149,7 +1150,7 @@ msgstr ""
 "Suurin sallittu haettavien korttien määrä hakua kohti. Tämän arvon "
 "asettaminen liian suureksi hidastaa osoitekirjaasi."
 
-#: ../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 "
@@ -1159,7 +1160,7 @@ msgstr ""
 "asettaminen arvoon \"Sähköpostiosoite\" vaatii anonyymiä pääsyä LDAP-"
 "palvelimellesi."
 
-#: ../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. "
@@ -1167,7 +1168,7 @@ msgstr ""
 "Tämä on nimi, jolla tämä palvelin näkyy Evolutionin kansiolistoissa. Sitä "
 "käytetään ainoastaan listoilla näyttämiseen."
 
-#: ../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 "
@@ -1177,35 +1178,35 @@ msgstr ""
 "on lista yleisistä porteista. Kysy tarvittaessa järjestelmäsi ylläpitäjältä "
 "mitä porttia sinun tulisi käyttää."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Milloin mahdollista"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Lisää osoitekirja"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "_Haun rajoitus:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "Etsi mahdolliset hakupohjat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "_Kirjautumismenetelmä:"
 
-#: ../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
@@ -1213,39 +1214,40 @@ msgstr "_Kirjautumismenetelmä:"
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_Hakualue:"
 
-#: ../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 "_Palvelin: "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Aikakatkaisu:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Käytä salattua yhteyttä:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kortteja"
 
-#: ../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
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minuutti"
 
@@ -1320,7 +1322,7 @@ msgid "Image"
 msgstr "Kuva"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1333,7 +1335,7 @@ msgid "Nic_kname:"
 msgstr "_Lempinimi:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1351,7 +1353,7 @@ msgstr "Puhelin"
 #: ../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 "Työ"
 
@@ -1373,9 +1375,9 @@ msgid "_Birthday:"
 msgstr "_Syntymäpäivä:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:896
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1848
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
@@ -1463,22 +1465,22 @@ msgstr "_Missä: "
 msgid "_Zip/Postal Code:"
 msgstr "_Postinumero:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Osoite"
 
-#: ../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-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #: ../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: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
@@ -1486,976 +1488,975 @@ msgstr "Osoite"
 msgid "Editable"
 msgstr "Muokattava"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Yhdysvallat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Algeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Amerikkalainen Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Etelämanner"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "Antigua ja Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Argentiina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Itävalta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Azerbaidzan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Bahamasaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "Valko-Venäjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Bermudasaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia-Hertsegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Bouvet-saari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brasilia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Brittiläinen Intian valtameren alue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Kambodza"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Kap Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Caymansaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "Keski-Afrikan Tasavalta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Tsad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "Kiina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Joulusaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Kookos(Keeling)-saaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Komorit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Kongon demokraattinen tasavalta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Cookinsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Norsunluurannikko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Kuuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Kypros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "Tšekki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Tanska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "Dominikaaninen Tasavalta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Egypti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Päiväntasaajan Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Viro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Falklandsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Färsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fidzi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Suomi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Ranska"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Ranskan Guiana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polynesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Ranskan eteläiset alueet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Georgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Saksa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Kreikka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Grönlanti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Guinea Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Heard ja McDonaldinsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Pyhä meri"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "Unkari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Islanti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "Intia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Iran"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Irlanti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Mansaari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Italia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Japani"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Jordania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazakstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Korean demokraattinen kansantasavalta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "Korean tasavalta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Kirgisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Latvia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Libya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Liettua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Makedonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Malesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Malediivit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Marshallinsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Mikronesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Moldova"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Marokko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Nepali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Alankomaat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Alankomaiden Antillit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Uusi Kaledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Uusi-Seelanti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Norfolkinsaari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "Pohjois-Mariaanit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Norja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Oman"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Palestiinalainen alue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Papua Uusi-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Filippiinit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Puola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Réunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Romania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Venäjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts ja Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent ja Grenadiinit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "São Tomé ja Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Serbia ja Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Seychillit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Salomonsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Etelä-Afrikka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Etelä-Georgia ja Eteläiset Sandwichsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "Espanja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "Saint Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre ja Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard ja Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Swazimaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Sveitsi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Syyria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Tadkistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Tansania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Thaimaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Turkki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Turks- ja Caicossaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "Yhdistyneet arabiemiirikunnat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "Yhdysvaltain pienet erillissaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Brittiläiset Neitsytsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "Yhdysvaltain Neitsytsaaret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis ja Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Länsi-Sahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Sambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
 #: ../mail/em-mailer-prefs.c:466
 #: ../plugins/exchange-operations/exchange-delegates.c:952
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
@@ -2467,42 +2468,43 @@ msgstr "Zimbabwe"
 msgid "Name"
 msgstr "Nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "AOL pikaviestin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 #: ../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:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Yahoo -pikaviestin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu -pikaviestin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 #: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:111
 msgid "Service"
 msgstr "Palvelu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
+#: ../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 "Sijainti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
@@ -2801,9 +2803,9 @@ msgstr "_Jäsenet"
 #: ../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-addressbook-view.c:212
 #: ../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 "Kirja"
 
@@ -2848,14 +2850,15 @@ msgstr ""
 "Yhteystiedon nimi tai sähköpostiosoite on ja tässä kansioissa.\n"
 "Haluatko lisätä joka tapauksessa?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
-msgid "Merge Contact"
-msgstr "Yhdistä yhteystieto"
-
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
 #: ../addressbook/gui/merging/eab-contact-merging.c:200
 msgid "_Merge"
 msgstr "_Yhdistä"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "Yhdistä yhteystieto"
+
 #: ../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
@@ -2867,14 +2870,14 @@ msgid "Email"
 msgstr "Sähköposti"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
@@ -2895,9 +2898,9 @@ msgstr[1] "%d yhteystietoa"
 
 #: ../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-addressbook-view.c:226
 #: ../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 "Kysely"
 
@@ -2908,7 +2911,7 @@ msgstr "Virhe haettaessa kirjanäkymää"
 #: ../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"
@@ -2918,15 +2921,15 @@ msgstr "Malli"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "Nimi alkaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Lähde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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
@@ -2934,93 +2937,92 @@ msgstr "Lähde"
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Tallenna vCard-muodossa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Tallenna vCard-muodossa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Välitä yhteystieto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Välitä yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Lähetä _viesti listalle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Lähetä _viesti henkilöille"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "_Kopioi osoitekirjaan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "_Siirrä osoitekirjaan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:453
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
 #: ../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:103 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "L_iitä"
 
 #. 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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 #: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Muu virhe"
@@ -3056,7 +3058,7 @@ msgstr "Autopuhelin"
 
 #: ../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
@@ -3201,11 +3203,11 @@ msgstr "Kotisivu"
 #: ../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 "Leveys"
@@ -3216,11 +3218,11 @@ msgstr "Leveys"
 #: ../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 "Korkeus"
@@ -3250,7 +3252,17 @@ msgstr "Kentän maksimipituus"
 msgid "Column Width"
 msgstr "Sarakkeen leveys"
 
-#: ../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"
+"Etsitään yhteystietoja..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3264,7 +3276,7 @@ msgstr ""
 "\n"
 "tai luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:176
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3278,7 +3290,7 @@ msgstr ""
 "\n"
 "Luo uusi yhteystieto kaksoisnapsautuksella."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3288,7 +3300,7 @@ msgstr ""
 "\n"
 "Etsi yhteystietoja."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3298,7 +3310,7 @@ msgstr ""
 "\n"
 "Näkymässä ei ole mitään näytettävää."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:500
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Sovitin"
 
@@ -3323,16 +3335,16 @@ msgstr "Valittu"
 msgid "Has Cursor"
 msgstr "On kohdistin"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "Lähetä uusi _viesti..."
 
@@ -3376,9 +3388,9 @@ msgstr "Videokeskustelu"
 
 #: ../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:805
 #: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2376
+#: ../calendar/gui/gnome-cal.c:2451
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:574
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
@@ -3392,8 +3404,7 @@ msgstr "Kalenteri"
 
 #: ../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:113
 msgid "Free/Busy"
 msgstr "Vapaa/Varattu"
 
@@ -3415,12 +3426,14 @@ msgid "Web Log"
 msgstr "Web-loki"
 
 #: ../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:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
 #: ../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:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
@@ -3466,7 +3479,7 @@ msgstr "Omaa yhteystietoa ei ole määritelty"
 #. 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 "Lupa evätty"
 
@@ -3488,11 +3501,11 @@ msgstr "Protokolla ei ole tuettu"
 #. 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 "Peruutettu"
 
@@ -3533,7 +3546,12 @@ msgstr "Ei käytettävissä yhteydettömässä tilassa"
 msgid "Invalid server version"
 msgstr "Virheellinen palvelimen versio"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Tunnistautumistapa ei ole tuettu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 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 "
@@ -3543,7 +3561,7 @@ msgstr ""
 "yhteydettömään käyttöön tai sitä ei ole vielä haettu yhteydettömään tilaan. "
 "Lataa osoitekirja kerran yhteydellisessä tilassa hakeaksesi sen sisällön."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3552,7 +3570,7 @@ msgstr ""
 "Osoitekirjan avaus epäonnistui. Tarkista että polku %s on olemassa ja että "
 "sinulla on oikeudet käyttää sitä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3560,7 +3578,7 @@ msgstr ""
 "Osoitekirjan avaus epäonnistui. Olet joko syöttänyt virheellisen URI:n tai "
 "LDAP-palvelinta ei tavoiteta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 "
@@ -3569,7 +3587,7 @@ msgstr ""
 "Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-"
 "tuen Evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3577,7 +3595,11 @@ msgstr ""
 "Osoitekirjan avaus epäonnistui. Syötit joko virheellisen URIn tai palvelinta "
 "ei voi tavoittaa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+msgid "Detailed error:"
+msgstr "Yksityiskohtainen virhe:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3589,7 +3611,7 @@ msgstr ""
 "Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
 "osoitekirjan hakemistopalvelimen asetuksissa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3601,45 +3623,45 @@ msgstr ""
 "hakuasi tai pidennä palvelimen aikarajoitusta tämän osoitekirjan\n"
 "hakemistopalvelimen asetuksissa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Osoitekirjan taustajärjestelmä ei ymmärtänyt tätä kyselyä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Osoitekirjan taustajärjestelmä ei suostunut suorittamaan tätä kyselyä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "Kyselyä ei voitu suorittaa onnistuneesti."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "Virhe lisättäessä listalle"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "Virhe lisättäessä yhteystietoa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "Virhe muokattaessa listaa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "Virhe muokattaessa yhteystietoa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3654,16 +3676,16 @@ msgstr[1] ""
 "%d yhteystiedon avaaminen avaa myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää kaikki nämä yhteystiedot?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
 msgstr "Ä_lä näytä"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "Näytä k_aikki yhteystiedot"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3672,65 +3694,65 @@ msgstr ""
 "%s on jo olemassa\n"
 "Haluatko ylikirjoittaa?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 msgid "Overwrite"
 msgstr "Kirjoita yli"
 
 #. 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
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "Yhteystieto"
 msgstr[1] "Yhteystiedot"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "kortti.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "Siirry yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "Kopioi yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "Siirrä yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "Kopioi yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr "Useita vCard-tiedostoja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
 #, c-format
 msgid "Contact information"
 msgstr "Yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
@@ -3959,7 +3981,7 @@ msgstr "Varjostus"
 
 #. 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:"
@@ -4086,20 +4108,20 @@ msgstr "Käsittelemätön virhe"
 #. 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}\" on vain luettavissa oleva kalenterilähde. Valitse kalenteri, johon "
-"tapaamisia voidaan lisätä."
+"\"{0}\" on vain luettavissa oleva kalenteri eikä sitä voi muokata. Valitse "
+"joku toinen kalenteri kalenterinäkymän sivupalkista."
 
 #. 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}\" on vain luettavissa oleva kalenterilähde. Siirry kalenterinäkymään "
-"ja valitse kalenteri, johon tapaamisia voidaan lisätä."
+"\"{0}\" on vain luettavissa oleva kalenteri eikä sitä voi muokata. Valitse "
+"toinen kalenteri, johon tapaamisia voidaan lisätä."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4124,15 +4146,13 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr ""
-"Kaikki tiedot tässä muistilapussa poistetaan eikä niitä voi palauttaa."
+msgstr "Kaikki tiedot tässä muistilapussa poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr ""
-"Kaikki tiedot näistä tapaamisista poistetaan eikä niitä voi palauttaa."
+msgstr "Kaikki tiedot näistä tapaamisista poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
@@ -4141,8 +4161,7 @@ msgstr "Kaikki tiedot näistä tehtävistä poistetaan eikä niitä voi palautta
 #: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"Kaikki tiedot tästä tapaamisesta poistetaan eikä niitä voi palauttaa."
+msgstr "Kaikki tiedot tästä tapaamisesta poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:12
 msgid ""
@@ -4186,19 +4205,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:179
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Haluatko varmasti poistaa tämän muistilapun?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "haluatko varmasti poistaa tämän tehtävän?"
@@ -4354,9 +4373,9 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Kalenteri ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "The memo list is not marked for offline usage"
+msgid "The memo list is not marked for offline usage."
 msgstr ""
-"Muistilappulistaa ei ole merkitty käytettäväksi yhteydettömässä tilassa"
+"Muistilappulistaa ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4451,12 +4470,11 @@ msgstr ""
 "uudestaan."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Hylkää muutokset"
 
-#: ../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 "_Tallenna"
 
@@ -4465,7 +4483,7 @@ msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
 #: ../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 "_Lähetä"
@@ -4522,12 +4540,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voi kirjoittaa"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2357
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Kalenterit"
 
@@ -4569,15 +4587,15 @@ msgstr "Mui_stilaput"
 
 #: ../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/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
 #: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
 #: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Muistilaput"
 
 #: ../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:1642 ../calendar/gui/print.c:1982
 #: ../calendar/gui/tasks-component.c:539
 #: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
@@ -4604,25 +4622,26 @@ msgstr "_Tehtävät"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutionin kalenterin hälytyspalvelu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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:397
+#: ../plugins/google-account-setup/google-source.c:716
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Alkamisaika"
 
@@ -4633,10 +4652,10 @@ msgstr "Tapaamiset"
 
 #. 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:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 #: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1002
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Sijainti:"
 
@@ -4645,14 +4664,15 @@ msgid "Snooze _time:"
 msgstr "Torkkumisaika:"
 
 #: ../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 "_Muokkaa"
 
@@ -4664,32 +4684,32 @@ msgstr "_Torku"
 msgid "location of appointment"
 msgstr "tapaamisen sijainti"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1577
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sinulla on %d hälytystä"
 
-#: ../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:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4701,7 +4721,7 @@ msgstr ""
 "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
 "tavallisen huomautusikkunan."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4718,7 +4738,7 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudestaan"
 
@@ -5001,12 +5021,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Näytä tilakenttä tapahtuman, tehtävän tai kokouksen muokkaimessa"
 
 #: ../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 "Näytä \"Esikatselu\"-paneeli"
 
 #: ../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 "Näytä esikatselupaneeli"
 
@@ -5057,7 +5077,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Viimeisimmän hälytyksen suoritusaika, time_t yksikkönä"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
@@ -5193,56 +5213,56 @@ msgstr "Työpäivän alkamisminuutti"
 msgid "daylight savings time"
 msgstr "kesäaika"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Luokka on"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Kommentti sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Sijainti sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Seuraavien 7 päivän tapaamiset"
 
@@ -5269,7 +5289,8 @@ msgstr "Poista vanhemmat tapahtumat kuin"
 #: ../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
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "päivä"
@@ -5285,97 +5306,73 @@ msgstr "päivä"
 msgid "On The Web"
 msgstr "Verkossa"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Syntymä- ja vuosipäivät"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Sää"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2090
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ../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
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Ominaisuudet..."
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Kalenterien päivitys epäonnistui."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Kalenterin \"%s\" avaus tehtävien ja kokousten luontia varten epäonnistui"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Tehtävien ja kokousten luontia varten ei löydy kalenteria"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Kalenterilähteen valinta"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1595
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1586
-msgid "_Appointment"
-msgstr "_Tapaaminen"
-
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1597
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1603
 msgid "New meeting"
 msgstr "Uusi tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1594
-msgid "M_eeting"
-msgstr "_Kokous"
-
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1605
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1611
 msgid "New all day appointment"
 msgstr "Uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1602
-msgid "All Day A_ppointment"
-msgstr "Koko _päivän tapaaminen"
-
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1613
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1619
 msgid "New calendar"
 msgstr "Uusi kalenteri"
 
-#: ../calendar/gui/calendar-component.c:1610
-msgid "Cale_ndar"
-msgstr "_Kalenteri"
-
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
@@ -5396,15 +5393,219 @@ msgid "Month View"
 msgstr "Kuukausinäkymä"
 
 #: ../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 "Mikä tahansa kenttä"
+
+#: ../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 "Liitteet"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Osanottaja"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Työ"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Luokka"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Luokittelu"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Kilpailu"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
+#: ../calendar/gui/e-cal-model.c:333 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Luottamuksellinen"
+
+#: ../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 "Kuvaus"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Kuvaus sisä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 "Ei ole olemassa"
+
+#: ../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 "On olemassa"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Suosikit"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Lahjat"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Tavoitteet"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Loma"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Lomakortit"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Tärkeät yhteystiedot"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Ideat"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Kansainvälinen"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Avainasiakas"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "Sekalaiset"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Seuraavat 7 päivää"
+
+#: ../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 "Järjestäjä:"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Puhelut"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Henkilökohtainen"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:322 ../calendar/gui/e-cal-model.c:329
+#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Julkinen"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:297
+msgid "Recurrence"
+msgstr "Toistuvuus"
+
+#: ../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 "Tila"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Strategiat"
+
+#: ../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 "Kuvaus"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Yhteenveto sisältää"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Toimittajat"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Aika &amp; kulut"
+
+#: ../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 "Odottaa"
+
+#: ../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 "sisä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 "ei sisällä"
+
+#: ../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 "on"
+
+#: ../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 "ei ole"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Virhe avattaessa kalenteria"
@@ -5421,7 +5622,7 @@ msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:605
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Muokkaa hälytystä"
 
@@ -5532,7 +5733,7 @@ msgstr "minuutti(a)"
 msgid "start of appointment"
 msgstr "tapaamisen alkua"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "Toimenpide/liipaisin"
 
@@ -5543,16 +5744,15 @@ msgstr "_Lisää"
 #: ../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 "Hälytykset"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
-#: ../composer/e-composer-actions.c:63
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ehdota liitteen automaattista näyttämistä"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
@@ -5621,7 +5821,7 @@ msgid "Display"
 msgstr "Näytä"
 
 #: ../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 "Perjantai"
@@ -5637,7 +5837,7 @@ msgstr ""
 "päivää"
 
 #: ../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 "Maanantai"
@@ -5661,7 +5861,7 @@ msgstr ""
 "sunnuntai"
 
 #: ../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 "Valitse väri"
 
@@ -5671,7 +5871,7 @@ msgid "S_un"
 msgstr "_Su"
 
 #: ../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 "Lauantai"
@@ -5689,7 +5889,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Näytä _viikkonumerot"
 
 #: ../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 "Sunnuntai"
@@ -5708,13 +5908,13 @@ msgid "Template:"
 msgstr "Pohja:"
 
 #: ../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 "Torstai"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Aikavyöhyke: "
 
@@ -5723,13 +5923,13 @@ msgid "Time format:"
 msgstr "Ajan muoto:"
 
 #: ../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 "Tiistai"
 
 #: ../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 "Keskiviikko"
@@ -5856,199 +6056,341 @@ msgstr "Muistilappulistan ominaisuudet"
 msgid "New Memo List"
 msgstr "Uusi muistilappulista"
 
-#: ../calendar/gui/dialogs/changed-comp.c:58
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Tapahtuma on poistettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Tehtävä on poistettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Muistilappu on poistettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s olet tehnyt muutoksia. Unohda nämä muutokset ja sulje muokkain?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Et ole tehnyt muutoksia, sulje muokkain?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:82
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Tapahtumaa on muutettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Tehtävää on muutettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Muistilappua on muutettu."
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Olet tehnyt muutoksia. Unohda nämä muutokset ja päivitä muokkain?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:516
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Tarkistusvirhe: %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 " (Valmis "
 
-#: ../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 "Valmis"
 
-#: ../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 "(erääntyy "
 
-#: ../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 "Erääntyy "
 
-#: ../calendar/gui/dialogs/comp-editor.c:205
+#: ../calendar/gui/dialogs/comp-editor.c:231
 #, c-format
 msgid "Attached message - %s"
 msgstr "Liitetty viesti - %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
-#: ../composer/e-msg-composer.c:1991
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1771
+#: ../composer/e-msg-composer.c:1990
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../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:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../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:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Peruuta _raahaus"
 
-#: ../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 "liite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:821
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Kohdetta ei voi päivittää"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Muokkaa tapaamista"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Kokous - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Tapaaminen - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tehtävänanto - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:946
+#, c-format
+msgid "Task - %s"
+msgstr "Tehtävä - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Memo - %s"
+msgstr "Muistilappu - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Ei yhteenvetoa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Sulje nykyinen ikkuna napsauttamalla tästä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Kopioi valittu teksti leikepöydälle"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "_Kopioi valittu teksti leikepöydälle"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Napsauta tästä näyttääksesi ohje"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Liitä tekstiä leikepöydältä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Tallenna nykyinen ikkuna napsauttamalla tästä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+msgid "Select all text"
+msgstr "Valitse kaikki teksti"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+msgid "_Classification"
+msgstr "Lu_okittelu"
+
+#: ../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 "_Tiedosto"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "O_hje"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "L_isää"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Asetukset"
+
+#: ../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 "_Näytä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1376
+#: ../composer/e-composer-actions.c:472
+msgid "_Attachment..."
+msgstr "_Liite..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1378
+msgid "Click here to attach a file"
+msgstr "Liitä tiedosta napsauttamalla tästä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Luokat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Määrittää näytetäänkö luokat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "_Aikavyöhyke"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1405
+msgid "Pu_blic"
+msgstr "J_ulkinen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1407
+msgid "Classify as public"
+msgstr "Luokittele julkiseksi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "_Private"
+msgstr "_Yksityinen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1414
+msgid "Classify as private"
+msgstr "Luokittele yksityiseksi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "_Luottamuksellinen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1421
+msgid "Classify as confidential"
+msgstr "Luokittele luottamukselliseksi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "R_oolikenttä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Määrittää näytetäänkö roolikenttä"
+
+#: ../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 "Määrittää näytetäänkö RSVP-kenttä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1445
+msgid "_Status Field"
+msgstr "_Tilakenttä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1447
+msgid "Toggles whether the Status field is displayed"
+msgstr "Määrittää näytetäänkö tilakenttä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1453
+msgid "_Type Field"
+msgstr "T_yyppikenttä"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1455
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Määrittää näytetäänkö läsnäolijan tyyppi"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1765
+#: ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent Docu_ments"
+msgstr "Viimeisi_mmät asiakirjat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1784
+#: ../composer/e-composer-actions.c:700
+msgid "Attach"
+msgstr "Liitä tiedosto"
+
+#: ../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> liite"
 msgstr[1] "<b>%d</b> liitettä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../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 "Näytä _liitepalkki"
 
-#: ../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:1871
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
 #: ../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 "_Poista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Lisää liite..."
 
-#: ../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:2195
 msgid "Show Attachments"
 msgstr "Näytä liitteet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Näytä tai piilota liitepalkki välilyönnillä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2225
-#: ../calendar/gui/dialogs/comp-editor.c:2268
-msgid "Edit Appointment"
-msgstr "Muokkaa tapaamista"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-#: ../calendar/gui/dialogs/comp-editor.c:2274
-#, c-format
-msgid "Meeting - %s"
-msgstr "Kokous - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#, c-format
-msgid "Appointment - %s"
-msgstr "Tapaaminen - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tehtävänanto - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#: ../calendar/gui/dialogs/comp-editor.c:2282
-#, c-format
-msgid "Task - %s"
-msgstr "Tehtävä - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2242
-#: ../calendar/gui/dialogs/comp-editor.c:2285
-#, c-format
-msgid "Memo - %s"
-msgstr "Muistilappu - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2253
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "No summary"
-msgstr "Ei kuvausta"
-
-#: ../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 "Tähän kohtaan tehdyt muutokset voidaan hylätä, jos päivitys saapuu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voi käyttää!"
 
@@ -6064,55 +6406,55 @@ msgstr "Kohdetta ei voi avata"
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
-#: ../calendar/gui/dialogs/delete-comp.c:202
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Poistetaanko tämä kohta kaikkien muiden vastaanottajien kansioista?"
 
-#: ../calendar/gui/dialogs/delete-error.c:53
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Tapahtumaa ei voi poistaa corba-virheen takia"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Tehtävää ei voi poistaa corba-virheen takia"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Muistilappua ei voi poistaa corba-virheen takia"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Kohdetta ei voi poistaa corba-virheen takia"
 
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Tapahtumaa ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Tehtävää ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Muistilappua ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Kohdetta ei voi poistaa, koska oikeudet eivät riitä poistoon"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "Tapahtumaa ei voi poistaa virheen takia"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "Tehtävää ei voi poistaa virheen takia"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "Muistilappua ei voi poistaa virheen takia"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Kohdetta ei voi poistaa virheen takia"
 
@@ -6129,132 +6471,179 @@ msgstr "Valtuuta:"
 msgid "Enter Delegate"
 msgstr "Syötä valtuutettu"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:194
+msgid "_Alarms"
+msgstr "_Hälytykset"
+
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+"Napsauta tästä, jos haluat asettaa tai poistaa tämän tehtävän hälytyksiä"
+
+#: ../calendar/gui/dialogs/event-editor.c:201
+msgid "_Recurrence"
+msgstr "T_oistuvuus"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "Make this a recurring event"
+msgstr "Muuta tämä tapahtuma toistuvaksi"
+
+#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Lähetysasetukset"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
+msgid "Insert advanced send options"
+msgstr "Lisää erityisiä lähetysvaihtoehtoja"
+
+#: ../calendar/gui/dialogs/event-editor.c:218
+msgid "All _Day Event"
+msgstr "Koko _päivän tapahtuma"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "Toggles whether to have All Day Event"
+msgstr "Määrittää onko tämä koko päivän tapahtuma"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+msgid "Show Time as _Busy"
+msgstr "Näytä aika _varattuna"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Toggles whether to show time as busy"
+msgstr "Määrittää näytetäänkö aika varattuna"
+
+#: ../calendar/gui/dialogs/event-editor.c:237
+msgid "_Free/Busy"
+msgstr "_Vapaa/Varattu"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "Query free / busy information for the attendees"
+msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
+
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "Tapaa_minen"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Toistuvuus"
-
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2832
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Tapahtumassa on hälytyksiä"
 
-#: ../calendar/gui/dialogs/event-page.c:903
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Valtuutetut"
 
-#: ../calendar/gui/dialogs/event-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "_Osanottajat"
 
-#: ../calendar/gui/dialogs/event-page.c:1125
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Tapahtuma ilman alkupäivämäärää"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Tapahtuma ilman päättymispäivää"
 
-#: ../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:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1310
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Lopetuspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Alkamisaika on väärin"
 
-#: ../calendar/gui/dialogs/event-page.c:1340
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
-#: ../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:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Valitulla järjestäjällä ei enää ole käyttäjätiliä"
 
-#: ../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:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1965
-#: ../calendar/gui/dialogs/task-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Lisää "
 
-#: ../calendar/gui/dialogs/event-page.c:2708
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalenteria \"%s\" ei voi avata"
 
-#: ../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:2634
+#: ../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 "Toimit henkilön %s puolesta"
 
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päivä ennen tapaamista"
 msgstr[1] "%d päivää ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tunti ennen tapaamista"
 msgstr[1] "%d tuntia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuutti ennen tapaamista"
 msgstr[1] "%d minuuttia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:3075
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Muokkaa"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../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: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
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
 #: ../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:2021
 #: ../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
@@ -6282,23 +6671,25 @@ msgid "Custom Alarm:"
 msgstr "Oma hälytys:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "_Kuvaus:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Tapahtuman kuvaus:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Yhteenveto:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Hälytys"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Description:"
+msgstr "K_uvaus:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Aika:"
@@ -6329,25 +6720,21 @@ msgstr "Vaihda _järjestäjää"
 msgid "Co_ntacts..."
 msgstr "_Yhteystiedot..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "Järjestäjä:"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Järjestäjä:"
 
-#: ../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 "Muistilappu"
 
-#: ../calendar/gui/dialogs/memo-page.c:947
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Muistilappuja kohteesta '%s' ei voi avata."
 
-#: ../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
@@ -6363,12 +6750,8 @@ msgstr "_Alkamispäivä:"
 msgid "T_o:"
 msgstr "Vastaan_ottajat:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "K_uvaus:"
-
 #: ../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 "_Ryhmä:"
@@ -6409,18 +6792,18 @@ msgstr "Tätä ja tulevia kertoja"
 msgid "All Instances"
 msgstr "Kaikki kerrat"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:495
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:816
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
 #. 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 " "
 
@@ -6428,7 +6811,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 "ensimmäinen"
 
@@ -6437,7 +6820,7 @@ msgstr "ensimmäinen"
 #. * (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 "toinen"
 
@@ -6445,7 +6828,7 @@ msgstr "toinen"
 #. * (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 "kolmas"
 
@@ -6453,7 +6836,7 @@ msgstr "kolmas"
 #. * (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 "neljäs"
 
@@ -6461,13 +6844,13 @@ msgstr "neljäs"
 #. * (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 "viimeinen"
 
 #. 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 "Toinen päiväys"
 
@@ -6475,7 +6858,7 @@ msgstr "Toinen päiväys"
 #. * 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."
 
@@ -6483,7 +6866,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."
 
@@ -6491,45 +6874,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 "päivä"
 
 #. 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 "tapahtumiskertaa"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Lisää poikkeus"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Valintaa ei voi hakea muokattavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Muokkaa poikkeusta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Valintaa ei voitu hakea poistettavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Päiväys/aika"
 
@@ -6580,12 +6963,12 @@ msgstr "viikko"
 msgid "year(s)"
 msgstr "vuosi"
 
-#: ../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 "Valmistumispäivä on väärin"
 
-#: ../calendar/gui/dialogs/task-details-page.c:514
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "WWW-sivu"
 
@@ -6600,51 +6983,55 @@ msgstr "<span weight=\"bold\">Tila</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 "Valmis"
 
 #: ../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:1065
 msgid "High"
 msgstr "Korkea"
 
 #: ../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 "Työn alla"
 
 #: ../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:1063
 msgid "Low"
 msgstr "Matala"
 
 #: ../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:970 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: ../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 "Ei aloitettu"
 
@@ -6657,7 +7044,7 @@ msgid "Stat_us:"
 msgstr "_Tila:"
 
 #: ../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 "Määrittelemätön"
 
@@ -6674,25 +7061,37 @@ msgstr "_Prioriteetti:"
 msgid "_Web Page:"
 msgstr "_Kotisivun osoite:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/dialogs/task-editor.c:111
+msgid "_Status Details"
+msgstr "_Tilan yksityiskohdat"
+
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "Click to change or view the status details of the task"
+msgstr "Napsauta jos haluat muuttaa tai näyttää tehtävän tilan yksityiskohtia"
+
+#: ../calendar/gui/dialogs/task-editor.c:121
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "_Lähetysasetukset"
+
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "Tehtävän yksityiskohdat"
 
-#: ../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 "_Järjestäjä:"
 
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "Eräpäivä on virheellinen"
 
-#: ../calendar/gui/dialogs/task-page.c:1880
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tehtäviä kohteesta '%s' ei voi avata."
@@ -6706,17 +7105,13 @@ msgid "Categor_ies..."
 msgstr "_Luokat..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "_Kuvaus:"
+msgid "D_ue date:"
+msgstr "_Eräpäivä:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Aikavyöhyke:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Eräpäivä:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:392
 #, c-format
@@ -6793,75 +7188,59 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
 
-#: ../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:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %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:857
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: ../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 "Alkamispäivä:"
 
-#: ../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 "Kuvaus:"
 
-#: ../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-sivu:"
 
-#: ../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 "Kuvaus:"
 
-#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Eräpäivä:"
 
 #. 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 "Tila:"
 
-#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Prioriteetti:"
 
-#: ../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 "Julkinen"
-
-#: ../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 "Henkilökohtainen"
-
-#: ../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 "Luottamuksellinen"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Päättymispäivä"
@@ -6871,20 +7250,13 @@ msgstr "Päättymispäivä"
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../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 "Kuvaus"
-
 #: ../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 "Vapaa"
 
 #: ../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 "Varattu"
@@ -6899,7 +7271,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
 #: ../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
@@ -6907,7 +7279,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
 #: ../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
@@ -6915,51 +7287,51 @@ msgid "No"
 msgstr "Ei"
 
 #. 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-model.c:335 ../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:2045
+#: ../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:409
+#: ../plugins/itip-formatter/itip-formatter.c:2046
 #: ../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 "Tuntematon"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:972
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:974
 msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: ../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:2029
 msgid "Select folder to save selected attachments..."
 msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nimetön_kuva.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
-#: ../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
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Aseta _taustaksi"
 
@@ -6967,131 +7339,157 @@ msgstr "Aseta _taustaksi"
 msgid "_Save Selected"
 msgstr "Tallenna _valitut"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:837
 #, c-format
 msgid "Open in %s..."
 msgstr "Avaa ohjelmassa %s..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Ei yhteenvetoa *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Järjestäjä: %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:2219
+#, c-format
+msgid "Organizer: %s"
+msgstr "Järjestäjä: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "Alkaa:"
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Erääntyy:"
+
+#: ../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:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1230 ../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:1221 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
-#: ../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 "_Avaa www-sivu"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "T_ulosta..."
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../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 "L_eikkaa"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1669
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1679 ../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 "L_iitä"
 
-#: ../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 "_Anna tehtäväksi"
 
-#: ../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 "_Välitä iCalendar-muodossa"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merkitse valitut tehtävät valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Merkitse keskeneräiseksi"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Merkitse valitut tehtävät keskeneräisiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Poista valitut tehtävät"
 
-#: ../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 "Lisää tehtävä tästä"
@@ -7114,6 +7512,7 @@ msgid "Due date"
 msgstr "Eräpäivä"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/tasktypes.xml.h:37
 #: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "Prioriteetti"
@@ -7122,112 +7521,93 @@ msgstr "Prioriteetti"
 msgid "Start date"
 msgstr "Aloituspäivä"
 
-#: ../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 "Tila"
-
-#: ../calendar/gui/e-calendar-view.c:1349
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Siirretään kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1351
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Kopioidaan kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "Uusi _kokous"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_Nykyinen näkymä"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Valitse _tämä päivä"
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Valitse päiväys..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "T_ulosta..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Poista _kaikki tapahtumakerrat"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2227
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Järjestäjä: %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 "Järjestäjä: %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:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
@@ -7266,20 +7646,20 @@ msgstr "%02i minuutin välein"
 #. 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
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
+#: ../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/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
+#: ../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/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
 
@@ -7375,12 +7755,12 @@ msgstr "iCalendarin virhe"
 
 #: ../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:344
 #: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:432
 #: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:520
 #: ../plugins/itip-formatter/itip-view.c:521
-#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
@@ -7396,12 +7776,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:2034
 msgid "Accepted"
 msgstr "Hyväksytty"
 
 #: ../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:2037
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
@@ -7409,7 +7789,7 @@ msgstr "Alustavasti hyväksytty"
 #: ../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:2040
 msgid "Declined"
 msgstr "Hylätty"
 
@@ -7626,10 +8006,9 @@ msgid "Attendee status updated\n"
 msgstr "Läsnäolon tila päivitetty\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Läsnäolon tilaa ei voi päivittää, koska kohdetta ei enää ole olemassa"
+msgstr "Läsnäolon tilaa ei voi päivittää, koska kohdetta ei enää ole olemassa"
 
 #: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
@@ -7724,49 +8103,49 @@ msgstr "Osanottajat"
 
 #: ../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 "Henkilö"
 
 #: ../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 "Ryhmä"
 
 #: ../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 "Resurssi"
 
 #: ../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 "Huone"
 
 #: ../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 "Puheenjohtaja"
 
 #: ../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 "Vaadittu läsnäolija"
 
 #: ../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 "Vapaaehtoinen läsnäolija"
 
 #: ../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 "Ei läsnä"
 
@@ -7785,7 +8164,7 @@ msgstr "Alustava"
 #: ../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:2043
 msgid "Delegated"
 msgstr "Valtuutettu"
 
@@ -7890,10 +8269,6 @@ msgstr "_Alkamisaika:"
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Osanottaja"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Lisää läsnäolija tästä"
@@ -7927,7 +8302,7 @@ msgid "Click to add a memo"
 msgstr "Lisää muistilappu tästä"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2864
+#: ../calendar/gui/gnome-cal.c:2960
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7966,54 +8341,50 @@ msgstr "Viimeistellään tehtäviä..."
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
-#: ../calendar/gui/e-timezone-entry.c:130
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Valitse aikavyöhyke"
 
 #. 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"
 
-#: ../calendar/gui/gnome-cal.c:830
-msgid "Updating query"
-msgstr "Päivitetään kyselyä"
-
-#: ../calendar/gui/gnome-cal.c:2501
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "_Oma näkymä"
 
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Tallenna oma näkymä"
 
-#: ../calendar/gui/gnome-cal.c:2507
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Määrittele näkymät..."
 
-#: ../calendar/gui/gnome-cal.c:2688
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ladataan tapaamisia %s"
 
-#: ../calendar/gui/gnome-cal.c:2707
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ladataan tehtäviä %s"
 
-#: ../calendar/gui/gnome-cal.c:2716
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Ladataan muistilappuja lähteestä %s"
 
-#: ../calendar/gui/gnome-cal.c:2823
+#: ../calendar/gui/gnome-cal.c:2919
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: ../calendar/gui/gnome-cal.c:3779
+#: ../calendar/gui/gnome-cal.c:3873
 msgid "Purging"
 msgstr "Tyhjennetään"
 
@@ -8168,10 +8539,6 @@ msgstr "Muistilappujen lähteen valinta"
 msgid "New memo"
 msgstr "Uusi muistilappu"
 
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "M_uistilappu"
-
 #: ../calendar/gui/memos-component.c:1261
 msgid "Create a new memo"
 msgstr "Luo uusi muistilappu"
@@ -8180,10 +8547,6 @@ msgstr "Luo uusi muistilappu"
 msgid "New shared memo"
 msgstr "Uusi jaettu muistilappu"
 
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "_Jaettu muistilappu"
-
 #: ../calendar/gui/memos-component.c:1269
 msgid "Create a shared new memo"
 msgstr "Luo uusi jaettu muistilappu"
@@ -8192,10 +8555,6 @@ msgstr "Luo uusi jaettu muistilappu"
 msgid "New memo list"
 msgstr "Uusi muistilappulista"
 
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "Muistilappuli_sta"
-
 #: ../calendar/gui/memos-component.c:1277
 msgid "Create a new memo list"
 msgstr "Luo uusi muistilappulista"
@@ -8204,6 +8563,10 @@ msgstr "Luo uusi muistilappulista"
 msgid "Print Memos"
 msgstr "Tulosta muistilaput"
 
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Seuraavat 7 päivää"
+
 #: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8407,54 +8770,54 @@ msgstr "Pe"
 msgid "Sa"
 msgstr "La"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Tehtävä"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Yhteenveto: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Osanottajat:"
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteetti: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %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 "Ryhmät: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "Tulevat tapaamiset"
 
@@ -8500,10 +8863,6 @@ msgstr "Luo uusi tehtävä"
 msgid "New assigned task"
 msgstr "Uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1333
-msgid "Assigne_d Task"
-msgstr "Tehtäväksi_anto"
-
 #: ../calendar/gui/tasks-component.c:1334
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
@@ -8512,10 +8871,6 @@ msgstr "Luo uusi tehtäväksianto"
 msgid "New task list"
 msgstr "Uusi tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1341
-msgid "Tas_k list"
-msgstr "_Tehtävälista"
-
 #: ../calendar/gui/tasks-component.c:1342
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
@@ -8532,7 +8887,7 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Älä kysy enää uudestaan"
 
@@ -8540,13 +8895,34 @@ msgstr "Älä kysy enää uudestaan"
 msgid "Print Tasks"
 msgstr "Tulosta tehtävät"
 
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% valmiina"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "Kesken"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "on suurempi kuin"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "on vähemmän kuin"
+
 #: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
 #: ../calendar/importers/icalendar-importer.c:331
 #: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
@@ -10116,200 +10492,196 @@ msgstr "Automaattitallennuksen tiedostoa ei voi avata"
 msgid "Unable to retrieve message from editor"
 msgstr "Viestiä ei voi hakea muokkaimelta"
 
-#: ../composer/e-composer-actions.c:46
+#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Lisää liite"
 
-#: ../composer/e-composer-actions.c:50
+#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "Lii_tä"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:143
 msgid "Untitled Message"
 msgstr "Nimeämätön viesti"
 
-#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
-msgid "_Attachment..."
-msgstr "_Liite..."
-
-#: ../composer/e-composer-actions.c:466
+#: ../composer/e-composer-actions.c:474
 msgid "Attach a file"
 msgstr "Liitä tiedosto viestiin"
 
-#: ../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 "_Sulje"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:481
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1343
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1337
 #: ../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-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../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 "Tulostuksen esikatselu"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:502
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:507
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:509
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellä"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:514
 msgid "Save _Draft"
 msgstr "Tallenna _luonnos"
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:516
 msgid "Save as draft"
 msgstr "Tallenna luonnoksena"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:521
 msgid "S_end"
 msgstr "_Lähetä"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:523
 msgid "Send this message"
 msgstr "Lähetä viesti heti"
 
-#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Lähetysasetukset"
-
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:530
 msgid "Insert Send options"
 msgstr "Lisää lähetysvaihtoehtoja"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "Uusi _viesti"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "Avaa uuden viestin luonti-ikkuna"
+
+#: ../composer/e-composer-actions.c:544
 msgid "Character _Encoding"
 msgstr "M_erkistön koodaus"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:551
 msgid "_Security"
 msgstr "Turvalli_suus"
 
-#: ../composer/e-composer-actions.c:546
+#: ../composer/e-composer-actions.c:561
 msgid "PGP _Encrypt"
 msgstr "PGP-_salaus"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:563
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tämä viesti PGP:llä"
 
-#: ../composer/e-composer-actions.c:554
+#: ../composer/e-composer-actions.c:569
 msgid "PGP _Sign"
 msgstr "PGP-_allekirjoitus"
 
-#: ../composer/e-composer-actions.c:556
+#: ../composer/e-composer-actions.c:571
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:577
 msgid "_Prioritize Message"
 msgstr "_Aseta viestin prioriteetti"
 
-#: ../composer/e-composer-actions.c:564
+#: ../composer/e-composer-actions.c:579
 msgid "Set the message priority to high"
 msgstr "Aseta viestille korkea prioriteetti"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:585
 msgid "Re_quest Read Receipt"
 msgstr "Pyydä luku_kuittausta"
 
-#: ../composer/e-composer-actions.c:572
+#: ../composer/e-composer-actions.c:587
 msgid "Get delivery notification when your message is read"
 msgstr "Pyydä lähettämään kuittaus, kun viestisi on luettu"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:593
 msgid "S/MIME En_crypt"
 msgstr "S/_MIME-salaus"
 
-#: ../composer/e-composer-actions.c:580
+#: ../composer/e-composer-actions.c:595
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Salaa viesti S/MIME salausvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:601
 msgid "S/MIME Sig_n"
 msgstr "S/MIME-a_llekirjoitus"
 
-#: ../composer/e-composer-actions.c:588
+#: ../composer/e-composer-actions.c:603
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allekirjoita tämä viesti S/MIME allekirjoitusvarmenteellasi"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:609
 msgid "_Bcc Field"
 msgstr "_BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:596
+#: ../composer/e-composer-actions.c:611
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Vaihtelee näytetäänkö BCC-kenttä"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:617
 msgid "_Cc Field"
 msgstr "_Kopio-kenttä"
 
-#: ../composer/e-composer-actions.c:604
+#: ../composer/e-composer-actions.c:619
 msgid "Toggles whether the CC field is displayed"
 msgstr "Määrittää näytetäänkö Kopio-kenttä (CC)."
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:625
 msgid "_From Field"
 msgstr "_Lähettäjä-kenttä"
 
-#: ../composer/e-composer-actions.c:612
+#: ../composer/e-composer-actions.c:627
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Määrittää näytetäänkö Lähettäjä-kenttä"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:633
 msgid "_Post-To Field"
 msgstr "_Postitusosoite-kenttä (Post-To)"
 
-#: ../composer/e-composer-actions.c:620
+#: ../composer/e-composer-actions.c:635
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Määrittää näytetäänkö Postitusosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:641
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:628
+#: ../composer/e-composer-actions.c:643
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Määrittää näytetäänkö Vastausosoite-kenttä"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:649
 msgid "_Subject Field"
 msgstr "Ot_sikko-kenttä"
 
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:651
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Määrittää näytetäänkö otsikkokenttä"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:657
 msgid "_To Field"
 msgstr "_Vastaanottaja-kenttä"
 
-#: ../composer/e-composer-actions.c:644
+#: ../composer/e-composer-actions.c:659
 msgid "Toggles whether the To field is displayed"
 msgstr "Määrittää näytetäänkö Vastaanottaja-kenttä"
 
-#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
-msgid "Attach"
-msgstr "Liitä tiedosto"
-
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Syötä viestin vastaanottajat"
@@ -10378,18 +10750,18 @@ msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 msgid "Recent _Documents"
 msgstr "Viimeisimmät _asiakirjat"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10397,23 +10769,23 @@ msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../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:1500 ../mail/em-format-html-display.c:1913
+#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Liite"
 msgstr[1] "Liitteet"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:4056
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10559,23 +10931,27 @@ msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Käyttäjätili täytyy määritellä ennen kuin sähköpostia voidaan lähettää."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Jatka muokkausta"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "Ä_lä palauta"
 
-#: ../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 "_Palauta"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Tallenna viesti"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "Tallenna _luonnos"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution-sähköposti ja -kalenteri"
 
-#: ../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 "Ryhmätyöohjelmisto"
 
@@ -10632,15 +11008,15 @@ msgstr "käytössä"
 msgid "Whether the plugin is enabled"
 msgstr "Onko liitännäinen käytössä"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Tapahtui virhe tulostettaessa"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "Tulostusjärjestelmä kertoi seuraavat yksityiskohdat virheestä:"
 
-#: ../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 "Tulostusjärjestelmä ei kertonut tarkempia tietoja virheestä."
@@ -10714,11 +11090,12 @@ msgid "Label name cannot be empty."
 msgstr "Merkinnälle täytyy antaa nimi."
 
 #: ../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 "Samanniminen merkintä on jo olemassa, anna joku muu nimi."
+msgstr ""
+"Samanniminen merkintä on jo tallennettu palvelimelle. Nimeä merkintä "
+"uudestaan."
 
 #: ../e-util/gconf-bridge.c:1218
 #, c-format
@@ -10727,7 +11104,7 @@ msgstr "GConf-virhe: %s"
 
 #: ../e-util/gconf-bridge.c:1228
 msgid "All further errors shown only on terminal."
-msgstr ""
+msgstr "Kaikki virheet tästä eteenpäin näkyvät vain päätteessä."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10854,56 +11231,56 @@ msgstr "Valitse tiedosto"
 msgid "Test"
 msgstr "Testi"
 
-#: ../filter/filter-rule.c:847
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../filter/filter-rule.c:875
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Etsi kohdat, jotka vastaavat seuraavaa ehtoa"
 
-#: ../filter/filter-rule.c:909
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "Lisää _suodatussääntö"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "jos kaikki ehdot täytetään"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "jos joku ehdoista täyttyy"
 
-#: ../filter/filter-rule.c:917
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Etsi kohteita:"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../filter/filter-rule.c:939
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../filter/filter-rule.c:941
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "O_ta myös säikeet mukaan"
 
-#: ../filter/filter-rule.c:1039 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../filter/filter-rule.c:1039 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Lähtevät"
 
@@ -11018,7 +11395,8 @@ msgstr "määrittelemäsi aika"
 
 #: ../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
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "viikkoa"
 
@@ -11090,10 +11468,10 @@ msgstr "Evolutionin sähköpostin asetukset"
 msgid "Evolution Network configuration control"
 msgstr "Evolutionin verkkoyhteyden asetukset"
 
-#: ../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:605
 #: ../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 "Sähköposti"
@@ -11152,46 +11530,46 @@ msgstr "Kysy jokaisen viestin osalta"
 msgid "Identity"
 msgstr "Omat tiedot"
 
-#: ../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 "Vastaanotto"
 
-#: ../mail/em-account-editor.c:2041
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "T_arkista uudet viestit joka"
 
-#: ../mail/em-account-editor.c:2049
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minuutti"
 
-#: ../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 "Lähetys"
 
-#: ../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 "Oletusasetukset"
 
 #. 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 "Turvallisuus"
 
 #. 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 "Vastaanottoasetukset"
 
-#: ../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 "Uusien viestien etsintä"
 
-#: ../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 "Tilimuokkain"
 
-#: ../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 "Evolutionin sähköpostitilien apulainen"
 
@@ -11225,18 +11603,18 @@ msgstr "Lisää allekirjoitus-skripti"
 msgid "Signature(s)"
 msgstr "Allekirjoitukset"
 
-#: ../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 "------- Välitetty viesti ---------"
 
-#: ../mail/em-composer-utils.c:1819
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. 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:"
@@ -11244,7 +11622,7 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-composer-utils.c:2009
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
@@ -11265,10 +11643,6 @@ msgstr "Aseta väri"
 msgid "Assign Score"
 msgstr "Aseta pistemäärä"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Liitteet"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11285,10 +11659,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Valmistui"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "sisältää"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
@@ -11313,10 +11683,6 @@ msgstr "Poista"
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "ei sisällä"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "ei pääty"
@@ -11337,10 +11703,6 @@ msgstr "ei kuulosta samalta kuin"
 msgid "does not start with"
 msgstr "ei ala"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Ei ole olemassa"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Luonnos"
@@ -11349,10 +11711,6 @@ msgstr "Luonnos"
 msgid "ends with"
 msgstr "päättyy"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "On olemassa"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "on olemassa"
@@ -11365,14 +11723,10 @@ msgstr "Lauseke"
 msgid "Follow Up"
 msgstr "Lähetä edelleen"
 
-#: ../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 "Tärkeä"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "on"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "on jälkeen"
@@ -11385,18 +11739,6 @@ msgstr "on ennen"
 msgid "is Flagged"
 msgstr "on merkitty"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "on suurempi kuin"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "on vähemmän kuin"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "ei ole"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ei ole merkitty"
@@ -11460,7 +11802,7 @@ msgstr "Soita ääni"
 
 #. 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
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Lue"
 
@@ -11534,7 +11876,7 @@ msgstr "Pysäytä käsittely"
 
 #: ../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
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11593,11 +11935,11 @@ msgstr "Tärkeät viestit"
 msgid "Messages Not Junk"
 msgstr "Viestit, jotka eivät ole roskapostia"
 
-#: ../mail/em-folder-browser.c:1147
+#: ../mail/em-folder-browser.c:1170
 msgid "Account Search"
 msgstr "Haku tileiltä"
 
-#: ../mail/em-folder-browser.c:1200
+#: ../mail/em-folder-browser.c:1223
 msgid "All Account Search"
 msgstr "Hae kaikilta tileiltä"
 
@@ -11617,11 +11959,19 @@ msgstr[0] "Viestejä kaikkiaan:"
 msgstr[1] "Viestejä kaikkiaan:"
 
 #: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
-#, fuzzy
 msgid "Quota usage"
-msgstr "Viestejä kaikkiaan:"
+msgstr "Levytilan käyttö"
+
+#. 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 "Saapuneet"
 
-#: ../mail/em-folder-properties.c:385
+#: ../mail/em-folder-properties.c:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Kansion ominaisuudet"
@@ -11649,353 +11999,323 @@ msgstr "Hakunäkymät"
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../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 "Luonnokset"
 
-#. 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 "Saapuneet"
-
-#: ../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 "Lähtevät"
 
-#: ../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 "Lähetetyt"
 
-#: ../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 "Ladataan..."
 
-#. 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 "Sähköpostikansioiden puu"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1954
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1956
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
 
-#: ../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:104
 msgid "_Copy to Folder"
 msgstr "_Kopioi kansioon"
 
-#: ../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:117
 msgid "_Move to Folder"
 msgstr "_Siirrä kansioon"
 
-#: ../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 "Etsitään kansioita kohteessa \"%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 "_Näytä"
-
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: ../mail/em-folder-tree.c:2091
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Siirrä..."
 
-#: ../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 "_Nimeä uudestaan..."
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Vi_rkistä"
 
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "T_yhjennä lähtevien kansio"
 
-#: ../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 "_Tyhjennä roskakori"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopioidaan %s paikkaan %s"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Luodaan kansiota %s"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Luo uusi kansio"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Sähköpostin poisto epäonnistui"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Oikeutesi eivät riitä tämän sähköpostin poistamiseen."
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:569 ../mail/em-popup.c:580
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Välitä"
 
 #. 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:1335 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse _edelleen lähetettäväksi..."
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Merkintä"
 
 #. 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:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Ei mitään"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_uusi merkintä"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistä sääntö"
 
 #. 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:1368
 msgid "Search Folder based on _Subject"
 msgstr "Hakunäkymä _aiheen perusteella"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Hakunäkymä _lähettäjän perusteella"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Hakunäkymä _vastaanottajien perusteella"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Hakunäkymä _postituslistan perusteella"
 
 #. 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:1376
 msgid "Filter based on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
 #. 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:2255 ../mail/em-folder-view.c:2298
+#: ../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 "Oletukset"
 
-#: ../mail/em-folder-view.c:2530
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Viestiä ei voi hakea"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Noudetaan viestiä..."
 
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "_Soita..."
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Luo uusi hakunäkymä"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_Osoitteeseen:"
 
-#: ../mail/em-folder-view.c:3310
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
 
-#: ../mail/em-folder-view.c:3322
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Soita numeroon %s napsauttamalla"
 
-#: ../mail/em-folder-view.c:3327
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
 #. 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 "Osumia: %d"
 
-#: ../mail/em-format-html-display.c:616
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "Et_si:"
 
 #. 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 "_Edellinen"
 
-#: ../mail/em-format-html-display.c:645
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: ../mail/em-format-html-display.c:650
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "Täsmää _kirjainkoko"
 
-#: ../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:650
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../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."
@@ -12003,11 +12323,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: ../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:651
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../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."
@@ -12015,23 +12335,23 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on hyvin "
 "todennäköisesti aito."
 
-#: ../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:652
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../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."
 msgstr ""
-"Tämän viestin allekirjoitusta ei voi tarkistaa, se on ehkä muuttunut "
-"siirron aikana."
+"Tämän viestin allekirjoitusta ei voi tarkistaa, se on ehkä muuttunut siirron "
+"aikana."
 
-#: ../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:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voi varmistaa"
 
-#: ../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."
@@ -12039,11 +12359,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voi varmistaa."
 
-#: ../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:654
 msgid "Signature exists, but need public key"
 msgstr "Allekirjoitus löytyi, mutta tarvitsee julkisen avaimen"
 
-#: ../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."
@@ -12051,11 +12371,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjän julkista avainta ei löydy."
 
-#: ../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:660
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../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."
@@ -12063,11 +12383,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
 "Internetin läpi."
 
-#: ../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:661
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../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 "
@@ -12077,11 +12397,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön "
 "melko lyhyessä ajassa."
 
-#: ../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:662
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../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."
@@ -12089,11 +12409,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: ../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:663
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../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 "
@@ -12103,94 +12423,94 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältöä missään "
 "käytännöllisessä ajassa."
 
-#: ../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 "_Näytä varmenne"
 
-#: ../mail/em-format-html-display.c:1079
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voi näyttää"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1371
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Valmistui %B %d, %Y, %l.%M %p"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Eräpäivä ylitetty:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "kirjoittanut %d %l.%M %p"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "Sovita _leveyteen"
 
-#: ../mail/em-format-html-display.c:1464
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "Näytä alkuperäinen k_oko"
 
-#: ../mail/em-format-html-display.c:1984
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Tallenna liite nimellä"
 
-#: ../mail/em-format-html-display.c:1988
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Valitse kansio, johon kaikki liitteet tallennetaan"
 
-#: ../mail/em-format-html-display.c:2039
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_Tallenna valinta..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2106
+#: ../mail/em-format-html-display.c:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d lii_te"
 msgstr[1] "%d lii_tettä"
 
-#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "T_allenna"
 
-#: ../mail/em-format-html-display.c:2124
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "Tallenna _kaikki"
 
-#: ../mail/em-format-html-display.c:2198
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Ei liitteitä"
 
-#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "Näytä _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2341
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "Piilota _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2396
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "Avaa _ohjelmalla"
 
-#: ../mail/em-format-html-display.c:2467
-#, fuzzy
+#: ../mail/em-format-html-display.c:2468
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
-"Evolution ei voi esittää tätä viestiä, koska se on liian suuri. Voit näyttää "
-"sen muotoilemattomana tai ulkoisella tekstinmuokkaimella."
+"Evolution ei voi esittää tätä viestiä, koska se on liian suuri "
+"käsiteltäväksi.  Voit näyttää sen muotoilemattomana tai ulkoisella "
+"tekstinmuokkaimella."
 
 #: ../mail/em-format-html-print.c:156
 #, c-format
@@ -12257,7 +12577,7 @@ msgid "Bcc"
 msgstr "Piilokopiot"
 
 #. 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 "Postittaja"
@@ -12282,7 +12602,7 @@ msgstr "Tämä viesti lähetettiin <b>%s</b> käyttäjän <b>%s</b> puolesta"
 
 #: ../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
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "Lähettäjä"
 
@@ -12306,43 +12626,43 @@ msgstr "Uutisryhmät"
 msgid "%s attachment"
 msgstr "Liite: %s"
 
-#: ../mail/em-format.c:1198
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME viestin tulkitseminen epäonnistui: tuntematon virhe"
 
-#: ../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 "MIME-viestin tulkitseminen epäonnistui, näytetään lähdekoodi"
 
-#: ../mail/em-format.c:1343
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME-viestiä ei voitu tulkita"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME-viestiä ei voitu tulkita: tuntematon virhe"
 
-#: ../mail/em-format.c:1510
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: ../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 "Virhe tarkistettaessa allekirjoitusta"
 
-#: ../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 "Tuntematon virhe tarkistettaessa allekirjoitusta"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "PGP-viestiä ei voitu tulkita"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP-viestiä ei voitu tulkita: tuntematon virhe"
 
@@ -12405,68 +12725,80 @@ msgid "No Junk plugin available"
 msgstr "Roskapostiliitännäistä ei ole saatavilla"
 
 #. green
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Tehtävää"
 
 #. blue
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Myöhemmin"
 
-#: ../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 ""
-"Evolutionin sähköpostikansioiden sijainti ja rakenne on muuttunut versiosta "
-"Evolution 1.x.\n"
-"\n"
-"Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
-
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kansiota '%s' ei voi luoda: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kansiota %s ei voi kopioidaan kohtaan %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ähköpostin läpikäynti kohteesta '%s' epäonnistui: %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 ""
+"Evolutionin sähköpostikansioiden sijainti ja rakenne on muuttunut versiosta "
+"Evolution 1.x.\n"
+"\n"
+"Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Vanhaa POP keep-on-server tietoa '%s' ei voi avata: %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 tietojen hakemistoa '%s' ei voi luoda: %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 tietoa `%s' ei voi kopioida: %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 "Paikallista sähköpostitilaa '%s' ei voi luoda: %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 ""
+"Evolutionin sähköpostikansioiden yhteenvedon esitys on siirretty sqlite-"
+"tietokantaan versiossa 2.24\n"
+"\n"
+"Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Paikallisia sähköpostikansioita ei voi luoda paikkaan '%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."
@@ -12474,17 +12806,17 @@ msgstr ""
 "Asetuksia ei voi lukea aikaisemmasta Evolutionin asennuksesta, evolution/"
 "config.xmldb' on joko vaurioitunut tai puuttuu."
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
 #. make it first item
-#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:858
 msgid "_Add to Address Book"
 msgstr "_Lisää osoitekirjaan"
 
@@ -12546,18 +12878,16 @@ msgid "Search Folder source"
 msgstr "Hakunäkymän lähde"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-#, fuzzy
 msgid "\"Send and Receive Mail\" window height"
-msgstr "Lähetä ja vastaanota postia"
+msgstr "\"Lähetä ja vastaanota\" -ikkunan korkeus"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr ""
+msgstr "\"Lähetä ja vastaanota\" -suurennustila"
 
 #: ../mail/evolution-mail.schemas.in.h:3
-#, fuzzy
 msgid "\"Send and Receive Mail\" window width"
-msgstr "Lähetä ja vastaanota postia"
+msgstr "\"Lähetä ja vastaanota\" -ikkunan leveys"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
@@ -12616,82 +12946,90 @@ msgstr ""
 "address_count määrättyyn arvoon."
 
 #: ../mail/evolution-mail.schemas.in.h:17
-#, fuzzy
-msgid "Custom headers to use while checking for junk."
-msgstr "Määrittää otsakkeen, jota käytetään roskapostin tunnistamiseen."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Määrittää kuinka usein paikalliset muutokset synkronoidaan "
+"postipalvelimelle.  Aikavälin täytyy olla vähintään 30 sekuntia."
 
 #: ../mail/evolution-mail.schemas.in.h:18
-#, fuzzy
+msgid "Custom headers to use while checking for junk."
+msgstr "Omat otsakkeet, joiden perusteella roskaposti tunnistetaan."
+
+#: ../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 ""
-"Määrittää roskapostiotsakkeen. Asetuksen muoto gconf:issa on otsakenimi=arvo."
+"Määrittää oman otsakkeen, josta roskapostiviestejä tunnistetaan. Luettelon "
+"kohdat ovat muodossa \"otsakenimi=arvo\"."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Viestien kirjoittamisessa oletuksena käytetty merkistö."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Viestejä näytettäessä oletuksena käytetty merkistö."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Välityksen oletustyyli"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Viesti-ikkunan oletuskorkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Viesti-ikkunan oletuskorkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Tilausikkunan oletuskorkeus."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Vastauksen oletustyyli"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Säikeen laajennuksen tilan oletusarvo"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Viesti-ikkunan oletusleveys."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Viesti-ikkunan oletusleveys."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Tilausikkunan oletusleveys."
 
-#: ../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 "Määrittää, haetaanko osoitekirjasta lähettäjän sähköpostiosoitetta"
+msgstr ""
+"Määrittää, haetaanko lähettäjän sähköpostiosoitetta rosköpostin suodatusta "
+"varten vain paikallisista osoitekirjoista"
 
-#: ../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 "Määrittää, haetaanko osoitekirjasta lähettäjän sähköpostiosoitetta"
 
-#: ../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 "
@@ -12704,12 +13042,12 @@ msgstr ""
 "haku voi olla hidas, jos osoitteita täydennetään automaattisesti esimerkiksi "
 "LDAP-osoitekirjoista."
 
-#: ../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 ""
 "Määrittää käytetäänkö omia roskapostiotsakkeita roskapostin tunnistamiseen"
 
-#: ../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 "
@@ -12719,7 +13057,7 @@ msgstr ""
 "käytössä ja otsakkeet on annettu, voidaan tällä nopeuttaa roskapostin "
 "tunnistamista."
 
-#: ../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."
@@ -12727,59 +13065,59 @@ msgstr ""
 "Määrittää käytetäänkö samaa kirjaisinta sekä \"Lähettäjä\" ja \"Vastaanottaja"
 "\" riveillä \"Viestit\"-sarakkeessa käytettäessä pystynäkymää."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Kansio, josta sähköpostin liitteitä etsitään."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Kansio, johon sähköpostin osatiedostot tallennetaan."
 
-#: ../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 ""
+msgstr "Määritä typistetäänkö kansioiden nimet kansionäkymässä"
 
-#: ../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 "Näytä oikoluvun kirjoitusvirhemerkit sanoissa kirjoituksen aikana."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Tyhjennä roskapostikansiot lopetettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Tyhjennä roskakorit lopetettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskapostikansiot kun Evolution suljetaan"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tyhjennä kaikki roskakorit kun Evolution suljetaan"
 
-#: ../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 "Kytke caret-tila, jolloin näet kursorin lukiessasi sähköpostia."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Käytetäänkö maagista välilyöntinäppäintä"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Käytetäänkö kirjoituksenaikaista hakua"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "ota hakunäkymät käyttöön"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Ota hakunäkymät käyttöön käynnistettäessä."
 
-#: ../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 "
@@ -12791,7 +13129,7 @@ msgstr ""
 "etsimään kansio sivupaneelista kirjoittamalla kansion nimi, jolloin valinta "
 "hyppää suoraan kansion kohdalle."
 
-#: ../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."
@@ -12799,27 +13137,27 @@ msgstr ""
 "käytä tätä, jos kaluat käyttää välilyntönäppäintä siirtyäksesi viestin "
 "esikatselussa, viestiluettelossa ja kansioluettelossa."
 
-#: ../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 "Ota käyttöön viestin tekstiosan rajoitettu näyttökoko."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Kytke/poista caret-tila"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Viestiluettelon korkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Viestiluettelopaneelin korkeus."
 
-#: ../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 "Piilottaa kansiokohtaisen esikatselun ja poistaa valinnan"
 
-#: ../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."
@@ -12827,7 +13165,7 @@ msgstr ""
 "Jos yrität avata 10 tai useampia viestejä kerralla, kysytään haluatko "
 "todella tehdä sen."
 
-#: ../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."
@@ -12835,7 +13173,7 @@ msgstr ""
 "Jos \"Esikatselu\"-paneeli on käytössä, se näytetään viestiluettelon "
 "vieressä eikä alapuolella."
 
-#: ../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 "
@@ -12845,13 +13183,15 @@ msgstr ""
 "voidaan käyttää mitä tahansa Gnomen MIME-tyyppientietokannassa määriteltyä "
 "bonobo-komponentin katselinta viestin näyttämiseen."
 
-#: ../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 ""
+"\"Lähetä ja vastaanota sähköpostia\"-ikkunan aloituskorkeus. Arvo muuttuu, "
+"jos käyttäjä muuttaa ikkunan korkeutta."
 
-#: ../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 "
@@ -12859,18 +13199,24 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
+"\"Lähetä ja vastaanota sähköpostia\"-ikkunan suurennustilan oletusarvo. Arvo "
+"muuttuu, jos käyttäjä suurentaa tai palauttaa ikkunan. Huomaa, että "
+"evolution ei käytä tätä arvoa, koska kyseinen ikkuna ei ole "
+"suurennettavissa. Avain on olemassa vain teknisten yksityiskohtien takia."
 
-#: ../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 ""
+"\"Lähetä ja vastaanota sähköpostia\"-ikkunan aloitusleveys. Arvo muuttuu, "
+"jos käyttäjä muuttaa ikkunan leveyttä."
 
-#: ../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 "Näytetäänkö vahvistusikkuna merkittäessä useita viestejä."
 
-#: ../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."
@@ -12878,7 +13224,7 @@ msgstr ""
 "Poistaa käytöstä ominaisuuden, joka kysyy useita kertoja vaaditaanko "
 "synkronointia yhteydettömään tilaan siirryttäessä."
 
-#: ../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 "
@@ -12887,31 +13233,31 @@ msgstr ""
 "Määrittää annetaanko toistuvia  varoituksia viestien poistosta hakunäkymistä "
 "ja siitä, että viesti poistetaan pysyvästi, ei vain hakutuloksista."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Viimeisin kerta, kun roskapostikansiot tyhjennettiin"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Roskakori tyhjennettiin viimeksi"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Taso, jonka jälkeen viesti lokitetaan."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Merkinnät ja niihin liittyvät värit"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Hyväksytyt lisenssit"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Luettelo tileistä"
 
-#: ../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."
@@ -12920,15 +13266,15 @@ msgstr ""
 "merkkijonoja, jotka nimeävät alihakemistoja hakemiston/apps/evolution/mail/"
 "accounts alla."
 
-#: ../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 "Luettelo omista otsakkeista ja tieto siitä ovatko ne käytössä."
 
-#: ../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 "Luettelo oikoluvun käyttämistä sanaston kielikoodeista."
 
-#: ../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."
@@ -12936,129 +13282,129 @@ msgstr ""
 "Evolutionin sähköpostiosan tuntemat etiketit. Luettelo sisältää nimi:väri "
 "pareja, joissa väri on määritelty HTML-värien heksadesimaalisessa muodossa."
 
-#: ../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 "Luettelo MIME-tyypeistä, joille etsitään bonobo komponenttikatselimia"
 
-#: ../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 "Luettelo protokollista, joiden lisenssi on hyväksytty."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Hae HTML-viestien kuvat käyttäen HTTP:ta"
 
-#: ../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 ""
-"Lataa HTML-viestien kuvia HTTP(S):n yli. Mahdollisia arvoja ovat: 0 (älä "
-"koskaan hae kuvia verkosta) 1 (hae kuvia, jos lähettäjä on osoitekirjassa) 2 "
-"(hae kuvat aina verkosta)."
+"Lataa HTML-viestien kuvia HTTP(S):n yli. Mahdollisia arvoja ovat: \"0\" (älä "
+"koskaan hae kuvia verkosta) \"1\" (hae kuvia, jos lähettäjä on "
+"osoitekirjassa) \"2\" (hae kuvat aina verkosta)."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Kirjaa suodattimien toimenpiteet määriteltyyn lokitiedostoon."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Viesti-ikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Viestiikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Viestin näyttötyyli (\"normal\", \"full headers\" tai \"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 "Lyhin aika päivinä, jonka kuluttua roskapostit poistetaan suljettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Lyhin aika päivinä, jonka kuluttua roskakori tyhjennetään suljettaessa"
 
-#: ../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 ""
 "Lyhin aika jonka kuluttua roskapostit poistetaan suljettaessa, arvo päivinä."
 
-#: ../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 "Vähimmäisaika roskakorin tyhjennysten välillä (päiviä)."
 
-#: ../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- ja Bcc-osoitteiden näytettävä lukumäärä"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: ../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 ""
 "Kysy vahvistus, kun kansioista siivotaan pysyvästi poistettuja viestejä."
 
-#: ../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 ""
 "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: ../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 "Kysy vahvistus haluaako käyttäjä siirtyä yhteydettömään tilaan heti"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Kysy poistettaessa viestejä hakukansiosta"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä siivoaa poistettuja"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos käyttäjä syöttää ainoastaan Bcc-kentän"
 
-#: ../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 "Kysy kun käyttäjä yrittää avata kymmenen tai useampia kerralla"
 
-#: ../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."
@@ -13066,140 +13412,144 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka "
 "eivät sellaista halua vastaanottaa."
 
-#: ../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 ""
 "Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-"
 "kenttiä"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kysy vahvistus, jos yritetään lähteä ei-toivottua HTML-postia"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Kysy vahvistus merkittäessä useita viestejä"
 
-#: ../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 "Tunnista hymiöt tekstissä ja korvaa ne kuvilla."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Tunnista linkit tekstissä ja korvaa ne linkillä"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Suorita roskapostitarkistus saapuvalle postille."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Tallenna kansio"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Etsi lähettäjän kuvaa paikallisista osoitekirjoista"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Lähetä oletuksena HTML-sähköpostia"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Lähetä HTML-postia oletuksena."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Näytä lähettäjän sähköposti viestiluettelossa"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Palvelimen synkronoinnin aikaväli"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Näytä animaatiot"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Näytä animoidut kuvat animaatioina"
 
-#: ../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 "Näytä poistetut viestit yliviivattuna viestiluettelossa."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Näytä poistetut viestit viestiluettelossa"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Näytä lähettäjän valokuva"
 
-#: ../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 ""
 "Näytä lähettäjän sähköpostiosoite viestiluettelossa erillisessä sarakkeessa."
 
-#: ../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 "Näytä lähettäjän kuva viesti-ikkunan lukupaneelissa"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Oikolue kirjoitettaessa"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Oikoluvun väri"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "Oikoluvun kielet"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Tilausikkunan oletuskorkeus"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Tilausikkunan oletusleveys"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Päätteen kirjasin"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Tekstin viestiosan kokoraja"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Roskapostikäsittelijän oletusliitännäinen"
 
-#: ../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 "Viimeisimmän roskapostien poistokerran unix-aikaleima."
 
-#: ../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 "Viimeisimmän roskakorin tyhjennyksen unix-aikaleima."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Päätekirjasin viestejä näytettäessä."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Vaihtelevan levyinen kirjasin viestejä näytettäessä."
 
-#: ../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 ""
-"Tällä asetuksella voi olla kolme arvoA: 0 (ei virheitä), 1 (varoitukset) tai "
-"2 (vianetsintäviestit)."
+"Tällä asetuksella voi olla kolme arvoa: \"0\" (ei virheitä), \"1"
+"\" (varoitukset) tai \"2\" (vianetsintäviestit)."
 
-#: ../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."
@@ -13207,7 +13557,7 @@ msgstr ""
 "Tämä määrittää maksimikoon viestin tekstiosalle, joka voidaan esittää "
 "evolutionissa. Oletusarvo on 4096kt ja arvo määritellää kilotavuina."
 
-#: ../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 "
@@ -13217,15 +13567,16 @@ msgstr ""
 "käytössä. Jos oletusliitännäinen ei ole käytössä, ei palata käyttämään muita "
 "käytössä olevia liitännäisiä."
 
-#: ../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 ""
-"Tämä avain luetaan kerran, ja nollataan epätodeksi lukemisen jälkeen. Tämä "
-"peruu sähköpostin valinnan luettelosta ja poistaa esikatselun kansiolta."
+"Tämä avain luetaan kerran, ja nollataan arvoksi \"epätosi\" lukemisen "
+"jälkeen.  Tämä peruu sähköpostin valinnan luettelosta ja poistaa esikatselun "
+"kansiolta."
 
-#: ../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;"
@@ -13236,18 +13587,21 @@ msgstr ""
 "otsakkeita ja sen, näytetäänkö niitä. XML-rakenteen muoto on &lt;header "
 "enabled&gt; - määrittele enabled, jos otsake halutaan näyttää postinäkymässä."
 
-#: ../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 ""
+"Tämä valinta liittyy avaimeen lookup_addressbook ja sitä käytetään "
+"määrittämään, etsitäänkö paikallisesta osoitekirjasta tunnettuja osoitteita, "
+"joille ei tehdä roskapostisuodatusta."
 
-#: ../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 "Tämä ominaisuus helpottaa noudon nopeuden parantamista."
 
-#: ../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."
@@ -13255,7 +13609,7 @@ msgstr ""
 "Tämä asettaa viestiluettelon oletusnäkymässä näytettävien viestin "
 "lukumäärän, jonka jälkeen näytetään '...'."
 
-#: ../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."
@@ -13263,7 +13617,7 @@ msgstr ""
 "Tämä asetus määrittää, laajennetaanko vai supistetaanko säikeet oletuksena. "
 "Muutos vaatii Evolutionin uudelleenkäynnistyksen."
 
-#: ../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 "
@@ -13273,28 +13627,18 @@ msgstr ""
 "mukaan viestin päiväyksen sijasta. Muutos vaatii Evolutionin "
 "uudelleenkäynnistyksen."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Säikeistä viestiluettelo"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Säikeistä viestiluettelo"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Säikeistä viestiluettelo aiheen perusteella"
 
-#: ../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 "Aikakatkaisu merkittäessä viestejä nähdyiksi"
@@ -13310,6 +13654,8 @@ msgstr "Oletustilin UID-merkkijono."
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
+"Väärinkirjoitettujen sanojen alleviivauksen väri käytettäessä kirjoituksen "
+"aikaista oikolukua."
 
 #: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
@@ -13389,7 +13735,7 @@ msgstr "Lisätäänkö kaikkiin viesteihin oletuksena kuittauspyyntö."
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr ""
+msgstr "Onko kansionimien typistys kansionäkymässä poistettu käytöstä."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -13443,7 +13789,7 @@ msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "Tuodaan '%s'"
@@ -13489,142 +13835,140 @@ msgstr "%s postilista"
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: ../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 "Pohjat"
+
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valittu, "
 msgstr[1] "%d valittua, "
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d poistettu"
 msgstr[1] "%d poistettua"
 
-#: ../mail/mail-component.c:558
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d roskaposti"
 msgstr[1] "%d roskapostia"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d luonnos"
 msgstr[1] "%d luonnosta"
 
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d lähetetty"
 msgstr[1] "%d lähetettyä"
 
-#: ../mail/mail-component.c:565
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d lähettämätön"
 msgstr[1] "%d lähettämätöntä"
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../mail/mail-component.c:913
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "Uusi viesti"
 
-#: ../mail/mail-component.c:914
-msgid "_Mail Message"
-msgstr "_Viesti"
-
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../mail/mail-component.c:921
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "Uusi sähköpostikansio"
 
-#: ../mail/mail-component.c:922
-msgid "Mail _Folder"
-msgstr "Sähköpostikansio"
-
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
-#: ../mail/mail-component.c:1070
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Sähköpostin asetusten tai kansioiden päivitys epäonnistui."
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "Virhe"
 
-#: ../mail/mail-component.c:1583
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "Virheet"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "Varoitukset ja virheet"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "Vianetsintä"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "Virheet, varoitukset ja vianetsintäviestit"
 
-#: ../mail/mail-component.c:1712
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "Vianetsintäloki"
 
-#: ../mail/mail-component.c:1726
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "Näytä _virheet tilarivillä "
 
 #. 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 "sekunnin ajan."
 
-#: ../mail/mail-component.c:1748
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "Lokiviestit:"
 
-#: ../mail/mail-component.c:1789
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "Lokitustaso"
 
-#: ../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 "Aika"
 
-#: ../mail/mail-component.c:1808 ../mail/message-list.c:2391
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Viestit"
 
-#: ../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 "Sulje tämä ikkuna"
@@ -13811,9 +14155,8 @@ msgid "Ch_eck for Supported Types "
 msgstr "Tar_kista tuetut tyypit"
 
 #: ../mail/mail-config.glade.h:51
-#, fuzzy
 msgid "Check cu_stom headers for junk"
-msgstr "Tunnista roskpostit _omasta roskapostiotsakkeesta"
+msgstr "Käytä _omia roskpostiotsakkeita"
 
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
@@ -13876,9 +14219,8 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Allekirjoita lähtevät viestit sähköisesti (oletuksena)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr ""
-"Älä muotoile tekstin viestisisältöä, jos viestin koko on _suurempi kuin"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "Älä muotoile viestiä, jos viestin _koko on suurempi kuin"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my addressbook"
@@ -13998,7 +14340,7 @@ msgstr "Viestin muokkain"
 
 #: ../mail/mail-config.glade.h:106
 msgid "No _Proxy for:"
-msgstr ""
+msgstr "Ei _välipalvelinta seuraaville:"
 
 #: ../mail/mail-config.glade.h:107
 msgid ""
@@ -14014,18 +14356,23 @@ msgstr ""
 "Huomio: salasanaa ei kysytä ennen kuin otat ensimmäistä kertaa yhteyttä"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Valitsin ohitetaan, jos täsmäävä oma sähköpostn roskapostiotsake löydetään."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _avaimen ID:"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Salasana:"
 
-#: ../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."
@@ -14033,7 +14380,7 @@ msgstr ""
 "Syötä kuvaava nimi tälle tilille allaolevaan kenttään.\n"
 "Tätä nimeä käytetään ainoastaan ohjelman sisäisesti tilin näyttöö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."
@@ -14042,7 +14389,7 @@ msgstr ""
 "asetuksista, kysy järjestelmäsi ylläpitäjältä tai Internet-"
 "palveluntarjoajaltasi."
 
-#: ../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 "
@@ -14052,116 +14399,116 @@ msgstr ""
 "kentät eivät ole pakollisia, jollet halua sisältää näitä tietoja "
 "lähettämiisi sähköpostiviesteihin."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Valitse joku seuraavista vaihtoehdoista"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Vahvista viestin lähetys, jos ainoastaan Bcc-vastaanottajia on määritelty"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Lainattu"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "Muista _salasana"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Muista _salasana"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
-msgstr ""
+msgstr "S_OCKS-palvelin:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "Et_si lähettäjän valokuvaa vain paikallisista osoitekirjoista"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "_Valitse..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "Läh_etä viestin kuittaus:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "_Oletuskirjaisin:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin tulostusta varten"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin tulostusta varten"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "_Allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Allekirjoitusten taulu"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
-msgstr ""
+msgstr "Aloita _kirjoittaminen lopusta vastattaessa"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_Tyyppi:"
 
-#: ../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."
@@ -14169,7 +14516,7 @@ msgstr ""
 "Luettelo käytettävissä olevista kielistä riippuu ainoastaan siitä, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../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"
@@ -14179,13 +14526,6 @@ msgstr ""
 "Nimi jonka valitset on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: ../mail/mail-config.glade.h:151
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Tämä valitsin ohitetaan, jos täsmäävä oma sähköpostn roskapostiotsake "
-"löydetään."
-
 #: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14199,12 +14539,13 @@ msgid "Us_ername:"
 msgstr "Käyttäjät_unnus:"
 
 #: ../mail/mail-config.glade.h:155
-#, fuzzy
 msgid "Use Authe_ntication"
-msgstr "Kirjautuminen"
+msgstr "Käytä _tunnistautumista"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:359
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../plugins/google-account-setup/google-source.c:678
+#: ../plugins/google-account-setup/google-contacts-source.c:278
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
@@ -14231,9 +14572,8 @@ msgid "_Always load images from the Internet"
 msgstr "Lataa _aina kuvat verkosta"
 
 #: ../mail/mail-config.glade.h:163
-#, fuzzy
 msgid "_Automatic proxy configuration URL:"
-msgstr "_Havaitse hymiöt automaattisesti"
+msgstr "_Automaattisten välipalvelinasetusten URL:"
 
 #: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
@@ -14241,7 +14581,7 @@ msgstr "_Roskapostin oletusliitännäinen"
 
 #: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
-msgstr ""
+msgstr "_Suora yhteys Internettiin"
 
 #: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
@@ -14260,18 +14600,16 @@ msgid "_Load images in messages from contacts"
 msgstr "_Hae viestin kuvat, jos yhteystieto on osoitekirjassa"
 
 #: ../mail/mail-config.glade.h:171
-#, fuzzy
 msgid "_Lookup in local addressbook only"
-msgstr "Näytä paikalliset osoitekansiot"
+msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
 #: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "Tee tästä _oletustilini"
 
 #: ../mail/mail-config.glade.h:173
-#, fuzzy
 msgid "_Manual proxy configuration:"
-msgstr "Sähköpostiasetukset"
+msgstr "_Välipalvelimen käsin asettaminen:"
 
 #: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
@@ -14286,10 +14624,8 @@ msgid "_Path:"
 msgstr "_Polku:"
 
 #: ../mail/mail-config.glade.h:178
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr ""
-"_Kysy vahvistus lähetettäessä HTML-viestejä henkilöille, jotka eivät niitä "
-"halua"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Kysy vahvistus HTML-viesteistä henkilöille, jotka eivät niitä halua"
 
 #: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
@@ -14305,7 +14641,7 @@ msgstr "_Komentotiedosto:"
 
 #: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
-msgstr ""
+msgstr "_HTTPS-välipalvelin:"
 
 #: ../mail/mail-config.glade.h:183
 msgid "_Select..."
@@ -14384,43 +14720,43 @@ msgstr "Kirjain_koolla on merkitystä"
 msgid "Co_mpleted"
 msgstr "_Valmis"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Etsi:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Hae viestistä"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "Merkitse edelleenlähetettäväksi"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Tilatut kansiot"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Lisenssisopimus"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ei mitään valittuna"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "_Palvelin: "
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Turvatiedot"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Tietyt kansiot"
 
-#: ../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."
@@ -14428,19 +14764,19 @@ msgstr ""
 "Viestit jotka olet valinnut lähetettäviksi edelleen on listattu alla.\n"
 "Valitse tehtävä uudelleenlähetys \"Merkki\" valikosta."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Hyväksy lisenssi"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Erääntyy:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Merkki:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Laita tähän rasti, jos hyväksyt lisenssiehdot"
 
@@ -14491,11 +14827,11 @@ msgstr "Lähetetään viestiä %d / %d"
 msgid "Failed to send %d of %d messages"
 msgstr "%d viestin %d:stä epäonnistui"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Valmis."
 
@@ -14523,9 +14859,9 @@ msgid "Opening folder %s"
 msgstr "Avataan kansiota %s"
 
 #: ../mail/mail-ops.c:1270
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving quota information for folder %s"
-msgstr "%s yhteystiedot"
+msgstr "Noudetaan kansion %s levytilatietoja"
 
 #: ../mail/mail-ops.c:1339
 #, c-format
@@ -14584,7 +14920,7 @@ msgstr[1] "Haetaan %d viestiä"
 #: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Tallennetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiä"
 
@@ -14634,27 +14970,27 @@ msgstr "Valmistellaan tiliä \"%s\" yhteydettömään tilaan"
 msgid "Checking Service"
 msgstr "Tarkistetaan palvelua"
 
-#: ../mail/mail-send-recv.c:182
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Perutaan..."
 
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Lähetä ja vastaanota postia"
 
-#: ../mail/mail-send-recv.c:396
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../mail/mail-send-recv.c:505
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Tarkistetaan onko uusia viestejä"
@@ -14686,11 +15022,6 @@ msgstr "Käyttäjä perui toimenpiteen."
 msgid "_Save and Close"
 msgstr "_Tallenna ja sulje"
 
-#: ../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 "_Tiedosto"
-
 #: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Muokkaa allekirjoitusta"
@@ -14747,42 +15078,37 @@ msgid "New Search Folder"
 msgstr "Uusi hakunäkymä"
 
 #: ../mail/mail.error.xml.h:1
-#, fuzzy
 msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "Kansio nimeltä &quot;{1}&quot; on jo olemassa. Valitse toinen nimi."
+msgstr "Kansio \"{0}\" on jo olemassa. Valitse toinen nimi."
 
 #: ../mail/mail.error.xml.h:2
-#, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Kansio nimeltä &quot;{1}&quot; on jo olemassa. Valitse toinen nimi."
+msgstr "Kansio \"{1}\" on jo olemassa. Valitse toinen nimi."
 
 #: ../mail/mail.error.xml.h:3
-#, fuzzy
 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 ""
-"Kansio &quot;{1}&quot; on jo olemassa ja sisältää tietoja.\n"
+"Kansio \"{1}\" on jo olemassa ja sisältää tietoja.\n"
 "\n"
 "Voit ohittaa tämän kansion, kirjoittaa sen yli, lisätä kansioon tai poistua."
 
 #: ../mail/mail.error.xml.h:6
-#, fuzzy
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
 msgstr ""
-"Vastaanoton kuittausta pyydetään viestille &quot;{1}&quot;. Lähetetäänkö "
-"kuittaus osoitteeseen {0}?"
+"Vastaanoton kuittausta pyydettiin viestille \"{1}\". Lähetetäänkö kuittaus "
+"osoitteeseen {0}?"
 
 #: ../mail/mail.error.xml.h:7
-#, fuzzy
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr "Nimellä &quot;{0}&quot; on jo allekirjoitus. Anna toinen nimi."
+msgstr "Allekirjoitus nimellä \"{0}\" on jo määritelty. Anna toinen nimi."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14819,12 +15145,10 @@ msgstr ""
 "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
 #: ../mail/mail.error.xml.h:14
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr ""
-"Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
+msgstr "Haluatko varmasti poistaa kaikki poistetut viestit kansiosta \"%{0}\"?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14841,122 +15165,100 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Haluatko varmasti lähettää ilman aihetta?"
 
 #: ../mail/mail.error.xml.h:18
-#, fuzzy
 msgid "Because \"{0}\"."
-msgstr "Syy: &quot;{0}&quot;."
+msgstr "Syy: \"{0}\"."
 
 #: ../mail/mail.error.xml.h:20
-#, fuzzy
 msgid "Because \"{2}\"."
-msgstr "Syy: &quot;{2}&quot;."
+msgstr "Syy: \"{2}\"."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Tyhjä allekirjoitus"
 
 #: ../mail/mail.error.xml.h:22
-#, fuzzy
 msgid "Cannot add Search Folder \"{0}\"."
-msgstr "Hakunäkymää &quot;{0}&quot; ei voi lisätä."
+msgstr "Hakunäkymää \"{0}\" ei voi lisätä."
 
 #: ../mail/mail.error.xml.h:23
-#, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kansiota &quot;{0}&quot; ei voi kopioida kohtaan &quot;{1}&quot;."
+msgstr "Kansiota \"{0}\" ei voi kopioida nimelle \"{1}\"."
 
 #: ../mail/mail.error.xml.h:24
-#, fuzzy
 msgid "Cannot create folder \"{0}\"."
-msgstr "Kansiota &quot;{0}&quot; ei voi luoda."
+msgstr "Kansiota \"{0}\" ei voi luoda."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Väliaikaista hakemistoa ei voi luoda."
 
 #: ../mail/mail.error.xml.h:26
-#, fuzzy
 msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Tallennushakemisto ei voi luoda, syy: &quot;{1}&quot;"
+msgstr "Tallennushakemisto ei voi luoda, syy: \"{1}\""
 
 #: ../mail/mail.error.xml.h:27
-#, fuzzy
 msgid "Cannot delete folder \"{0}\"."
-msgstr "Kansiota &quot;{0}&quot; ei voi poistaa."
+msgstr "Kansiota \"{0}\" ei voi poistaa."
 
 #: ../mail/mail.error.xml.h:28
-#, fuzzy
 msgid "Cannot delete system folder \"{0}\"."
-msgstr "Järjestelmäkansiota &quot;{0}&quot; ei voi poistaa."
+msgstr "Järjestelmäkansiota \"{0}\" ei voi poistaa."
 
 #: ../mail/mail.error.xml.h:29
-#, fuzzy
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr ""
-"Hakunäkymää &quot;{0}&quot; ei voi muokata, koska sitä ei ole olemassa."
+msgstr "Hakunäkymää \"{0}\" ei voi muokata, koska sitä ei ole olemassa."
 
 #: ../mail/mail.error.xml.h:30
-#, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kansiota &quot;{0}&quot; ei voi siirtää  kohtaan &quot;{1}&quot;."
+msgstr "Kansiota \"{0}\" ei voi siirtää  kohtaan \"{1}\"."
 
 #: ../mail/mail.error.xml.h:31
-#, fuzzy
 msgid "Cannot open source \"{1}\""
-msgstr "Lähdettä &quot;{1}&quot; ei voi avata."
+msgstr "Lähdettä \"{1}\" ei voi avata."
 
 #: ../mail/mail.error.xml.h:32
-#, fuzzy
 msgid "Cannot open source \"{2}\"."
-msgstr "Lähdettä &quot;{2}&quot; ei voi avata."
+msgstr "Lähdettä \"{2}\" i voi avata."
 
 #: ../mail/mail.error.xml.h:33
-#, fuzzy
 msgid "Cannot open target \"{2}\"."
-msgstr "Kohdetta &quot;{2}&quot; ei voi avata."
+msgstr "Kohdetta \"{2}\" ei voi avata."
 
 #: ../mail/mail.error.xml.h:34
-#, fuzzy
 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 ""
-"Lisenssitiedostoa &quot;{0}&quot; ei voi lukea asennusongelman takia. Et "
-"voi käyttää tätä lähdettä ennen kuin voit hyväksyä lisenssin."
+"Lisenssitiedostoa \"{0}\" ei voi lukea asennusongelman takia. Et voi käyttää "
+"tätä lähdettä ennen kuin voit hyväksyä lisenssin."
 
 #: ../mail/mail.error.xml.h:35
-#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "&quot;{0}&quot; ei voi nimetä uudestaan nimelle &quot;{1}&quot;."
+msgstr "\"{0}\" ei voi nimetä uudestaan nimelle \"{1}\"."
 
 #: ../mail/mail.error.xml.h:36
-#, fuzzy
 msgid "Cannot rename or move system folder \"{0}\"."
-msgstr ""
-"Järjestelmäkansiota &quot;{0}&quot; ei voi siirtää tai nimetä uudestaan."
+msgstr "Järjestelmäkansiota \"{0}\" ei voi siirtää tai nimetä uudestaan."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Muutoksia tiliin ei voi tallentaa."
 
 #: ../mail/mail.error.xml.h:38
-#, fuzzy
 msgid "Cannot save to directory \"{0}\"."
-msgstr "Hakemistoon &quot;{0}&quot; ei voi tallentaa."
+msgstr "Hakemistoon \"{0}\" ei voi tallentaa."
 
 #: ../mail/mail.error.xml.h:39
-#, fuzzy
 msgid "Cannot save to file \"{0}\"."
-msgstr "Tiedostoon &quot;{0}&quot; ei voi tallentaa."
+msgstr "Tiedostoon \"{0}\" ei voi tallentaa."
 
 #: ../mail/mail.error.xml.h:40
-#, fuzzy
 msgid "Cannot set signature script \"{0}\"."
-msgstr "Allekirjoitus-skriptiä &quot;{0}&quot; ei voi asettaa."
+msgstr "Allekirjoitus-skriptiä \"{0}\" ei voi asettaa."
 
 #: ../mail/mail.error.xml.h:41
-#, fuzzy
 msgid "Check Junk Failed"
-msgstr "Etsi _roskapostia"
+msgstr "Roskapostin etsintä epäonnistui"
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -14972,18 +15274,16 @@ msgid "Could not save signature file."
 msgstr "Allekirjoitustiedostoa ei voi tallentaa."
 
 #: ../mail/mail.error.xml.h:44
-#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr "Poistettu: "
+msgstr "Poistetetaanko \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Poista tili?"
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Poistetaanko viestit hakunäkymässä?"
+msgstr "Poistetaanko viestit hakunäkymästä \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
@@ -15157,9 +15457,8 @@ msgid "Please wait."
 msgstr "Odota, ole hyvä."
 
 #: ../mail/mail.error.xml.h:85
-#, fuzzy
 msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Virhe siirrettäessä vanhaa sähköpostikansiota &quot;{0}&quot;."
+msgstr "Virhe muunnettaessa vanhaa sähköpostikansiota \"{0}\"."
 
 #: ../mail/mail.error.xml.h:86
 msgid "Querying server"
@@ -15174,18 +15473,16 @@ msgid "Read receipt requested."
 msgstr "Kuittausta pyydetty."
 
 #: ../mail/mail.error.xml.h:89
-#, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Poistetaanko todella kansio &quot;{0}&quot; ja kaikki sen alikansiot?"
+msgstr "Poistetaanko todella kansio \"{0}\" ja kaikki sen alikansiot?"
 
 #: ../mail/mail.error.xml.h:90
-#, fuzzy
 msgid "Report Junk Failed"
-msgstr "Tuo tiedosto"
+msgstr "Roskapostin raportoiminen ei onnistunut"
 
 #: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
-msgstr ""
+msgstr "Ei-roskapostin raportoiminen ei onnistunut"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -15233,7 +15530,6 @@ msgstr ""
 "määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite"
 
 #: ../mail/mail.error.xml.h:101
-#, fuzzy
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -15244,11 +15540,10 @@ msgstr ""
 "Seuraavat hakunäkymät:\n"
 "{0}\n"
 "käyttivät poistettua kansiota:\n"
-"   &quot;{0}&quot;\n"
+"   \"{1}\"\n"
 "ja ne on päivitetty."
 
 #: ../mail/mail.error.xml.h:106
-#, fuzzy
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15259,7 +15554,7 @@ msgstr ""
 "Seuraavat suodatinsäännöt:\n"
 "{0}\n"
 "käyttivät poistettua kansiota:\n"
-"   &quot;{1}&quot;\n"
+"   \"{1}\"\n"
 "ja ne on päivitetty."
 
 #: ../mail/mail.error.xml.h:111
@@ -15373,11 +15668,8 @@ msgstr ""
 "kaikki etä- ja paikalliset kansiot."
 
 #: ../mail/mail.error.xml.h:134
-#, fuzzy
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr ""
-"Kirjautumisesi palvelimelle  &quot;{0}&quot; käyttäjänä &quot;{0}&quot; "
-"epäonnistui."
+msgstr "Kirjautuminen palvelimelle  \"{0}\" käyttäjänä \"{0}\" epäonnistui."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -15399,90 +15691,89 @@ msgstr "_Poista pysyvästi"
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1055
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1594 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1596 ../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:1603 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../mail/message-list.c:1610 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:1622 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1624 ../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:1632 ../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:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3840
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4373
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
-#: ../mail/message-list.c:4126
+#: ../mail/message-list.c:4223
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
+"Mikään viesti ei vastaa hakuehtojasi. Tyhjennä hakukenttä valikon kohdasta "
+"Haku -> Tyhjennä tai muuta hakua."
 
-#: ../mail/message-list.c:4128
-#, fuzzy
+#: ../mail/message-list.c:4225
 msgid "There are no messages in this folder."
-msgstr ""
-"\n"
-"\n"
-"Näkymässä ei ole mitään näytettävää."
+msgstr "Tässä kansiossa ei ole viestejä."
 
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
@@ -15513,39 +15804,39 @@ msgstr "Lähetetyt viestit"
 msgid "Size"
 msgstr "Koko"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Soita"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "Älä välitä"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "Tiedoksesi"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Välitä"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "Vastaus ei välttämätön"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Vastaa"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Arvio"
 
@@ -15570,6 +15861,10 @@ msgid "Subject contains"
 msgstr "Otsikko sisältää"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Aihe tai vastaanottaja sisältää"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Aihe tai lähettäjä sisältää"
 
@@ -15594,6 +15889,7 @@ msgid ""
 msgstr "Luettelo vihjeistä, joita liitemuistuttaja etsii viestin rungosta."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Avainsanat"
 
@@ -15680,104 +15976,109 @@ msgstr "Valitse palautettava Evolution-varmuuskopio:"
 msgid "Choose a file to restore"
 msgstr "Valitse palautettava tiedosto"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Varmuuskopioi Evolutionin hakemisto"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Palauta Evolutionin hakemisto"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Tarkista evolutionin varmuuskopio"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:52
 msgid "Restart Evolution"
 msgstr "Käynnistä Evolution uudestaan"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:54
 msgid "With Graphical User Interface"
 msgstr "Graafisen käyttöliittymän kanssa"
 
-#: ../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 "Sammutetaan Evolutionia"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "Varmuuskopioidaan Evolutionin tilejä ja asetuksia"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Varmuuskopioidaan Evolutionin tietoja (viestejä, yhteystietoja, "
 "kalentereita, tehtäviä ja muistioita)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Varmuuskopio on valmis"
 
-#: ../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 "Käynnistetään Evolution uudestaan"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Varmuuskopioi tämänhetkiset Evolutionin tiedot"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "Puretaan tiedostoja varmuuskopiosta"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "Ladataan Evolutionin asetuksia"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "Poistetaan varmuuskopioinnin väliaikaistiedostoja"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "Tarkistetaan paikalliset lähteet"
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Varmuuskopioidaan kansioon %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Palautetaan kansiosta %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 "Evolutionin varmuuskopiointi"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Evolutionin palautus"
 
-#: ../plugins/backup-restore/backup.c:308
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Varmuuskopioidaan Evolutionin tietoja"
 
-#: ../plugins/backup-restore/backup.c:309
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
-msgstr ""
+msgstr "Odota, että Evolution ottaa varmuuskopion tiedoistasi."
 
-#: ../plugins/backup-restore/backup.c:311
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Palautetaan Evolutionin tietoja"
 
-#: ../plugins/backup-restore/backup.c:312
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
-msgstr ""
+msgstr "Odota, että Evolution palauttaa tietosi."
 
-#: ../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 ""
+"Tämä saattaa kestää hetken, riippuen tililläsi olevien tietojen määrästä."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
@@ -15811,9 +16112,8 @@ msgstr ""
 "varmuuskopiointi on päättynyt."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-#, fuzzy
 msgid "Insufficient Permissions"
-msgstr "Valtuutettujen oikeudet"
+msgstr "Oikeudet eivät riitä"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
@@ -15824,9 +16124,8 @@ msgid "Please select a valid backup file to restore."
 msgstr "Valitse palautettavaksi kelvollinen Evolutionin varmuuskopio"
 
 #: ../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 "Oikeutesi eivät riitä tämän sähköpostin poistamiseen."
+msgid "The selected folder is not writable."
+msgstr "Valittuun kansioon ei voi kirjoittaa."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -15854,40 +16153,35 @@ msgstr "_Palauta asetukset..."
 msgid "_Backup Settings..."
 msgstr "_Varmuuskopioi asetukset..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr "Lisää lähettäjä _automaattisesti osoitekirjaan, kun viestiin vastataan"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create addressbook entries when replying to messages"
+msgstr "Lisää lähettäjä _automaattisesti osoitekirjaan vastattaessa viestiin"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Pikaviestinnän yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr ""
-"Hae ja yhdistä säännöllisin väliajoin yhteystiedot ja kuvat gaimin "
-"tuttavalistasta"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "Yhdistä yhteystiedot ja kuvat pidginin tuttavalistasta"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Valitse osoitekirja Pigdinin tuttavalistalle"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Yhdistä tiedot _tuttavalistasta"
 
@@ -15906,24 +16200,24 @@ 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 "Tapahtui virhe tulostettaessa"
+msgstr "Tapahtui virhe käynnistettäessä %s: %s."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
-msgstr ""
+msgstr "Bogofilter-lapsiprosessi ei vastaa, tapetaan..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr ""
+msgstr "Bogofilter-lapsiprosessin odotus keskeytettiin, lopetetaan..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr ""
+msgstr "Putki bogofilterille epäonnistui, virhekoodi: %d."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
@@ -15953,17 +16247,18 @@ msgstr "Bogofilter-roskapostiliitännäinen"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Suodattaa roskaposteja käyttäen bogofilteriä."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/caldav/caldav-source.c:249
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:352
+#: ../plugins/caldav/caldav-source.c:271
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr "Käytä _SSLää"
 
@@ -15985,7 +16280,8 @@ msgstr "Tarjoaa paikallisten kalenterien perustoiminnot."
 
 #: ../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
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "Vi_rkistä:"
 
@@ -16098,24 +16394,20 @@ msgid "Evolution"
 msgstr "Evolution"
 
 #: ../plugins/default-source/default-source.c:81
-#, fuzzy
 msgid "Mark as _default address book"
-msgstr "Merkitse _oletuskansioksi"
+msgstr "Merkitse _oletusosoitekirjaksi"
 
 #: ../plugins/default-source/default-source.c:102
-#, fuzzy
 msgid "Mark as _default calendar"
-msgstr "Merkitse _oletuskansioksi"
+msgstr "Merkitse _oletuskalenteriksi"
 
 #: ../plugins/default-source/default-source.c:103
-#, fuzzy
 msgid "Mark as _default task list"
-msgstr "Merkitse _oletuskansioksi"
+msgstr "Merkitse _oletustehtävälistaksi"
 
 #: ../plugins/default-source/default-source.c:104
-#, fuzzy
 msgid "Mark as _default memo list"
-msgstr "Merkitse _oletuskansioksi"
+msgstr "Merkitse _oletusmuistiolistaksi"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -16129,10 +16421,28 @@ msgstr ""
 "Tarjoaa toiminallisuuden kalenterien tai osoitekirjojen merkitsemiseksi "
 "oletusvalinnaksi."
 
-#: ../plugins/email-custom-header/email-custom-header.c:535
+#: ../plugins/email-custom-header/email-custom-header.c:562
 msgid "_Custom Header"
 msgstr "_Omat otsakkeet"
 
+#: ../plugins/email-custom-header/email-custom-header.c:883
+msgid "Key"
+msgstr "Avaimet"
+
+#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "Arvot"
+
+#. 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 ""
+"Omien otsakeavainten määrittelyssä käytetty muoto on seuraava:\n"
+"Omien otsakenimien avainarvot eroteltuna merkillä \";\"."
+
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
 msgstr "Omat sähköpostiotsakkeet"
@@ -16140,17 +16450,15 @@ msgstr "Omat sähköpostiotsakkeet"
 #. 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 "Lisää oman otsakkeen lähteviin viesteihin."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-#, fuzzy
 msgid "Custom Header"
 msgstr "Omat otsakkeet"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-#, fuzzy
-msgid "List of Custom Header"
-msgstr "Omat otsakkeet"
+msgid "List of Custom Headers"
+msgstr "Luettelo omista otsakkeista"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
@@ -16158,6 +16466,9 @@ 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 ""
+"Avain määrittää luettelon omista otsakkeita, joita voit lisätä lähteviin "
+"viesteihin. Muoto otsakkeiden määrittelyksi avaimessa on seuraava: Otsakkeen "
+"nimi, \"=\"-merkki ja otsakken sisältö, eroteltuna \";\"-merkeillä."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16258,34 +16569,33 @@ msgstr "Kansioiden koko"
 msgid "Exchange Settings"
 msgstr "Exchangen asetukset"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:674
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:700
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "K_irjautuminen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:721
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
 msgid "_Mailbox:"
-msgstr "_Sähköposti"
+msgstr "_Sähköpostikansio:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:922
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "_Tunnistautumistapa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "Tar_kista tuetut tyypit"
 
-#: ../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 kt"
 
-#: ../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"
@@ -16505,7 +16815,7 @@ msgstr "Kansion koko"
 msgid "User"
 msgstr "Käyttäjä"
 
-#: ../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 "Tilaa muiden käyttäjien kansioita"
@@ -16742,7 +17052,6 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Tilaa toisen käyttäjän kalenteri"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "A plugin that manages a collection of Exchange account specific operations "
 "and features."
@@ -16837,10 +17146,16 @@ msgid "Could not update out-of-office state"
 msgstr "\"Poissa konttorilta\"-tilaa ei voi päivittää."
 
 #: ../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 vaatii uudelleenkäynnistyksen tilatun käyttäjän postilaatikon "
+"lataamiseksi"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Exchange-tili on yhteydettömässä tilassa"
 
-#: ../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"
@@ -16867,32 +17182,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 "Valtuutuslistan päivitys epäonnistui:"
 
-#: ../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 "Kansio on jo olemassa"
 
-#: ../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 "Kansiota ei ole olemassa"
 
-#: ../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 "Kansio on yhteydettömässä tilassa"
 
-#: ../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 "Yleinen virhe"
 
-#: ../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 "Yhteinen luettelopalvelin ei ole käytettävissä"
 
-#: ../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."
@@ -16900,73 +17215,73 @@ msgstr ""
 "Jos OWA on käytössä eri polussa täytyy se määritellä erikseen tilin "
 "asetuksissa."
 
-#: ../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 "Sähköpostit käyttäjälle {0} eivät ole tällä palvelimella."
 
-#: ../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 "Tarkista että URL on oikein ja yritä uudestaan."
 
-#: ../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 ""
 "Tarkista että palvelimen nimi on kirjoitettu oikein ja yritä uudestaan."
 
-#: ../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 ""
 "Tarkista että käyttäjätunnus ja salasana ovat oikein ja yritä uudestaan."
 
-#: ../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 "Yhteistä luettelopalvelinta ei ole määritelty tälle tilille."
 
-#: ../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 "Käyttäjällä {0} ei ole postilaatikkoa palvelimella {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 "Käyttäjää {0} ei ole olemassa"
 
-#: ../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 "Salasanan vaihto onnistui."
 
-#: ../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 "Anna valtuuttajan tunniste tai poista lähetä valtuutettuna -asetus."
 
-#: ../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 "Varmista, että yhteisen luettelopalvelimen nimi on oikein."
 
-#: ../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 "Käynnistä Evolution uudestaan, jotta muutokset tulevat voimaan"
 
-#: ../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 "Valitse käyttäjä."
 
-#: ../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 "Palvelin hylkäsi salasanan, koska se on liian yksinkertainen."
 
-#: ../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-tili poistetaan käytöstä kun suljet evolutionin"
 
-#: ../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-tili poistetaan, kun suljet Evolutionin"
 
-#: ../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-palvelin ei ole yhteensopiva Exchange Connectorin kanssa."
 
-#: ../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."
@@ -16974,7 +17289,7 @@ msgstr ""
 "Palvelimen versio on Exchange 5.5. Exchange Connector \n"
 "tukee ainoastaan versioita Microsoft Exchange 2000 ja 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"
@@ -16987,40 +17302,41 @@ msgstr ""
 "osana käyttäjätunnusta (esim. &quot;ALUENIMI\\käyttäjä&quot;).\n"
 "Voi myös olla että syötit väärän salasanan."
 
-#: ../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 "Yritä uudestaan eri salasanalla."
 
-#: ../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 "Käyttäjää ei voi lisätä pääsylistalle:"
 
-#: ../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 "Valtuutuslistan muokkaus epäonnistui."
 
-#: ../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 "Tuntematon virhe etsittäessä {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 "Tuntematon virhe."
 
-#: ../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 "Tuntematon tyyppi"
 
-#: ../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 "Toimenpide ei ole tuettu"
 
-#: ../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 ""
 "Sähköpostisi tallennukseen varattu tila tällä palvelimella alkaa loppua."
 
-#: ../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."
@@ -17028,19 +17344,19 @@ msgstr ""
 "Sinulla on lupa lähettää viestejä toisten puolesta vain yhden valtuuttajan "
 "nimissä kerrallaan."
 
-#: ../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 "Et voi valtuuttaa itseäsi."
 
-#: ../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 "Sähköpostillesi varattu tila tällä palvelimella on loppu."
 
-#: ../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 "Voit määritellä vain yhden Exchange-tilin."
 
-#: ../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."
@@ -17048,14 +17364,14 @@ msgstr ""
 "Käytät tällä hetkellä {0} kt. Yritä vapauttaa tilaa poistamalla joitain "
 "viestejä."
 
-#: ../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 ""
 "Käytät tällä hetkellä {0} kt. Et voi lähettää tai vastaanottaa sähköpostia."
 
-#: ../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."
@@ -17063,19 +17379,19 @@ msgstr ""
 "Käytät tällä hetkellä {0} kt. Et voi lähettää sähköpostia ennen kuin olet "
 "vapauttanut tilaa poistamalla joitain tallennettuja viestejä."
 
-#: ../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 "Salasanasi on vanhentunut."
 
-#: ../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} ei voi lisätä pääsylistalle"
 
-#: ../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} on jo valtuutettu"
 
-#: ../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} on jo listalla"
 
@@ -17089,11 +17405,11 @@ msgstr "Tarkista kansion oikeudet"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Default External Editor"
-msgstr "Ulkoisen muokkaimen oletus"
+msgstr "Ulkoisen muokkaimen oletuskomento"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
-msgstr ""
+msgstr "Oletuskomento, jota käytetään ulkoisena muokkaimena."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
@@ -17115,23 +17431,27 @@ msgstr "Väliaikaista tiedostoa ei voi luoda"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
 msgid "Editor not launchable"
-msgstr ""
+msgstr "Muokkainta ei voi käynnistää"
 
 #: ../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 ei voinut luoda väliaikaistiedostoa viestin tallentamiseksi. Yritä "
+"myöhemmin uudestaan."
 
 #: ../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 ""
+"Liitännäisen asetuksissa määriteltyä ulkoista muokkainta ei voi käynnistää. "
+"Yritä käyttää muuta komentoa."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Kirjoita viestit ulkoisessa muokkaimessa"
+msgid "Compose in _External Editor"
+msgstr "_Kirjoita viestit ulkoisessa muokkaimessa"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
@@ -17139,13 +17459,15 @@ msgstr "Kirjoita viestit käyttäen ulkoista muokkainta"
 
 #: ../plugins/external-editor/external-editor.c:91
 msgid "Command to be executed to launch the editor: "
-msgstr ""
+msgstr "Ulkoisen muokkaimen käynnistyskomento: "
 
 #: ../plugins/external-editor/external-editor.c:92
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
 msgstr ""
+"Emacsia varten käytä arvoa \"xemacs\"\n"
+"VI:tä varten käytä arvoa \"gvim\""
 
 #: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
@@ -17192,14 +17514,48 @@ msgstr "Peru kansioiden tilauksia"
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: ../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 "Syötä ensin käyttäjätunnus."
+
+#: ../plugins/google-account-setup/google-source.c:497
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Syötä salasana käyttäjälle %s tilattujen kalentereiden käyttöä varten."
+
+#: ../plugins/google-account-setup/google-source.c:597
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Ei voi lukea tietoja Googlen palvelimelta.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:747
+msgid "Cal_endar:"
+msgstr "_Kalenteri:"
+
+#: ../plugins/google-account-setup/google-source.c:782
+msgid "Retrieve _list"
+msgstr "Nouda _luettelo"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>Palvelin</b>"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Google-kalenterien liitännäinen."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Google-kalenterin ja yhteystietojen liitännäinen."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17285,15 +17641,16 @@ msgid "_Junk List"
 msgstr "_Roskapostilista"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
-#, fuzzy
 msgid "Message Retract"
-msgstr "Viestin tila"
+msgstr "Viestin peruminen"
 
 #: ../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 ""
+"Viestin peruminen voi poistaa sen vastaanottajan postilaatikosta. Haluatko "
+"varmasti yrittää perua viestin?"
 
 #: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
@@ -17307,12 +17664,6 @@ msgstr "Peru viesti"
 msgid "Add Send Options to groupwise messages"
 msgstr "Lisää lähetysasetuksia groupwise-viesteille"
 
-#: ../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 "Lähetysasetukset"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Liitännäinen GroupWise-tilien ominaisuuksille."
@@ -17322,14 +17673,12 @@ msgid "Groupwise Features"
 msgstr "Groupwisen ominaisuudet"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
-#, fuzzy
 msgid "Message retract failed"
-msgstr "Viestin peruminen onnistui"
+msgstr "Viestin peruminen epäonnistui"
 
 #: ../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 "Muunna valittu viesti uudeksi tehtäväksi"
+msgstr "Palvelin ei sallinut valitun viestin perumista."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
@@ -17338,9 +17687,8 @@ msgid "Invalid user"
 msgstr "Epäkelpo käyttäjä"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
-#, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "Tiedostoon &quot;{0}&quot; ei voi tallentaa."
+msgstr "Välipalvelinyhteyttä ei voi avata käyttäjälle &quot;{0}&quot;"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
@@ -17348,48 +17696,49 @@ msgid "Specify User"
 msgstr "Valitse käyttäjä"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#, fuzzy
 msgid "You have already given proxy permissions to this user."
-msgstr "Sinulle on annettu seuraavat oikeudet kansioihini:"
+msgstr "Tälle käyttäjälle on jo annettu välipalvelinasetukset."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
+"Välipalvelinoikeuksien määrittely vaatii kelvollisen käyttäjätunnuksen."
 
 #: ../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 "Kansio nimeltä &quot;{1}&quot; on jo olemassa. Valitse toinen nimi."
+msgstr "Tili &quot;{1}&quot; on jo olemassa. Tarkista kansiopuusi."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-#, fuzzy
 msgid "Account Already Exists"
-msgstr "Allekirjoitus on jo olemassa"
+msgstr "Tili on jo olemassa"
 
 #: ../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 ""
+"Välipalvelimelle kirjautuminen käyttäjänä &quot;{0}&quot; epäonnistui. "
+"Tarkista sähköpostiosoitteesi ja yritä uudestaan."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
-#, fuzzy
 msgid "This is a recurring meeting"
-msgstr "Muuta tämä tapahtuma toistuvaksi"
+msgstr "Tämä on toistuva tapaaminen"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-#, fuzzy
-msgid "What would you like to {0}?"
-msgstr "Haluatko tallentaa muutokset?"
+msgid "Would you like to accept it?"
+msgstr "Haluatko hyväksyä tämän?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
-#, fuzzy
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "Varmuuskopiotiedostoa &quot;{0}&quot; ei voi tallentaa."
+msgid "Would you like to decline it?"
+msgstr "Haluatko estää tämän?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Et voi jakaa kansiota käyttäjän &quot;{0}&quot; kanssa"
+
+#: ../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 "Sinun täytyy määrittää käyttäjä, jonka haluat lisätä luetteloon"
 
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
@@ -17532,9 +17881,8 @@ msgid "Sharing"
 msgstr "Jakaminen"
 
 #: ../plugins/groupwise-features/share-folder.c:533
-#, fuzzy
 msgid "Custom Notification"
-msgstr "Asemointi"
+msgstr "Oma huomautus"
 
 #: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
@@ -17663,28 +18011,28 @@ msgstr "Liitännäinen IMAP-tilien ominaisuuksille."
 msgid "IMAP Features"
 msgstr "IMAP-ominaisuudet"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "_Tuo kalenteriin"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "_Tuo tehtäviin"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:201
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "Tuo ICS-tiedosto"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:224
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "Valitse tehtävälista"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "Valitse kalenteri"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:700
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr "_Tuo"
 
@@ -17740,130 +18088,130 @@ msgstr "_Synkronoi iPod"
 msgid "iPod Synchronization"
 msgstr "iPod-synkronointi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Kalenterin \"%s\" lataus epäonnistui"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 "Kalenterin \"%s\" sisältämä tapaaminen on ristiriidassa tämän kokouksen "
 "kanssa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Tapaaminen löytyi kalenterista \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Yhtäkään kalenteria ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Tätä kokousta ei löydy mistään kalenterista"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Tätä tehtävää ei löydy mistään tehtävälistasta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Tätä muistilappua ei löydy mistään muistilappuluettelosta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Etsitään olemassaolevia versioita tapaamisesta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Kohdetta ei voi tulkita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kohtaa ei voi lähettää kalenteriin \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Lähetetty kalenteriin \"%s\" hyväksyttynä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Lähetetty kalenteriin \"%s\" alustavana"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Lähetetty kalenteriin \"%s\" hylättynä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Lähetetty kalenteriin \"%s\" peruttuna"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Järjestäjä on poistanut valtuutuksen %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lähetettiin perumisilmoitus valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Perumisilmoitusta ei voi lähettää valtuutetulle"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Läsnäolon tilaa ei voi päivittää virheellisen tilan takia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Läsnäolijaa ei voi päivittää. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Läsnäolon tila päivitetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Kokouksen tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Tehtävän tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Muistilapun tiedot lähetetty"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kokoustietoja ei voitu lähettää, koska kokousta ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "Tehtävän tietoja ei voitu lähettää, koska tehtävää ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Muistilapun tietoja ei voitu lähettää, koska muistilappua ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17871,15 +18219,15 @@ msgstr ""
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
-#: ../plugins/itip-formatter/itip-formatter.c:1437
-#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17887,11 +18235,11 @@ msgstr ""
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä "
 "tai vapaa/varattu-tietoja."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17899,227 +18247,227 @@ msgstr ""
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2147
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Tapaaminen on _toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2150
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Tehtävä on toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2153
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Muistilappu on toistuva"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2424
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:299
 msgid "Today"
 msgstr "Tänään"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Tänään %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Tänään %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Tänään %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:218
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Huomenna"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Huomenna %H.%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Huomenna %H.%M.%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Huomenna %l.%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Huomenna %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
+#: ../plugins/itip-formatter/itip-view.c:254
 #, 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
+#: ../plugins/itip-formatter/itip-view.c:259
 msgid "%A %H:%M"
 msgstr "%Ana klo %H.%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:264
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %H:%M:%S"
 msgstr "%Ana klo %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%Ana klo %l.%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%Ana klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "+%Ana %d. %Bn %Y"
 
 #. 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
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "+%Ana %d. %Bn klo %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
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "+%Ana %d. %Bn klo %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
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "+%Ana %d. %Bn klo %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
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "+%Ana %d. %Bn klo %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:307
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%Ana %d. %Bta %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Ana %d. %Bta %Y klo %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Ana %d. %Bta %Y klo %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
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Ana %d. %Bta %Y klo %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Ana %d. %Bta %Y klo %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
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:525
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Vastaa henkilön <b>%s</b> puolesta"
 
-#: ../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:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Vastaanotettu henkilön <b>%s</b> puolesta"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> on julkaissut seuraavat kokoustiedot %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> on julkaissut seuraavat kokoustiedot:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegoi seuraavan kokouksen sinulle:"
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> pyytää läsnäoloasi seuraavassa kokouksessa %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> pyytää läsnäoloasi seuraavassa kokouksessa:"
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> toivoo lisäystänsä olemassaolevaan kokoukseen %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18127,88 +18475,88 @@ msgid ""
 msgstr ""
 "<b>%s</b> %s kautta pyytää viimeisimpiä tietoja seuraavasta kokouksesta:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät tiedot seuraavasta kokouksesta:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> %s kautta lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> lähetti takaisin seuraavan kokousvastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> perui seuraavan kokouksen %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> on perunut seuraavan tapaamisen."
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> %s kautta ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> ehdottaa seuraavia muutoksia kokoukseen."
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> kieltäytyi %s:n kautta seuraavista muutoksista kokoukseen:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> kieltäytyi seuraavista kokousmuutoksista."
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> julkaisi %s:n kautta seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> julkaisi seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> pyytää %s:n suorittamaan seuraavat tehtävät:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> antoi sinulle tehtävän %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> antoi sinulle tehtävän:"
 
-#: ../plugins/itip-formatter/itip-view.c:463
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään %s:n kautta"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18217,7 +18565,7 @@ msgstr ""
 "<b>%s</b> %s kautta toivoo saavansa viimeisimmät tiedot seuraavista "
 "työtehtävistä:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18225,170 +18573,170 @@ msgid ""
 msgstr ""
 "<b>%s</b> toivoo saavansa viimeisimmät tiedot seuraavista työtehtävistä:"
 
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> lähetti takaisin %s kautta seuraavan annetun tehtävän vastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> lähetti takaisin seuraavan annetun tehtävän vastauksen:"
 
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> on perunut seuraavan annetun tehtävän %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> on perunut seuraavan annetun tehtävän:"
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> %s kautta ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ehdottaa seuraavia muutoksia annettuun tehtävään:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> kieltäytyi seuraavasta toimeksiannosta %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> on kieltäytynyt seuraavasta annetusta tehtävästä:"
 
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> julkaisi %s:n kautta seuraavan muistilapun:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> julkaisi seuraavan muistilapun:"
 
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> haluaa lisätä olemassaolevaan muistilappuun %s kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> haluaa lisätä olemassaolevaan muistilappuun:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:545
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> perui seuraavan jaetun muistilapun %s:n kautta:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> on perunut seuraavan jaetun muistilapun:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:819
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:824
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
 msgid "_Decline"
 msgstr "_Hylkää"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Accept"
 msgstr "H_yväksy"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Hylkää kaikki"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "Kaikki _alustavasti"
 
-#: ../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
+#: ../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 "_Tentative"
 msgstr "_Alustavasti"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Hyväksy kaikki"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Lähetä tiedot"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Päivitä läsnäolijan tila"
 
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Päivitä"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1010
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Alkamisaika:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Loppumisaika:"
 
 #. 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 "Kommentti:"
 
-#: ../plugins/itip-formatter/itip-view.c:1071
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "Lähetä _päivitykset osallistujille"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Tehtävät :"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Muistilaput :"
 
@@ -18452,9 +18800,10 @@ msgstr "Luo D-BUS-viestin , kun uusia sähköpostiviestejä saapuu."
 
 #: ../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 ""
-"Jos tosi, piipataan, muutoin soitetaan äänitiedosto uuden sähköpostin "
+"Jos tosi, piipataan, muutoin soitetaan äänitiedosto uusien viestien "
 "saapuessa."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -18502,8 +18851,16 @@ msgstr "Huomautetaanko uusista viesteistä vain saapuvien kansiossa."
 msgid "Generate a _D-Bus message"
 msgstr "Luo D-Bus-viesti"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "Evolutionin viestihuomautus"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+msgid "Mail Notification Properties"
+msgstr "Sähköpostihuomautuksen ominaisuudet"
+
 #. 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:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18518,55 +18875,55 @@ msgstr[1] ""
 "%d uutta viestiä\n"
 "kansiossa %s."
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "%d uusi viesti vastaanotettu."
 msgstr[1] "%d uutta viestiä vastaanotettu."
 
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Uusi sähköposti"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Näytä kuvake _ilmoitusalueella"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "_Vilkuta kuvaketta ilmoitusalueella"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "Näytä viesti _ponnahdusikkunassa kuvakkeen lisäksi"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "_Soita ääniä uuden sähköpostin saapuessa"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Piippaa"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "So_ita äänitiedosto"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Anna _tiedostonimi:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "_Soita"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Huomauta uusista viesteistä _vain saapuvien kansiossa"
 
@@ -18715,14 +19072,13 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Lähetä sähköpostiviesti listalle?"
 
 #: ../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 process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Toimenpidettä ei voi suorittaa. Tämä tarkoittaa ettei otsake toimenpiteelle "
+"Toimintoa ei voitu suorittaa. Tämä tarkoittaa ettei otsake toimenpiteelle "
 "sisältänyt mitään toimenpidettä, joka voidaan käsitellä.\n"
 "\n"
 "Otsake: {0}"
@@ -18801,16 +19157,16 @@ msgid "_Unsubscribe from List"
 msgstr "Per_u listan tilaus"
 
 #: ../plugins/mark-all-read/mark-all-read.c:37
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Merkitse kaikki tämän kansion ja sen alikansioiden viestit luetuksi?"
+msgid "Also mark messages in subfolders?"
+msgstr "Merkitse viestit myös alikansioissa?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Haluatko suorittaa toiminnon myös kansion alikansioissa?"
-
-#: ../plugins/mark-all-read/mark-all-read.c:85
-msgid "Mark All Messages as Read"
-msgstr "Merkitse kaikki viestit luetuiksi"
+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 ""
+"Haluatko merkitä viestit luetuksi vain nykyisessä kansiossa vai myös "
+"kaikissai sen alikansioissa?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:162
 msgid "Current Folder and _Subfolders"
@@ -18878,11 +19234,6 @@ msgstr "_Liitännäiset"
 msgid "Author(s)"
 msgstr "Kirjoittaja(t)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "Kuvaus"
-
 #: ../plugins/plugin-manager/plugin-manager.c:130
 msgid "Configuration"
 msgstr "Asetukset"
@@ -19056,69 +19407,65 @@ msgstr "Hei Python"
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
-msgstr ""
+msgstr "Pythonin liittännäislataimen testit"
 
 #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
 msgid "Python Test Plugin"
-msgstr ""
+msgstr "Python-testiliitännäinen"
 
 #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
 msgid "Test Plugin for Python EPlugin loader."
-msgstr ""
+msgstr "Testiliitännäinen pythonin EPlugin-lataimelle."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
 msgid "A plugin which loads other plugins written using python."
-msgstr ""
+msgstr "Latain, joka lataa muita pythonilla tehtyjä liitännäisiä."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-#, fuzzy
 msgid "Python Loader"
-msgstr "Monon latain"
+msgstr "Python-latain"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "Spamassassin (sisäänrakennettu)"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin not found, code: %d"
-msgstr "Spamassassin-roskapostiliitännäinen"
+msgstr "Spamassassinia ei löytynyt, paluukoodi: %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 "Paikallista sähköpostitilaa '%s' ei voi luoda: %s"
+msgstr "Putken luonti epäonnistui: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Error after fork: %s"
-msgstr ""
-"Virhe %s:ssä:\n"
-"%s"
+msgstr "Virhe forkkauksen jälkeen: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:244
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr ""
+msgstr "SpamAssassinin lapsiprosessi ei vastaa, tapetaan..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:246
 #, c-format
 msgid "Wait for Spamassassin child process interrupted, terminating..."
-msgstr ""
+msgstr "Spamassassinin lapsiprosessin odotus keskeytettiin, lopetetaan..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:255
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr ""
+msgstr "Putki spamassassinille epäonnnistui, virhekoodi: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:498
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin is not available."
-msgstr "Lähetysasetukset eivät ole saatavilla."
+msgstr "Spamassassin ei ole saatavilla."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:865
-#, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Tämä tekee Spamassassinista luotettavamman, mutta hitaamman"
 
@@ -19169,7 +19516,6 @@ msgid "MIME Type"
 msgstr "MIME-tyyppi"
 
 #: ../plugins/save-attachments/save-attachments.c:347
-#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "Tallenna"
 
@@ -19303,23 +19649,22 @@ msgid "Show _only this Task List"
 msgstr "Näytä _vain tämä tehtävälistaan"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin that manages the Startup wizard."
-msgstr "Käynnistysapulaisen toteuttava liitännäinen."
+msgid "Guides you through your initial account setup."
+msgstr "Ohjaa tilin asetusten määrittelyssä ensikäynnistyksellä."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Käynnistysapulainen"
+msgid "Setup Assistant"
+msgstr "Asetusapulainen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolutionin asetusapulainen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Tervetuloa"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -19331,29 +19676,29 @@ msgstr ""
 "\n"
 "Valitse \"Eteenpäin\" jatkaaksesi. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Tiedostojen tuonti"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:144
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:143
 msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:397
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid "Importing data."
 msgstr "Tuodaan tietoja."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "Odota, ole hyvä"
 
@@ -19374,6 +19719,30 @@ msgstr "Säikeistä viestit aiheen perusteella"
 msgid "F_all back to threading messages by subject"
 msgstr "Palaa viestien säikeistämiseen _aiheen perusteella"
 
+#: ../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 ""
+"Luettelo avainsana- ja arvopareista, joita pohjat-liitännäinen käyttää "
+"viestin rungon osien korvaamiseen."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Ei otsikkoa"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Tallenna _pohjana"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Tallenna pohjana"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Pohjiin perustuva malliliitännäinen"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Liitännäinen, joka avaa tnef-liitteitä ohjelman ytnef avulla."
@@ -19382,6 +19751,28 @@ msgstr "Liitännäinen, joka avaa tnef-liitteitä ohjelman ytnef avulla."
 msgid "TNEF Attachment decoder"
 msgstr "TNEF-liitteiden purkaja"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "WebDAV-yhteystietojen liitännäinen."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV-yhteystiedot"
+
+#: ../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 "_Vältä IfMatch-komento (vaaditaan apache-versiolle < 2.2.8)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution-kuori"
@@ -19399,144 +19790,148 @@ msgid "Evolution Test component"
 msgstr "Evolutionin testikomponentti"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Tekstimuotoinen kuvaus nykyisistä tulostinasetuksista."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Authenticate proxy server connections"
-msgstr ""
+msgstr "Tunnistaudu välipalvelimelle"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
-msgstr "_Havaitse hymiöt automaattisesti"
+msgstr "Automaattisen välipalvelinmäärittelyn URL"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Konfiguraation versio"
 
-#: ../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 "Määrittää tulisiko kaatumisen havaitsemista suorittaa."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Sivupaneelin oletusleveys"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Ikkunan oletuskorkeus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "Ikkunan oletustila"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Ikkunan oletusleveys"
 
-#: ../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 ""
+"Määrittää välipalvelinasetukset avattaessa HTTP- tai HTTPS-yhteyksiä "
+"verkkoon."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy host name"
-msgstr ""
+msgstr "HTTP-välipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy password"
-msgstr "Syötä salasana"
+msgstr "HTTP-välipalvelimen salasana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy port"
-msgstr ""
+msgstr "HTTP-välipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy username"
-msgstr ""
+msgstr "HTTP-välipalvelimen käyttäjätunnus"
 
-#: ../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 tai alias käynnistyksessä oletuksena näytettävälle komponentille."
 
-#: ../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 ""
+"Jos tosi, vaativat yhteyden välipalvelimelle tunnistautumisen. "
+"Käyttäjätunnus otetaan avaimesta \"/apps/evolution/shell/network_config/"
+"authentication_user\" ja salasana haetaan joko gnome-keyring -avainrenkaasta "
+"tai tiedostosta ~/.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 "Viimeksi päivitetty konfiguraation versio"
 
-#: ../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 ""
 "Luettelo poluista kansioihin, jotka synkronisoidaan kovalevylle "
 "yhteydettömään käyttöön"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Non-proxy hosts"
-msgstr ""
+msgstr "Välipalvelimen ohittavat palvelimet"
 
-#: ../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 "HTTP-välipalvelimelle yhteyttä otettaessa käytettävä salasana."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Proxy configuration mode"
-msgstr "Asetukset"
+msgstr "Välipalvelimen asetustila"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy host name"
-msgstr ""
+msgstr "SOCKS-välipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "SOCKS proxy port"
-msgstr ""
+msgstr "SOCKS-välipalvelimen portti"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy host name"
-msgstr ""
+msgstr "Salatun HTTP-välipalvelimen verkkonimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Secure HTTP proxy port"
-msgstr ""
+msgstr "Salatun HTTP-välipalvelimen portti"
 
-#: ../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 ""
+"Valitse välipalvelimen asetustila. Tuetut arvot ovat 0, 1, 2, ja 3, jotka "
+"tarkoittavat arvoja \"käytä järjestelmän asetuksia\", \"ei välipalvelinta\", "
+"\"aseta välipalvelin käsin\" ja \"käytä automaattimäärittelyn URL:issa "
+"annettua määrittelyä\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "Sivupaneeli on näkyvissä"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Ohita kehitysversiovaroitus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "Ohita varoitus palautuksesta"
 
-#: ../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 "Aloita yhteydettömässä tilassa"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Tilarivi on näkyvissä"
 
-#: ../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\")."
@@ -19544,19 +19939,19 @@ msgstr ""
 "Evolutionin konfiguraatioversio, major/minor/configuration tasoilla "
 "(esimerkiksi \"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 "Pääikkunan oletuskorkeus pikseleinä."
 
-#: ../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 "Pääikkunan oletusleveys pikseleinä."
 
-#: ../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 "Sivupaneelin oletusleveys pikseleinä."
 
-#: ../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\")."
@@ -19564,37 +19959,43 @@ msgstr ""
 "Viimeisin päivitetty Evolutionin konfiguraatioversio, major/minor/"
 "configuration tasoilla (esimerkiksi \"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 "Verkkonimi, jota käytetään HTTP-välipalvelimena."
 
-#: ../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 "Verkkonimi, jota käytetään HTTPS-välipalvelimena."
 
-#: ../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 "Verkkonimi, jota käytetään SOCKS-välipalvelimena."
 
-#: ../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 ""
+"Portti, jonka kautta käytetään avaimessa \"/apps/evolution/shell/"
+"network_config/http_host\" määriteltyä välipalvelinta."
 
-#: ../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 ""
+"Portti, jonka kautta käytetään avaimessa \"/apps/evolution/shell/"
+"network_config/secure_host\" määriteltyä välipalvelinta."
 
-#: ../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 ""
+"Portti, jonka kautta käytetään avaimessa \"/apps/evolution/shell/"
+"network_config/socks_host\" määriteltyä välipalvelinta."
 
-#: ../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 "
@@ -19604,74 +20005,77 @@ msgstr ""
 "\"toolbar\". Jos \"toolbar\" on valittu, käytetään työkalupalkissa Gnomen "
 "asetusta."
 
-#: ../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 ""
+"Tämä avain sisältää luettelon palvelimista, johon otetaan yhteys suoraan "
+"ilman välipalvelinta (jos määritelty). Arvot voivat olla verkkonimi, "
+"aluenimiä muodossa *.foo.com, IP-osoitteita (sekä IPv4 että IPv6) tai "
+"verkkopeitteitä (jotain tyyliin 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 "Työkalupalkki on näkyvissä"
 
-#: ../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 "Viimeksi päivitetty konfiguraation versio"
+msgstr "Välipalvelimen asetustietoja tarjoava URL."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Use HTTP proxy"
-msgstr ""
+msgstr "Käytä HTTP-välipalvelinta"
 
-#: ../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 "HTTP-välipalvelimelle tunnistautumiseen käytetty käyttäjätunnus."
 
-#: ../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 "Käynnistetäänkö Evolution yhteydettömässä vai yhteydellisessä tilassa."
 
-#: ../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 "Suoritetaanko kaatumisen havaitseminen käynnistettäessä"
 
-#: ../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 "Onko ikkuna suurennettu."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Näytetäänkö sivupaneeli."
 
-#: ../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 "Näytetäänkö tilarivi."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../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 ""
 "Piilotetaanko varoitusikkuna Evolutionin kehitysversion käytöstä vai ei."
 
-#: ../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 "Ohitetaanko evolutionin palautumisen varoitusikkuna."
 
-#: ../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 "Näytetäänkö ikkunan napit."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Ikkunan painikkeiden tyyli"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Ikkunan napit näytetään"
 
@@ -19688,11 +20092,11 @@ msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Valitse OK sulkeaksesi nämä yhteydet ja siirtyäksesi yhteydettömään tilaan"
 
-#: ../shell/e-shell-importer.c:132
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Valitse suoritettavan tuojan tyyppi:"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:134
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -19706,11 +20110,11 @@ msgstr ""
 "Voit valita myös \"Automaattisen\" jos et tiedä tiedoston muotoa, ja "
 "Evolution yrittää päätellä sen."
 
-#: ../shell/e-shell-importer.c:141
+#: ../shell/e-shell-importer.c:140
 msgid "Choose the destination for this import"
 msgstr "Valitse tämän tuonnin kohde"
 
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:146
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19722,23 +20126,23 @@ msgstr ""
 "tuoda Evolutioniin, ei löytynyt. Jos haluat yrittää uudestaan, valitse\n"
 "\"Takaisin\".\n"
 
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:284
 msgid "F_ilename:"
 msgstr "_Tiedostonimi:"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:289
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:298
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:334
 msgid "Import data and settings from _older programs"
 msgstr "Tuo tietoja ja asetuksia _vanhemmista ohjelmista"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:337
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
@@ -19746,29 +20150,9 @@ msgstr "Tuo _yksi tiedosto"
 msgid "Evolution Preferences"
 msgstr "Evolutionin asetukset"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Kansion nimeä ei ole määritelty"
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Kansion nimessä ei voi olla rivinvaihtomerkkiä"
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Kansion nimi ei voi sisältää merkkiä \"/\""
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Kansion nimi ei voi sisältää merkkiä \"#\""
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' ja '..' ovat varattuja kansion nimiä"
-
 #. 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:47 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - evolution"
@@ -19793,7 +20177,7 @@ msgstr "Bug buddya ei voi suorittaa."
 #. 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 ""
 "Timo Jyrinki, 2008\n"
@@ -19803,43 +20187,47 @@ msgstr ""
 "\n"
 "http://gnome.fi/"
 
-#: ../shell/e-shell-window-commands.c:753
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolutionin www-sivut"
 
-#: ../shell/e-shell-window-commands.c:771
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Virhe avattaessa FAQ-sivua."
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "_Yhteydellinen tila"
 
-#: ../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 "_Yhteydetön tila"
 
-#: ../shell/e-shell-window-commands.c:994
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Valitse yhteydetön tila"
 
-#: ../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 on yhteydellisessä tilassa. Napsauta tästä siirtyäksesi "
-"yhteydettömään tilaan."
+"Evolution on yhteydellisessä tilassa.\n"
+"Siirry yhteydettömään tilaan napsauttamalla tästä."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirtyy yhteydettömään tilaan."
 
-#: ../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 on yhteydettömässä tilassa. Napsauta tästä siirtyäksesi "
-"yhteydelliseen tilaan."
+"Evolution on yhteydettömässä tilassa.\n"
+"Siirry yhteydelliseen tilaan napsauttamalla tästä."
 
-#: ../shell/e-shell-window.c:807
+#: ../shell/e-shell-window.c:782
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
@@ -19869,9 +20257,9 @@ msgstr "OAF:ia ei voidaan rekisteröidä"
 msgid "Configuration Database not found"
 msgstr "Asetustietokantaa ei löytynyt"
 
-#: ../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 "Uusi"
 
@@ -19879,10 +20267,6 @@ msgstr "Uusi"
 msgid "New Test"
 msgstr "Uusi testi"
 
-#: ../shell/test/evolution-test-component.c:108
-msgid "_Test"
-msgstr "_Testi"
-
 #: ../shell/test/evolution-test-component.c:109
 msgid "Create a new test item"
 msgstr "Luo uusi testijuttu"
@@ -20787,7 +21171,7 @@ msgstr "Tallenna yhteystiedot valitussa kansiossa VCardina"
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
@@ -20856,7 +21240,7 @@ msgstr "_Siirry yhteystieto..."
 msgid "_Move Folder Contacts To"
 msgstr "_Siirrä kansion sisältö..."
 
-#: ../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 "_Uusi"
 
@@ -20994,193 +21378,6 @@ msgstr "Työviikko"
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Liitä tiedosta napsauttamalla tästä"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Sulje nykyinen ikkuna napsauttamalla tästä"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Tallenna nykyinen ikkuna napsauttamalla tästä"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Napsauta tästä näyttääksesi ohje"
-
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Sulje"
-
-#: ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Kopioi valittu teksti leikepöydälle"
-
-#: ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "_Kopioi valittu teksti leikepöydälle"
-
-#: ../ui/evolution-editor.xml.h:10
-msgid "I_nsert"
-msgstr "Li_sää"
-
-#: ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Liitä tekstiä leikepöydältä"
-
-#: ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Valitse kaikki teksti"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "O_hje"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Asetukset"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Koko päivän tapahtuma"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Koko _päivän tapahtuma"
-
-#: ../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 "Luokittele luottamukselliseksi"
-
-#: ../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 "Luokittele yksityiseksi"
-
-#: ../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 "Luokittele julkiseksi"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr ""
-"Napsauta tästä, jos haluat asettaa tai poistaa tämän tehtävän hälytyksiä"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Lisää erityisiä lähetysvaihtoehtoja"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Muuta tämä tapahtuma toistuvaksi"
-
-#: ../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 "J_ulkinen"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "R_oolikenttä"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "Lähetys_asetukset"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Näytä aika _varattuna"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "_Aikavyöhyke"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Määrittää näytetäänkö läsnäolijakenttä"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Määrittää näytetäänkö RSVP-kenttä"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Määrittää näytetäänkö roolikenttä"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Määrittää näytetäänkö tilakenttä"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Määrittää näytetäänkö aikavyöhykekenttä"
-
-#: ../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 "Määrittää näytetäänkö luokat"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Määrittää onko tämä koko päivän tapahtuma"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Määrittää näytetäänkö aika varattuna"
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "_Hälytykset"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Luokat"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "Lu_okittelu"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "_Luottamuksellinen"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "_Vapaa/Varattu"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "_Yksityinen"
-
-#: ../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 "T_oistuvuus"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "_Tilakenttä"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "T_yyppikenttä"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Peruuta nykyinen postioperaatio"
@@ -21431,7 +21628,7 @@ msgstr "Säikeistetty viesti-ikkuna"
 msgid "_Group By Threads"
 msgstr "Ryhmittele _säikeittäin"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Viesti"
@@ -21766,126 +21963,126 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Näytä välkkyvä kursori näytettävien viestin rungossa"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Näytä viesti tavallista tyyliä käyttäen"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Näytä viesti kaikilla otsakkeillaan"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Näytä viestin raakatekstimuotoinen lähdekoodi"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "Sa_mantekevä"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "L_oitonna"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "Kohdistin_tila"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "_Poista merkki"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "Poista _viesti"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "Etsi viestistä..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Tärkeä"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "S_isäkkäisesti"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "_Roskapostia"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "_Lataa kuvat"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "_Viestin lähdekoodi"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_Ei roskapostia"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Lainattuna"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Lue"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Tallenna viesti..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Palauta viesti"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "l_ukematon"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Suurenna"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Lä_hennä"
 
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Sulje"
+
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Päätyökalupalkki"
@@ -21922,22 +22119,6 @@ msgstr "Näytä valittu muistilappu"
 msgid "_Open Memo"
 msgstr "_Avaa muistilappu"
 
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Napsauta painiketta ja muuta tai näytä tehtävän yksityiskohtia"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Tilan yksityiskohdat"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Aikavyöhyke"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "_Tilan yksityiskohdat"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Kopioi valitut tehtävät"
@@ -22132,50 +22313,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Näytä tai piilota tilarivi"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Valitse _yhteydetön tila"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "_Unohda salasanat"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Uaset kysytyt kysymykset"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Piilota napit"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Vain _kuvakkeet"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Pikaopas"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Valit_simen tyyli"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "_Synkronointiasetukset..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Ikkuna "
 
@@ -22274,7 +22459,7 @@ msgstr "Valitse _aikavyöhyke"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Timezone drop-down combination box"
-msgstr ""
+msgstr "Aikavyöhykkeen valinnnan pudotusvalikko"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22390,36 +22575,10 @@ msgstr "Näkymän tyyppi"
 msgid "Type of view:"
 msgstr "Näkymän tyyppi:"
 
-#: ../widgets/misc/e-attachment-bar.c:108
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u tavu"
-msgstr[1] "%u tavua"
-
-#: ../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 "Liitepalkki"
 
-#: ../widgets/misc/e-attachment-bar.c:1414
-msgid "Recent Docu_ments"
-msgstr "Viimeisi_mmät asiakirjat"
-
 #: ../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
@@ -22498,16 +22657,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 "Minimileveys"
 
 #: ../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 "Minimileveys"
 
@@ -22637,7 +22796,6 @@ msgid "Click this button to show a calendar"
 msgstr "Paina tästä näyttääksesi kalenterin"
 
 #: ../widgets/misc/e-dateedit.c:394
-#, fuzzy
 msgid "Drop-down combination box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
@@ -22693,11 +22851,11 @@ msgstr "Merkintä-elementti"
 msgid "A widget to display in place of the usual expander label"
 msgstr "Tavallisen laajennin-otsikin tilalla näytettävä elementti"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Laajentimen koko"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Laajennusnuolen koko"
 
@@ -22765,14 +22923,21 @@ msgid "World Map"
 msgstr "Maailmankartta"
 
 #: ../widgets/misc/e-map.c:627
-#, fuzzy
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 msgstr ""
-"Hiirikäyttöinen maailmankartta, jolla valitaan aikavyöhyke. Näppäimistön "
+"Hiirikäyttöinen maailmankartta aikavyöhykkeen valintaa varten. Näppäimistön "
 "käyttäjät voivat valita aikavyöhykkeen allaolevasta pudotusvalikosta."
 
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "Verkossa"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "Napin tila on verkossa"
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Synkronoi:"
@@ -22797,12 +22962,12 @@ msgstr "Uudelleenvirtauksen malli"
 msgid "Column width"
 msgstr "Sarakkeen leveys"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
 #: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Etsi"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
 #: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiä napsauttamalla tästä"
@@ -22830,19 +22995,19 @@ msgstr "Teksti"
 
 #. 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:1006
 msgid "Sho_w: "
 msgstr "Nä_ytä: "
 
 #. 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:1023
 msgid "Sear_ch: "
 msgstr "_Etsi: "
 
 #. 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:1035
 msgid " i_n "
 msgstr " lä_hteestä "
 
@@ -22892,10 +23057,6 @@ msgstr "<b>Tilan seuranta</b>"
 msgid "A_uto-delete sent item"
 msgstr "Poista lähetetty _automaattisesti"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Luokittelu"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Luo lähetyskohde, jonka tietoja seurataan"
@@ -23002,19 +23163,19 @@ msgid "_When opened:"
 msgstr "_Milloin avattu:"
 
 #. 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:255
 #, 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:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d %% valmiina)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Napsauta tästä avataksesi URLin"
 
@@ -23225,81 +23386,81 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kohta)"
 msgstr[1] "%s (%d kohtaa)"
 
-#: ../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 "Vaihtelevat rivien värit"
 
-#: ../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:3322 ../widgets/table/e-tree.c:3323
+#: ../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:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Vaakasuuntainen piirtoristikko"
 
-#: ../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:3328 ../widgets/table/e-tree.c:3329
+#: ../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:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Pystysuuntainen piirtoristikko"
 
-#: ../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:3334 ../widgets/table/e-tree.c:3335
+#: ../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:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Piirron kohdistin"
 
-#: ../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 "Kursorin tila"
 
-#: ../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 "Valintamalli"
 
-#: ../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-tree.c:3317
+#: ../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:3338
+#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "Pituuden raja-arvo"
 
-#: ../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-tree.c:3349
+#: ../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:3370
+#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "Yhtenäinen rivinkorkeus"
 
-#: ../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 "Jäädytetty"
 
@@ -23375,36 +23536,36 @@ msgstr "Tietoja järjestyksestä"
 msgid "Tree"
 msgstr "Puu"
 
-#: ../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 "Taulukon otsikko"
 
-#: ../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 "Taulumalli"
 
-#: ../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 "Kohdistimen rivi"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Hae aina"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Lisää napsauttamalla"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree-taulukon adapteri"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Retro-ulkoasu"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Piirrä viivat ja +/- laajentimet."
 
@@ -23512,316 +23673,20 @@ msgstr "IM-konteksti"
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
 
-#~ msgid "Permission Denied."
-#~ msgstr "Lupa evätty."
-
-#~ msgid "<b>Display</b>"
-#~ msgstr "<b>Näytä</b>"
-
-#~ msgid "<b>Server Information</b>"
-#~ msgstr "<b>Palvelimen tiedot</b>"
-
-#~ msgid "Unknown reason"
-#~ msgstr "Tuntematon syy"
-
-#~ msgid "Open File"
-#~ msgstr "Avaa tiedosto"
-
-#~ msgid "Cannot open file &quot;{0}&quot;."
-#~ msgstr "Tiedostoa &quot;{0}&quot; ei voi avata."
-
-#~ msgid "Attach original message"
-#~ msgstr "Liitä alkuperäinen viesti"
-
-#~ msgid "Do not quote original message"
-#~ msgstr "Älä lainaa alkuperäistä viestiä"
-
-#~ msgid "Quote original message"
-#~ msgstr "Lainaa alkuperäinen viesti"
-
-#~ msgid "Enter a name for this signature."
-#~ msgstr "Anna allekirjoitukselle nimi"
-
-#~ msgid "Name:"
-#~ msgstr "Nimi:"
-
-#~ msgid ""
-#~ "Are you sure you want to permanently remove all the deleted messages in "
-#~ "folder &quot;{0}&quot;?"
-#~ msgstr ""
-#~ "Haluatko varmasti poistaa kaikki poistetut viestit pysyvästi kansiosta "
-#~ "&quot;{0}&quot;\n"
-#~ "?"
-
-#~ msgid "Delete &quot;{0}&quot;?"
-#~ msgstr "Poista &quot;{0}&quot;"
-
-#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-#~ msgstr "Poistetaanko viestit hakunäkymässä &quot;{0}&quot;?"
-
-#~ msgid "Only on _Current Folder"
-#~ msgstr "Vain _nykyiselle kansiolle"
-
-#~ msgid "Enable attachment reminder plugin"
-#~ msgstr "Ota liitemuistuttaja käyttöön"
-
-#~ msgid "Enable attachment reminder plugin."
-#~ msgstr "Ota liitemuistuttaja käyttöön"
-
-#~ msgid "Remind _missing attachments"
-#~ msgstr "Muistuta _puuttuvista liitteistä"
-
-#~ msgid "_Continue Editing"
-#~ msgstr "_Jatka muokkausta"
-
-#~ msgid "_Refresh:"
-#~ msgstr "_Virkistysväli:"
-
-#~ msgid "There is no configuration option for this plugin."
-#~ msgstr "Tälle liitännäiselle ei ole asetusvalintoja"
-
-#~ msgid "Gives an option to print from the composer."
-#~ msgstr "Antaa mahdollisuuden tulostaa viesti kirjoitusikkunasta."
-
-#~ msgid "Print Message"
-#~ msgstr "Tulosta viesti"
-
-#~ msgid "Prints the message"
-#~ msgstr "Tulostaa viestin"
-
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "Kopioi valinta leikepöydälle"
-
-#~ msgid "Cut selection to clipboard"
-#~ msgstr "_Leikkaa valinta leikepöydälle"
-
-#~ msgid "Paste from clipboard"
-#~ msgstr "Liitä leikepöydältä"
-
-#~ msgid "Delete all but signature"
-#~ msgstr "Poista kaikki paitsi allekirjoitus"
-
-#~ msgid "For_mat"
-#~ msgstr "_Muotoilu"
-
-#~ msgid "HT_ML"
-#~ msgstr "_HTML"
-
-#~ msgid "Open a file"
-#~ msgstr "Avaa tiedosto"
-
-#~ msgid "PGP Encrypt"
-#~ msgstr "PGP-salaus"
-
-#~ msgid "PGP Sign"
-#~ msgstr "PGP-allekirjoitus"
-
-#~ msgid "S/MIME Encrypt"
-#~ msgstr "S/MIME-salaus"
-
-#~ msgid "S/MIME Sign"
-#~ msgstr "S/MIME-allekirjoitus"
-
-#~ msgid "Save As"
-#~ msgstr "Tallenna nimellä"
-
-#~ msgid "Save Draft"
-#~ msgstr "Tallenna luonnos"
-
-#~ msgid "Save in folder..."
-#~ msgstr "Tallenna kansioon..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Tallenna viesti johonkin tiettyyn kansioon"
-
-#~ msgid "Send"
-#~ msgstr "Lähetä"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Lähetä viesti HTML-muodossa"
-
-#~ msgid "_Delete all"
-#~ msgstr "_Poista kaikki"
-
-#~ msgid "_Open..."
-#~ msgstr "_Avaa..."
-
-#~ msgid "C_lose"
-#~ msgstr "_Sulje"
-
-#~ msgid "H_TML"
-#~ msgstr "_HTML"
-
-#~ msgid "Save and _Close"
-#~ msgstr "Tallenna ja _sulje"
-
-#~ msgid "Save the current file and close the window"
-#~ msgstr "Tallenna nykyinen tiedosto ja sulje ikkuna"
-
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Lisää kansio tilattujen kansioiden listaan"
-
-#~ msgid "Refresh List"
-#~ msgstr "Virkistä lista"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Virkistä kansiolista"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "Poista kansio tilaamiesi kansioiden listasta"
-
-#~ msgid "Subscribe"
-#~ msgstr "Tilaa"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Poista tilaus"
-
-#~ msgid "_Invert Selection"
-#~ msgstr "_Käännä valinta"
-
-#~ msgid "TimeZone Combobox"
-#~ msgstr "Aikavyöhykkeen komboboksi"
-
-#~ msgid "Select Drafts Folder"
-#~ msgstr "Valitse luonnosten kansio"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "Valitse lähetettyjen kansio"
-
-#~ msgid "_Categories..."
-#~ msgstr "_Luokat..."
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "Add an email to the List"
-#~ msgstr "Lisää sähköposti listalle"
-
-#~ msgid "Insert email addresses from Address Book"
-#~ msgstr "Lisää sähköpostiosoite osoitekirjasta"
-
-#~ msgid "Members"
-#~ msgstr "Jäsenet"
-
-#~ msgid "Remove an email address from the List"
-#~ msgstr "Poista sähköpostiosoite listalta"
-
-#~ msgid "_Select"
-#~ msgstr "_Valitse"
-
-#~ msgid "Or_ganiser:"
-#~ msgstr "_Järjestäjä:"
-
-#~ msgid "Task sort"
-#~ msgstr "Tehtävän tyyppi"
-
-#~ msgid "Memo sort"
-#~ msgstr "Muistilappujen järjestys"
-
-#~ msgid "SMTWTFS"
-#~ msgstr "SMTKTPL"
-
-#~ msgid "Post To:"
-#~ msgstr "_Postita:"
-
-#~ msgid "The Evolution PIM and Email Client"
-#~ msgstr "Evolution, sähköposti- ja ajanhallintaohjelma"
-
-#~ msgid "_Search name:"
-#~ msgstr "_Haun nimi::"
-
-#~ msgid "Di_sable"
-#~ msgstr "_Ei käytössä"
-
-#~ msgid "New Mail Notify sound file"
-#~ msgstr "Uudesta postista huomauttava äänitiedosto"
-
-#~ msgid "New Mail Notify type"
-#~ msgstr "Uutta postia -huomautuksen tyyppi"
-
-#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
-#~ msgstr ""
-#~ "Määrittelee saapuneiden viestien huomautuksen, jota käyttäjä haluaa "
-#~ "käyttää."
-
-#~ msgid "<span weight=\"bold\">Labels and Colors</span>"
-#~ msgstr "<span weight=\"bold\">Merkinnät ja värit</span>"
-
-#~ msgid "<span weight=\"bold\">New Mail Notification</span>"
-#~ msgstr "<span weight=\"bold\">Huomautus uusista viesteistä</span>"
-
-#~ msgid "HTML Mail"
-#~ msgstr "HTML-viesti"
-
-#~ msgid "Se_lect..."
-#~ msgstr "_Valitse..."
-
-#~ msgid "_Beep when new mail arrives"
-#~ msgstr "_Piippaa, kun uusia viestejä saapuu"
-
-#~ msgid "_Do not notify me when new mail arrives"
-#~ msgstr "_Älä huomauta uuden sähköpostin saapumisesta"
-
-#~ msgid "Attachment Reminder Preferences"
-#~ msgstr "Liitemuistuttajan ominaisuudet"
-
-#~ msgid "Select a (48*48) png of size < 720bytes"
-#~ msgstr "Valitse (48x48) png-tiedosto, jonka koko on <720 tavua"
-
-#~ msgid "_Contacts..."
-#~ msgstr "_Yhteystiedot..."
-
-#~ msgid "Every time a new mail arrives, pop up a libnotify notification."
-#~ msgstr "Aina kun uusi viesti saapuu, ponnauta libnotify-huomautusikkuna."
-
-#~ msgid "Make the status icon blink"
-#~ msgstr "Laita tilakuvake vilkkumaan"
-
-#~ msgid "When the new-mail status icon is visible, make it blink."
-#~ msgstr "Laita uusien viestien tilakuvake vilkkumaan, kun on näkyvissä."
-
-#~ msgid "System error: %s"
-#~ msgstr "Järjestelmävirhe: %s"
-
-#~ msgid "Account cannot send e-mail"
-#~ msgstr "Tili ei voi lähettää sähköpostia"
-
-#~ msgid "No store available"
-#~ msgstr "Ei tallennustilaa käytettävissä"
-
-#~ msgid ""
-#~ "A plugin which implements a CORBA interface for accessing mail data "
-#~ "remotely."
-#~ msgstr ""
-#~ "Liitännäinen, joka toteuttaa CORBA-rajapinnan sähköpostin lukemiseen "
-#~ "muista ohjelmista."
-
-#~ msgid "Mail Remote"
-#~ msgstr "Sähköpostin etäkäyttö"
-
-#~ msgid "New Mail Notification"
-#~ msgstr "Huomautus uudesta sähköpostista"
-
-#~ msgid "Configure"
-#~ msgstr "Määrittele"
-
-#~ msgid "Download messages for offline"
-#~ msgstr "Nouda viestit yhteydetöntä käyttöä varten"
-
-#~ msgid "_Phone List"
-#~ msgstr "_Puhelinnumerot"
+#~ msgid "Username:"
+#~ msgstr "Käyttäjätunnus:"
 
-#~ msgid "MTWTFSS"
-#~ msgstr "MTKTPLS"
+#~ msgid "Update every"
+#~ msgstr "Päivitetään joka"
 
-#~ msgid "<- _Remove"
-#~ msgstr "<- _Poista"
+#~ msgid "Migrating `%s':"
+#~ msgstr "Siirretään  \"%s\""
 
-#~ msgid "Sh_ow these fields in order:"
-#~ msgstr "_Näytä nämä kentät järjestyksessä:"
+#~ msgid "D_escription:"
+#~ msgstr "_Kuvaus:"
 
-#~ msgid "_Add ->"
-#~ msgstr "_Lisää ->"
+#~ msgid "De_scription:"
+#~ msgstr "_Kuvaus:"
 
-#~ msgid "Emulate label resize"
-#~ msgstr "Emuloi otsikon koon muutosta"
+#~ msgid "Updating query"
+#~ msgstr "Päivitetään kyselyä"
diff --git a/po/gl.po b/po/gl.po
index c3e594ae1b..d70122e1ae 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-07 18:06+0200\n"
-"PO-Revision-Date: 2008-08-07 18:12+0200\n"
+"POT-Creation-Date: 2008-08-12 17:37+0200\n"
+"PO-Revision-Date: 2008-08-12 17:37+0200\n"
 "Last-Translator: Frco. Javier Rial Rodríguez <>\n"
 "Language-Team: Galician <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
@@ -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:758
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
@@ -174,7 +174,7 @@ 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:761
+#: ../calendar/gui/calendar-component.c:760
 #: ../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"
@@ -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:763
-#: ../calendar/gui/calendar-component.c:768
-#: ../calendar/gui/calendar-component.c:770
+#: ../calendar/gui/calendar-component.c:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 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:782
-#: ../calendar/gui/calendar-component.c:789
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:797
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -206,7 +206,7 @@ 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:787
+#: ../calendar/gui/calendar-component.c:786
 #: ../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"
@@ -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:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Fallo ao eliminar o contacto"
 
@@ -614,8 +614,8 @@ 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:1334
-#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
 #: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
@@ -642,8 +642,8 @@ msgid "Evolution Address Book component"
 msgstr "Compoñente da axenda de enderezos do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Control de xestión de certificados S/Mime do Evolution"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Control de xestión de certificados S/MIME do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -657,13 +657,13 @@ msgstr "Xestione os seus certificados S/MIME aquí"
 #. 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/calendar-component.c:236
+#: ../calendar/gui/memos-component.c:199 ../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
+#: ../calendar/gui/tasks-component.c:195 ../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
+#: ../mail/message-list.c:1457
 msgid "On This Computer"
 msgstr "Neste computador"
 
@@ -676,10 +676,10 @@ 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/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:208 ../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/migration.c:1099 ../calendar/gui/tasks-component.c:204
 #: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Persoal"
@@ -749,13 +749,13 @@ 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:2368
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../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:556
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
 #: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Axenda de enderezos"
@@ -775,7 +775,7 @@ msgid "Details"
 msgstr "Detalles"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:965
+#: ../mail/em-folder-browser.c:982
 msgid "Searching"
 msgstr "Buscando"
 
@@ -794,10 +794,10 @@ msgid "Migrating..."
 msgstr "Migrando..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "Migrando `%s':"
+msgid "Migrating '%s':"
+msgstr "Migrando '%s':"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -851,67 +851,72 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus datos Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear o cartafol \"%s\" como:"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "Renomear o cartafol"
 
-#: ../addressbook/gui/component/addressbook-view.c:438
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carácter '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Gardar como vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:620
+#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/calendar-component.c:619
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1696 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
 #: ../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:957
-msgid "_Properties..."
-msgstr "_Propiedades..."
+#: ../addressbook/gui/component/addressbook-view.c:949
+#: ../calendar/gui/calendar-component.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Propiedades"
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Selector de orixe de contactos"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accedendo anonimamente ao servidor LDAP"
 
-#: ../addressbook/gui/component/addressbook.c:200
+#: ../addressbook/gui/component/addressbook.c:207
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "Fallou ao autenticarse.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
+#: ../addressbook/gui/component/addressbook.c:214
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o contrasinal para %s (usuario %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
 #: ../plugins/google-account-setup/google-source.c:498
 #: ../plugins/publish-calendar/publish-calendar.c:190
@@ -1351,7 +1356,7 @@ msgid "Image"
 msgstr "Imaxe"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1364,7 +1369,7 @@ msgid "Nic_kname:"
 msgstr "_Alcume:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1404,8 +1409,8 @@ msgid "_Birthday:"
 msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:788
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Calendario:"
@@ -1494,15 +1499,15 @@ msgstr "_Onde:"
 msgid "_Zip/Postal Code:"
 msgstr "_Código Postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
 #: ../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: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-address.c:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
 #: ../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
@@ -1517,975 +1522,975 @@ msgstr "Enderezo"
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "Afganistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "Alxeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "Antártida"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "Antiga e Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "Arxentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "Austria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "Acerbaixán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "Bélxica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "Belice"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "Bután"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia e Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "Botsuana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "Illa Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "British Indian Ocean Territory"
 msgstr "Territorio Británico do Océano Índico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Brunei Darussalam"
 msgstr "Sultanato de Brunei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "Camerún"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "Illas Caimán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "República Centroafricana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "Chad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "Kiritimati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "Illas Cocos (Keeling)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "Comores"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, A república democrática do"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cook Islands"
 msgstr "Illas Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "Costa de Marfil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "Croacia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "Xibutí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "Exipto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "Guinea Ecuatorial"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "Etiopía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "Illas Malvinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "Illas Feroe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "Fixi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "Francia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "Güiana Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "Territorios Franceses do Sur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "Gabón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "Xeorxia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "Alemaña"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "Gana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "Xibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "Güiana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "Haití"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Heard And McDonald Islands"
 msgstr "Illas Heard e McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Holy See"
 msgstr "Santa Sé"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "Hungría"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "India"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "Irán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "Iraq"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "Illa de Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "Italia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "Xamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "Xapón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "Xordania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kazakhstán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Corea, República democrática popular de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr "Corea, República de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Kirguizistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Letonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Líbano"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "Libia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "Malí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "Illas Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "Martinica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "Mauricio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "México"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "Moldavia, República de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "Mónaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "Países Baixos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "Antillas Holandesas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "Nova Caledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "Nova Zelandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "Níxer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "Nixeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "Illa Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "Illas Marianas do Norte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "Omán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "Paquistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "Palestina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "Panamá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "Papúa Nova Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "Perú"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "Reunión"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "Romanía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "Federación Rusa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Kitts And Nevis"
 msgstr "San Cristófer-Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Lucia"
 msgstr "Santa Lucía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Vincent And The Grenadines"
 msgstr "San Vicente e as Granadinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Sao Tome And Principe"
 msgstr "São Tomé e Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saudi Arabia"
 msgstr "Arabia Saudí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "Serbia e Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "Seixeles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "Serra Leona"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "Illas Salomón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "Sudáfrica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 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:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Spain"
 msgstr "España"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "Santa Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre e Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Sudan"
 msgstr "Sudán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Illas Svalbard e Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Swaziland"
 msgstr "Suazilandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "Suíza"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "Siria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "Taiwán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "Taxikistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania, República Unida de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "Timor Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "Trinidad e Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "Turquía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "Turkmenistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turks And Caicos Islands"
 msgstr "Illas Turk e Caicos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "Ucraína"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "Emiratos Árabes Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United States Minor Outlying Islands"
 msgstr "Illas Exteriores Menores dos EEUU"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "Uzbekistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "Illas Virxes, británicas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, U.S."
 msgstr "Illas Virxes, estadounidenses"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Wallis And Futuna Islands"
 msgstr "Illas Wallis e Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Western Sahara"
 msgstr "Sáhara Occidental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "Iemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "Zambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "Cimbabue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
 #: ../mail/em-mailer-prefs.c:466
 #: ../plugins/exchange-operations/exchange-delegates.c:952
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
@@ -2497,35 +2502,35 @@ msgstr "Cimbabue"
 msgid "Name"
 msgstr "Nome"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
 msgid "AOL Instant Messenger"
 msgstr "Messenger instantáneo AOL"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 #: ../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:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 msgid "Yahoo Messenger"
 msgstr "Messenger Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Gadu-Gadu Messenger"
 msgstr "Messenger Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 #: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:111
 msgid "Service"
 msgstr "Servizo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
 #: ../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
@@ -2533,7 +2538,7 @@ msgstr "Servizo"
 msgid "Location"
 msgstr "Localización"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 msgid "Username"
 msgstr "Nome do usuario"
 
@@ -2833,7 +2838,7 @@ 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:213
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
 #: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
@@ -2900,14 +2905,14 @@ msgid "Email"
 msgstr "Correo Electrónico"
 
 #: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "O correo comeza por"
 
@@ -2928,7 +2933,7 @@ 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:227
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
 #: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
@@ -2951,15 +2956,15 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao modificar o cartón"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "O nome comeza por"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Fonte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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
@@ -2967,92 +2972,92 @@ msgstr "Fonte"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Gardar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1674 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Novo contacto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Nova _lista de contactos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Gardar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Enviar unha _mensaxe á lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Enviar unha _mensaxe aos contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "Im_primir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "Co_piar á axenda de enderezos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver á axenda de enderezos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
 #: ../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-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "_Pegar"
 
 #. 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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "Calquera categoría"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 #: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Other error"
 msgstr "Outro erro"
@@ -3365,16 +3370,16 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Posúe cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "_Abrir ligazón no navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Copiar localización da ligazón"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "_Enviar unha mensaxe nova a..."
 
@@ -3418,7 +3423,7 @@ msgstr "Videoconferencia"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:806
+#: ../calendar/gui/calendar-component.c:805
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/gnome-cal.c:2376
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
@@ -3434,7 +3439,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:114
+#: ../calendar/gui/dialogs/event-editor.c:113
 msgid "Free/Busy"
 msgstr "Dispoñibilidade"
 
@@ -3456,13 +3461,13 @@ msgid "Web Log"
 msgstr "Blogue"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2346
 #: ../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/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2347
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Aniversario"
@@ -3576,7 +3581,12 @@ msgstr "Non dispoñible en modo sen conexión"
 msgid "Invalid server version"
 msgstr "Versión do servidor non válida"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Método de autenticación non soportado"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 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 "
@@ -3587,7 +3597,7 @@ msgstr ""
 "o uso sen conexión. Cargue a axenda de enderezos unha vez en modo con "
 "conexión para descargar os seus contidos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3596,7 +3606,7 @@ msgstr ""
 "Non foi posible abrir esta axenda de enderezos. Verifique que o camiño %s "
 "existe e que ten permisos para acceder a el."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3604,7 +3614,7 @@ msgstr ""
 "Non foi posible abrir esta axenda de enderezos.  Isto significa que "
 "introduciu un URI incorrecto ou que o servidor LDAP está fóra de servizo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 "
@@ -3613,7 +3623,7 @@ msgstr ""
 "Esta versión do Evolution non ten soporte LDAP compilado nela. Se quere usar "
 "LDAP no Evolution, debe instalar un paquete do Evolution co LDAP activado."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3621,7 +3631,11 @@ msgstr ""
 "Non foi posible abrir esta axenda de enderezos.  Isto significa que "
 "introduciu un URI incorrecto ou que o servidor é inaccesible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+msgid "Detailed error:"
+msgstr "Erro detallado:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3634,7 +3648,7 @@ msgstr ""
 "aumente o límite de resultados nas preferencias do servidor\n"
 "de directorios para esta axenda de enderezos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3646,47 +3660,47 @@ msgstr ""
 "especifique máis a súa busca ou aumente o límite de tempo nas \n"
 "preferencias do servidor de directorio para esta axenda de enderezos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "O backend para esta axenda de enderezos non puido analizar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "O backend para esta axenda de enderezos rexeitou efectuar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "Esta consulta non terminou con éxito."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "Erro ao engadir a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "Erro ao engadir o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "Erro ao modificar a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "Erro ao modificar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "Erro ao eliminar a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "Erro ao eliminar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3701,16 +3715,16 @@ msgstr[1] ""
 "Ao abrir %d contactos abrirá %d novas ventás tamén.\n"
 "Está seguro de que quere mostrar este contacto?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
 msgstr "_Non mostrar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "Mostrar _todos os contactos"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3719,65 +3733,65 @@ msgstr ""
 "%s xa existe\n"
 "Quere sobrescribilo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
 #. 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
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contacto"
 msgstr[1] "contactos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "cartón.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr "Varias vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
 #, c-format
 msgid "Contact information"
 msgstr "Información de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, c-format
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
@@ -4240,19 +4254,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:179
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, 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:185
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, 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:182
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Está seguro de que quere eliminar esta tarefa?"
@@ -4572,12 +4586,12 @@ 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:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1403
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Calendarios"
 
@@ -4619,8 +4633,8 @@ 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: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/gnome-cal.c:1702 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:353
 #: ../calendar/gui/memos-control.c:369
 msgid "Memos"
 msgstr "Notas"
@@ -4628,8 +4642,8 @@ msgstr "Notas"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../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-component.c:539
+#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
 #: ../calendar/importers/icalendar-importer.c:74
 #: ../calendar/importers/icalendar-importer.c:735
@@ -4654,13 +4668,13 @@ 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:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #: ../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
@@ -4672,7 +4686,7 @@ msgid_plural "hours"
 msgstr[0] "horas"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Hora de comezo"
 
@@ -4683,8 +4697,8 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1600
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4715,32 +4729,32 @@ msgstr "_Pospor"
 msgid "location of appointment"
 msgstr "localización da cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Non hai resumo dispoñible."
 
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
 #: ../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:1478
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Non hai información da localización dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Posúe %d alarmas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1684
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1712
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
 #: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4752,7 +4766,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:1718
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4769,7 +4783,7 @@ msgstr ""
 "\n"
 "Está seguro de que quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1732
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
@@ -5120,7 +5134,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "A hora na que se executou a última alarma, en time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Fuso horario"
 
@@ -5265,56 +5279,56 @@ msgstr "Minuto de comezo da xornada laboral"
 msgid "daylight savings time"
 msgstr "horario de verán"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "A categoría é"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "O comentario contén"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "A localización contén"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Sen equivalencia"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos seguintes sete días"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Tarefas activas"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Tarefas pendentes"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos seguintes sete días"
 
@@ -5351,107 +5365,99 @@ msgstr "días"
 #. 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/calendar-component.c:273
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
 #: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:232
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "Na Web"
 
-#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Datas de nacementos e aniversarios"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:324
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Tempo"
 
-#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Novo calendario"
 
-#: ../calendar/gui/calendar-component.c:617
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../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:950
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Fallou ao actualizar calendarios."
 
-#: ../calendar/gui/calendar-component.c:1249
+#: ../calendar/gui/calendar-component.c:1248
 #, 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:1265
+#: ../calendar/gui/calendar-component.c:1264
 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:1378
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Selector de orixe do calendario"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1595
 msgid "New appointment"
 msgstr "Nova cita"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1596
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1597
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1603
 msgid "New meeting"
 msgstr "Nova reunión"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1604
 msgctxt "New"
 msgid "M_eeting"
 msgstr "R_eunión"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1605
 msgid "Create a new meeting request"
 msgstr "Crear unha solicitude de nova reunión"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1611
 msgid "New all day appointment"
 msgstr "Nova cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1612
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1613
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1619
 msgid "New calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1620
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Create a new calendar"
 msgstr "Crear un novo calendario"
 
@@ -5613,7 +5619,7 @@ msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:298
+#: ../calendar/gui/dialogs/event-editor.c:297
 msgid "Recurrence"
 msgstr "Recorrencia"
 
@@ -5701,7 +5707,7 @@ msgstr "Permiso denegado para abrir o calendario"
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:602
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Editar alarma"
 
@@ -5815,7 +5821,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "comezo da cita"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "Acción/Activador"
 
@@ -5829,12 +5835,12 @@ msgstr "Enga_dir"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
 #: ../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:150
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Anexar ficheiro(s)"
 
@@ -5998,7 +6004,7 @@ msgid "Thursday"
 msgstr "Xoves"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Fuso _horario:"
 
@@ -6146,50 +6152,50 @@ msgstr "Propiedades de lista de notas"
 msgid "New Memo List"
 msgstr "Nova lista de notas"
 
-#: ../calendar/gui/dialogs/changed-comp.c:58
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "Eliminouse este evento."
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "Eliminouse esta tarefa."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "Eliminouse esta nota."
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, 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:77
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, 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:82
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "Este evento foi modificado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "Modificouse esta tarefa."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "Esta nota foi modificado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, 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:101
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non realizou modificacións, quere actualizar o editor?"
@@ -6226,22 +6232,22 @@ msgstr "Mensaxe anexa - %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
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1771
+#: ../composer/e-msg-composer.c:1990
 #, 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: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
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Cancelar o _arrastre"
 
@@ -6455,8 +6461,8 @@ msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-page.c:1871
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
@@ -6464,13 +6470,13 @@ msgid "_Remove"
 msgstr "E_liminar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../composer/e-msg-composer.c:1049
+#: ../composer/e-msg-composer.c:1048
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Engadir anexo..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../mail/em-format-html-display.c:2194
+#: ../mail/em-format-html-display.c:2195
 msgid "Show Attachments"
 msgstr "Mostrar anexos"
 
@@ -6502,57 +6508,57 @@ msgstr "Non se puido abrir o destino"
 msgid "Destination is read only"
 msgstr "O destino é só de lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:202
+#: ../calendar/gui/dialogs/delete-comp.c:201
 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:53
+#: ../calendar/gui/dialogs/delete-error.c:52
 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:56
+#: ../calendar/gui/dialogs/delete-error.c:55
 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:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 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:62
+#: ../calendar/gui/dialogs/delete-error.c:61
 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:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 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:72
+#: ../calendar/gui/dialogs/delete-error.c:71
 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:75
+#: ../calendar/gui/dialogs/delete-error.c:74
 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:78
+#: ../calendar/gui/dialogs/delete-error.c:77
 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:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 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:88
+#: ../calendar/gui/dialogs/delete-error.c:87
 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:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 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:94
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "O elemento non se puido eliminar debido a un erro"
 
@@ -6569,179 +6575,179 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:194
 msgid "_Alarms"
 msgstr "_Alarmas"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:196
 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
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Recurrence"
 msgstr "_Recorrencia"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Make this a recurring event"
 msgstr "Converter en evento recorrente"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 #: ../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
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/task-editor.c:123
 msgid "Insert advanced send options"
 msgstr "Inserir opcións avanzadas de envío"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "All _Day Event"
 msgstr "Evento de _día completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:220
 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
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
 msgstr "Mostrar hora como _ocupada"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:228
 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
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Free/Busy"
 msgstr "_Dispoñibilidade"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:239
 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
+#: ../calendar/gui/dialogs/event-editor.c:294
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-page.c:732
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Este evento posúe alarmas"
 
-#: ../calendar/gui/dialogs/event-page.c:795
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../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:841
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1027
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Evento sen data de comezo"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Evento sen data de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1198
 #: ../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:1209
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1232
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "A hora de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1239
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "A hora de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/event-page.c:1401
 #: ../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:1408
+#: ../calendar/gui/dialogs/event-page.c:1407
 #: ../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:1433
+#: ../calendar/gui/dialogs/event-page.c:1432
 #: ../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:1873
+#: ../calendar/gui/dialogs/event-page.c:1872
 #: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "_Engadir "
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Non foi posible abrir o calendario '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2634
 #: ../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:2915
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:2921
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:2927
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, 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:2940
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../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: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
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
 #: ../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
+#: ../plugins/itip-formatter/itip-formatter.c:2021
 #: ../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
@@ -6769,23 +6775,25 @@ msgid "Custom Alarm:"
 msgstr "Alarma personalizada:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "D_escrición:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Descrición do evento"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Resumo:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Alarma"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Description:"
+msgstr "_Descrición:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Hora:"
@@ -6846,10 +6854,6 @@ msgstr "Data de _comezo:"
 msgid "T_o:"
 msgstr "_Para:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Descrición:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
@@ -7096,7 +7100,7 @@ msgstr "Terminada"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../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
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "Alto"
 
@@ -7113,14 +7117,14 @@ msgstr "En progreso"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../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
+#: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "Baixo"
 
 #: ../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:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "Normal"
 
@@ -7160,24 +7164,24 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "Páxina _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:111
 msgid "_Status Details"
 msgstr "Detalles do e_stado"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:113
 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
+#: ../calendar/gui/dialogs/task-editor.c:121
 #: ../composer/e-composer-actions.c:528
 msgid "_Send Options"
 msgstr "Opción_s de envío"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:319
 msgid "Task Details"
 msgstr "Detalles da tarefa"
 
@@ -7204,17 +7208,13 @@ msgid "Categor_ies..."
 msgstr "Ca_tegorías..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "De_scrición:"
+msgid "D_ue date:"
+msgstr "_Data de vencemento:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Fuso horario:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-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:392
 #, c-format
@@ -7292,7 +7292,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de activador descoñecido"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -7398,8 +7398,8 @@ msgstr "Non"
 #: ../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/itip-formatter/itip-formatter.c:409
+#: ../plugins/itip-formatter/itip-formatter.c:2046
 #: ../plugins/plugin-manager/plugin-manager.c:73
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:55
@@ -7414,27 +7414,27 @@ msgstr "Recorrencia"
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2028
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
 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:445
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imaxe_sen_título.%s"
 
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1675 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "_Gardar como..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Definir como _fondo"
 
@@ -7442,7 +7442,7 @@ msgstr "Definir como _fondo"
 msgid "_Save Selected"
 msgstr "_Gardar os seleccionados"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:837
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
@@ -7453,7 +7453,7 @@ 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
+#: ../calendar/gui/e-calendar-view.c:2218
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
@@ -7461,7 +7461,7 @@ 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
+#: ../calendar/gui/e-calendar-view.c:2222
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
@@ -7519,23 +7519,23 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-view.c:668 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Eliminar os obxectos seleccionados"
 
 #: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-view.c:798 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Actualizando obxectos"
 
 #: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
+#: ../calendar/gui/e-calendar-view.c:1224 ../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:1571
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1657
 msgid "New _Task"
 msgstr "Nova _Tarefa"
 
@@ -7544,20 +7544,20 @@ msgid "Open _Web Page"
 msgstr "Abrir páxina _web"
 
 #: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-view.c:1660 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "Imp_rimir..."
 
 #: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-view.c:1680 ../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:1583
-#: ../calendar/gui/e-calendar-view.c:1669
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1682 ../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"
@@ -7624,93 +7624,93 @@ msgstr "Prioridade"
 msgid "Start date"
 msgstr "Data de inicio"
 
-#: ../calendar/gui/e-calendar-view.c:1349
+#: ../calendar/gui/e-calendar-view.c:1343
 msgid "Moving items"
 msgstr "Movendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1351
+#: ../calendar/gui/e-calendar-view.c:1345
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1655
 msgid "New All Day _Event"
 msgstr "Novo _evento de día completo"
 
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-view.c:1656
 msgid "New _Meeting"
 msgstr "Nova _reunión"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Current View"
 msgstr "_Visualización actual"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1669
 msgid "Select T_oday"
 msgstr "Seleccionar _hoxe"
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1670
 msgid "_Select Date..."
 msgstr "_Seleccionar data..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "Pri_nt..."
 msgstr "_Imprimir..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunión..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1689
 msgid "_Schedule Meeting..."
 msgstr "_Programar reunión..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1690
 msgid "_Forward as iCalendar..."
 msgstr "_Remitir como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1691
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-calendar-view.c:1692 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta ocorrencia _movible"
 
-#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1698 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Eliminar esta _ocorrencia"
 
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-calendar-view.c:1699
 msgid "Delete _All Occurrences"
 msgstr "Eliminar _todas as ocorrencias"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2238 ../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:2278
+#: ../calendar/gui/e-calendar-view.c:2272
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -7858,12 +7858,12 @@ msgstr "Erro de iCalendar"
 
 #: ../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:344
 #: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:432
 #: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:520
 #: ../plugins/itip-formatter/itip-view.c:521
-#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Unha persoa descoñecida"
 
@@ -7879,12 +7879,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:2035
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
@@ -7892,7 +7892,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:2041
+#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Declined"
 msgstr "Rexeitado"
 
@@ -8115,7 +8115,7 @@ msgid "Attendee status updated\n"
 msgstr "Estado do participante actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 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 "
@@ -8275,7 +8275,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:2044
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -8452,7 +8452,7 @@ msgstr "Finalizando tarefas..."
 msgid "Expunging"
 msgstr "Expurgando"
 
-#: ../calendar/gui/e-timezone-entry.c:130
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "Seleccionar fuso horario"
 
@@ -8613,78 +8613,78 @@ msgstr "Información de iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante no evento."
 
-#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "_Nova lista de notas"
 
-#: ../calendar/gui/memos-component.c:545
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
-#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d seleccionada"
 msgstr[1] ", %d seleccionada"
 
-#: ../calendar/gui/memos-component.c:594
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "Fallou ao actualizar as notas."
 
-#: ../calendar/gui/memos-component.c:954
+#: ../calendar/gui/memos-component.c:953
 #, 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:967
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "Non hai un calendario dispoñible para crear notas"
 
-#: ../calendar/gui/memos-component.c:1077
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "Selector de orixe de notas"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1259
 msgid "New memo"
 msgstr "Nova nota"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1260
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_ota"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1261
 msgid "Create a new memo"
 msgstr "Crear unha nova nota"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1267
 msgid "New shared memo"
 msgstr "Nova nota compartida"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1268
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "Nota _compartida"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1269
 msgid "Create a shared new memo"
 msgstr "Crear unha nova nota compartida"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1275
 msgid "New memo list"
 msgstr "Nova lista de notas"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1276
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Li_sta de notas"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1277
 msgid "Create a new memo list"
 msgstr "Crear unha lista de notas nova"
 
@@ -8950,71 +8950,71 @@ msgstr "Contactos: "
 msgid "Upcoming Appointments"
 msgstr "Citas próximas"
 
-#: ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:536
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../calendar/gui/tasks-component.c:585
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "Fallou ao actualizar as tarefas."
 
-#: ../calendar/gui/tasks-component.c:942
+#: ../calendar/gui/tasks-component.c:941
 #, 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:955
+#: ../calendar/gui/tasks-component.c:954
 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:1066
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "Selector de orixe de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1324
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1325
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1326
 msgid "Create a new task"
 msgstr "Crear unha tarefa nova"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1332
 msgid "New assigned task"
 msgstr "Nova tarefa asignada"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1333
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa asigna_da"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Create a new assigned task"
 msgstr "Crear unha nova tarefa asignada"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1340
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1341
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Lista de tare_fas"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1342
 msgid "Create a new task list"
 msgstr "Crear unha lista de tarefas nova"
 
@@ -9030,7 +9030,7 @@ msgstr ""
 "\n"
 "Está seguro de que quere eliminar estas tarefas?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo."
 
@@ -9065,7 +9065,7 @@ msgstr "Citas e reunións"
 
 #: ../calendar/importers/icalendar-importer.c:331
 #: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Abrir calendario"
 
@@ -10660,9 +10660,9 @@ msgstr "_Pechar"
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1337
 #: ../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-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Imprimir..."
@@ -10893,18 +10893,18 @@ msgstr "Prema aquí para seleccionar os cartafoles nos que publicar"
 msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1558
 msgid "Show _Attachment Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:872
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Non se pode asinar a mensaxe saínte: non hai un certificado de sinatura "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:879
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10912,23 +10912,23 @@ 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:1912
-#: ../mail/em-format-html-display.c:2402 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
+#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1556
 msgid "Hide _Attachment Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4056
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11612,7 +11612,7 @@ msgstr "Control de preferencias do Evolution"
 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/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
 #: ../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
@@ -11946,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:63
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:62
 msgid "Read"
 msgstr "Ler"
 
@@ -12020,7 +12020,7 @@ 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:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:318
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -12079,11 +12079,11 @@ msgstr "Mensaxes importantes"
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son correos non desexados"
 
-#: ../mail/em-folder-browser.c:1153
+#: ../mail/em-folder-browser.c:1170
 msgid "Account Search"
 msgstr "Busca na conta"
 
-#: ../mail/em-folder-browser.c:1206
+#: ../mail/em-folder-browser.c:1223
 msgid "All Account Search"
 msgstr "Busca en todas as contas"
 
@@ -12194,12 +12194,12 @@ msgstr "Movendo o cartafol %s"
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1957
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensaxes ao cartafol %s"
@@ -12209,11 +12209,11 @@ 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:1003 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Copiar ao cartafol"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "_Mover ao cartafol"
 
@@ -12251,206 +12251,206 @@ msgstr "Lim_par a caixa de saída"
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando `%s' a `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando o cartafol `%s'"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Crear cartafol"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:744
 #: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Especifica onde crear o cartafol:"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Fallou a eliminación de correo"
 
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
 
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Reenviar"
 
 #. 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
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe nova..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafol..."
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafol..."
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Marcar como non _importante"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Marcar como _correo non desexado"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como _correo non desexado"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimento..."
 
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
 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:1362 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Ningún"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Nova etiqueta"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "M_arcar como terminado"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "E_liminar marca"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Crear reg_ra a partir de mensaxe"
 
 #. 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
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Cartafol de busca por a_sunto"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Cartafol de busca por re_mitente"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Cartafol de busca por des_tinatarios"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Cartafol de busca por _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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filtrar por as_unto"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filtrar por re_mitente"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filtrar por d_estinatarios"
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filtrar por lista de _correo"
 
 #. default charset used in mail view
 #. 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
+#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
 #: ../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:2531
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Non se puido obter a mensaxe"
 
-#: ../mail/em-folder-view.c:2550
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Obtendo a mensaxe..."
 
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "Ch_amar a..."
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Crear cartafol de _busca"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/em-folder-view.c:2814
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_A este enderezo"
 
-#: ../mail/em-folder-view.c:3311
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
 
-#: ../mail/em-folder-view.c:3323
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Clic para chamar %s"
 
-#: ../mail/em-folder-view.c:3328
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar ou mostrar os enderezos"
 
@@ -12596,79 +12596,79 @@ msgstr "_Ver o certificado"
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visible"
 
-#: ../mail/em-format-html-display.c:1370
+#: ../mail/em-format-html-display.c:1371
 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:1378
+#: ../mail/em-format-html-display.c:1379
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1381
+#: ../mail/em-format-html-display.c:1382
 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:1459
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr "_Ver en liña"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "_Axustar á largura"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1463
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _orixinal"
 
-#: ../mail/em-format-html-display.c:1982
+#: ../mail/em-format-html-display.c:1983
 msgid "Save attachment as"
 msgstr "Gardar anexo como"
 
-#: ../mail/em-format-html-display.c:1986
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr "Seleccione o cartafol onde gardar todos os anexos"
 
-#: ../mail/em-format-html-display.c:2037
+#: ../mail/em-format-html-display.c:2038
 msgid "_Save Selected..."
 msgstr "_Gardar os seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2104
+#: ../mail/em-format-html-display.c:2105
 #, 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:2111 ../mail/em-format-html-display.c:2200
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "G_ardar"
 
-#: ../mail/em-format-html-display.c:2122
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "G_ardar todo"
 
-#: ../mail/em-format-html-display.c:2196
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr "Sen anexo"
 
-#: ../mail/em-format-html-display.c:2337 ../mail/em-format-html-display.c:2375
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr "Ver sen _formato"
 
-#: ../mail/em-format-html-display.c:2339
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr "Ocultar sen _formato"
 
-#: ../mail/em-format-html-display.c:2394
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "A_brir con"
 
-#: ../mail/em-format-html-display.c:2465
+#: ../mail/em-format-html-display.c:2468
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12765,7 +12765,7 @@ 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:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:314
+#: ../mail/message-tag-followup.c:307
 msgid "From"
 msgstr "De"
 
@@ -12897,11 +12897,6 @@ msgstr "Tarefas pendentes"
 msgid "Later"
 msgstr "Máis tarde"
 
-#: ../mail/em-migrate.c:1247
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migrando '%s':"
-
 #: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
@@ -12974,17 +12969,17 @@ 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:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Responder á _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:858
 msgid "_Add to Address Book"
 msgstr "_Engadir á axenda de enderezos"
 
@@ -13977,7 +13972,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:515
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
@@ -14161,7 +14156,7 @@ msgstr "Nivel de rexistro"
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1811 ../mail/message-list.c:2430
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensaxes"
@@ -14744,7 +14739,7 @@ msgstr "_Nome de usuario:"
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
 #: ../plugins/google-account-setup/google-source.c:678
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
@@ -14930,7 +14925,7 @@ msgstr "_Buscar:"
 msgid "Find in Message"
 msgstr "Buscar na mensaxe"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 msgid "Flag to Follow Up"
 msgstr "Marcar para facer seguimento"
 
@@ -15029,11 +15024,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:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Terminado."
 
@@ -15172,27 +15167,27 @@ msgstr "Preparando a conta '%s' para o modo sen conexión"
 msgid "Checking Service"
 msgstr "Verificando servizo"
 
-#: ../mail/mail-send-recv.c:182
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir correo"
 
-#: ../mail/mail-send-recv.c:396
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:505
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "En espera..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando o correo novo"
@@ -15903,79 +15898,79 @@ msgstr "_Expurgar"
 msgid "_Open Messages"
 msgstr "_Abrir mensaxes"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Forwarded"
 msgstr "Reenviada"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensaxes non vistas"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "Múltiples mensaxes"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1596 ../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
+#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
-#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1632 ../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:1633 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
 #. 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
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4373
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: ../mail/message-list.c:4179
+#: ../mail/message-list.c:4223
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15983,7 +15978,7 @@ 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:4181
+#: ../mail/message-list.c:4225
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes para amosar neste cartafol."
 
@@ -16016,39 +16011,39 @@ msgstr "Mensaxes enviadas"
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "Chamar"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "Non reenviar"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr "Seguimento"
 
-#: ../mail/message-tag-followup.c:59
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "Para a súa información"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/message-tag-followup.c:61
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "Non é necesaria unha resposta"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/message-tag-followup.c:66
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "Revisar"
 
@@ -16073,6 +16068,10 @@ msgid "Subject contains"
 msgstr "O asunto contén"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "O asunto ou os destinatarios conteñen"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "O asunto ou o remitente conteñen"
 
@@ -16374,39 +16373,39 @@ msgstr "Configuracións de r_estauración..."
 msgid "_Backup Settings..."
 msgstr "_Configuracións de copia de seguranza..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
+#: ../plugins/bbdb/bbdb.c:567
 msgid "_Auto-create addressbook entries when replying to messages"
 msgstr ""
 "Crear entradas _automaticamente na axenda de enderezos ao responder a "
 "mensaxes"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione a axenda de enderezos para contactos automáticos"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Mensaxe instantánea de contactos"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
+#: ../plugins/bbdb/bbdb.c:603
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sincronizar información e as imaxes de contacto desde a lista de amigos do "
 "Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccione a axenda de enderezos para a lista de amigos do Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar coa lista de _amigos agora"
 
@@ -16473,16 +16472,16 @@ msgstr "Plugin de correo non desexado de Bogofilter"
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtrar o correo non desexado usando Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/caldav/caldav-source.c:249
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/caldav/caldav-source.c:271
 #: ../plugins/google-account-setup/google-source.c:671
 msgid "Use _SSL"
 msgstr "Usar _SSL"
@@ -18262,28 +18261,28 @@ msgstr "Un plugin para as características nas contas IMAP."
 msgid "IMAP Features"
 msgstr "Características IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "_Importar ao calendario"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "_Importar ás tarefas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:201
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "Importar ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:224
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "Seleccionar lista de tarefas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "Seleccionar calendario"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:700
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr "_Importar"
 
@@ -18340,130 +18339,130 @@ msgstr "Sincronizar con iPod"
 msgid "iPod Synchronization"
 msgstr "Sincronización con iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Fallo ao cargar o calendario '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Unha cita no calendario '%s' entra en conflito con esta reunión"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizouse a cita no calendario '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Non é posible localizar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Non é posible localizar esta reunión en ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Non é posible localizar esta tarefa en ningunha lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Non é posible localizar esta nota en ningunha lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versión existente desta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Non é posible analizar o elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Non é posible enviar o elemento ao calendario '%s': %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario '%s' como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario '%s' como provisional"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario '%s' como rexeitado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario '%s' como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador eliminou o delegado %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviada unha notificación de cancelación ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Non se puido enviar unha notificación de cancelación ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "O estado de participación non se puido actualizar debido a que o estado non "
 "é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non é posible actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Estado de participación actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Enviouse información da reunión"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Enviada información de tarefa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Enviada información de nota"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Non se pode enviar a información da reunión, a reunión non existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "Non é posible enviar a información da tarefa, a tarefa non existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 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
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexo non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18471,15 +18470,15 @@ msgstr ""
 "A mensaxe di que contén un calendario mais o calendario non é un iCalendar "
 "válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "O elemento no calendario non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
-#: ../plugins/itip-formatter/itip-formatter.c:1437
-#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18487,11 +18486,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:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexo contén múltiples elementos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18499,227 +18498,227 @@ msgstr ""
 "Para procesar todos estes elementos, debería gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Esta cita repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2152
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Esta tarefa repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Esta nota repítese"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2394
-#: ../plugins/itip-formatter/itip-formatter.c:2426
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Buscar conflito"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2409
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 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:190 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:189 ../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:195
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Hoxe ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:198
 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:208
+#: ../plugins/itip-formatter/itip-view.c:207
 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:218
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Mañá"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Mañá ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:226
 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:232
+#: ../plugins/itip-formatter/itip-view.c:231
 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:236
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañá ás %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
+#: ../plugins/itip-formatter/itip-view.c:254
 #, 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
+#: ../plugins/itip-formatter/itip-view.c:259
 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
+#: ../plugins/itip-formatter/itip-view.c:263
 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
+#: ../plugins/itip-formatter/itip-view.c:268
 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
+#: ../plugins/itip-formatter/itip-view.c:272
 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
+#: ../plugins/itip-formatter/itip-view.c:281
 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:288
+#: ../plugins/itip-formatter/itip-view.c:287
 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:292
+#: ../plugins/itip-formatter/itip-view.c:291
 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:297
+#: ../plugins/itip-formatter/itip-view.c:296
 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:301
+#: ../plugins/itip-formatter/itip-view.c:300
 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:307
+#: ../plugins/itip-formatter/itip-view.c:306
 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:312
+#: ../plugins/itip-formatter/itip-view.c:311
 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:316
+#: ../plugins/itip-formatter/itip-view.c:315
 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:321
+#: ../plugins/itip-formatter/itip-view.c:320
 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:325
+#: ../plugins/itip-formatter/itip-view.c:324
 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:350
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:525
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Responda e nome de <b>%s</b>"
 
-#: ../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:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Recibido en nome de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:356
 #, 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:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, 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:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, 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:367
+#: ../plugins/itip-formatter/itip-view.c:366
 #, 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:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, 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:375
+#: ../plugins/itip-formatter/itip-view.c:374
 #, 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:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, 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:381
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18728,90 +18727,90 @@ 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:383
+#: ../plugins/itip-formatter/itip-view.c:382
 #, 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:387
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> devolveu a través de %s a seguinte resposta á reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, 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:393
+#: ../plugins/itip-formatter/itip-view.c:392
 #, 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:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, 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:399
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr ""
 "<b>%s</b> a través de %s propuxo as seguintes modificacións para a reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, 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:405
+#: ../plugins/itip-formatter/itip-view.c:404
 #, 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:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, 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:445
+#: ../plugins/itip-formatter/itip-view.c:444
 #, 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:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, 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:452
+#: ../plugins/itip-formatter/itip-view.c:451
 #, 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:455
+#: ../plugins/itip-formatter/itip-view.c:454
 #, 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:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:463
+#: ../plugins/itip-formatter/itip-view.c:462
 #, 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:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, 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:469
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18820,7 +18819,7 @@ msgstr ""
 "<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:471
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18828,29 +18827,29 @@ msgid ""
 msgstr ""
 "<b>%s</b> quere recibir a última información para a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> devolveu a través de %s a seguinte resposta á tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:476
 #, 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:481
+#: ../plugins/itip-formatter/itip-view.c:480
 #, 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:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, 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:487
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18858,102 +18857,102 @@ 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:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, 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:493
+#: ../plugins/itip-formatter/itip-view.c:492
 #, 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:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, 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:533
+#: ../plugins/itip-formatter/itip-view.c:532
 #, 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:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, 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:540
+#: ../plugins/itip-formatter/itip-view.c:539
 #, 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:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, 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:546
+#: ../plugins/itip-formatter/itip-view.c:545
 #, 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:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, 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:819
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:824
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../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
+#: ../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 "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Enviar información"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Actualizar o estado do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Actualizar"
 
@@ -19110,20 +19109,20 @@ msgstr ""
 "Indica se se deben notificar só as mensaxes no cartafol da bandeixa de "
 "entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:255
+#: ../plugins/mail-notification/mail-notification.c:254
 msgid "Generate a _D-Bus message"
 msgstr "Xerar unha mensaxe _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:378
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Evolution's Mail Notification"
 msgstr "Notificación de correo de Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:399
+#: ../plugins/mail-notification/mail-notification.c:398
 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:458
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19138,55 +19137,55 @@ msgstr[1] ""
 "Recibiu %d mensaxes novas\n"
 "en %s."
 
-#: ../plugins/mail-notification/mail-notification.c:463
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Recibiu %d mensaxe nova."
 msgstr[1] "Recibiu %d mensaxes novas."
 
-#: ../plugins/mail-notification/mail-notification.c:480
-#: ../plugins/mail-notification/mail-notification.c:485
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "Novo correo"
 
-#: ../plugins/mail-notification/mail-notification.c:542
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr "Mostrar icona na área de _notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr "_Facer intermitencia a icona na área de notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:547
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr "_Mensaxe emerxente xunto coa icona"
 
-#: ../plugins/mail-notification/mail-notification.c:728
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "Reproducir un ficheiro de _son"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "Especificar o nome de _ficheiro:"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:748
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "_Reproducir"
 
-#: ../plugins/mail-notification/mail-notification.c:805
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar novas mensaxes só para a _bandexa de entrada"
 
@@ -19923,15 +19922,15 @@ msgstr "Guíalle pola súa configuración da conta inicial."
 msgid "Setup Assistant"
 msgstr "Asistente de configuración"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuración do Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Benvido"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -19944,29 +19943,29 @@ msgstr ""
 "\n"
 "Prema o botón \"Adiante\" para continuar. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Importar ficheiros"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:144
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:143
 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:397
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid "Importing data."
 msgstr "Importando datos."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "Espere"
 
@@ -20360,11 +20359,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:132
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Seleccione o tipo de importador que se executará:"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:134
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -20378,11 +20377,11 @@ msgstr ""
 "Pode seleccionar \"Automático\" se non o sabe e o Evolution tentará "
 "averigualo."
 
-#: ../shell/e-shell-importer.c:141
+#: ../shell/e-shell-importer.c:140
 msgid "Choose the destination for this import"
 msgstr "Escolla o destino desta importación"
 
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:146
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20394,23 +20393,23 @@ 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:285
+#: ../shell/e-shell-importer.c:284
 msgid "F_ilename:"
 msgstr "Nome do _ficheiro:"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:289
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:298
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:334
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos e configuración de programas _antigos"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:337
 msgid "Import a _single file"
 msgstr "Importar un úni_co ficheiro"
 
@@ -20420,7 +20419,7 @@ msgstr "Preferencias do Evolution"
 
 #. 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
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -21909,7 +21908,7 @@ msgstr "Lista de mensaxes por fíos"
 msgid "_Group By Threads"
 msgstr "A_grupar por fíos"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Mensaxe"
@@ -22247,123 +22246,119 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostrar un cursor intermitente no corpo das mensaxes mostradas"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Mostrar as mensaxes no estilo normal"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrónico"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Mostrar o código fonte da mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Anexar"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "Activar _cursor"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "E_liminar marca"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "E_liminar mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxe..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "_Marcar como terminado"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_En liña"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "_Correo non desexado"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "_Cargar imaxes"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "Orixe da _mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_Seguinte mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_Non é correo non desexado"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Abrir nunha ventá nova"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Citada"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Lectura"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Gardar mensaxe..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_Non lida"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
@@ -23140,11 +23135,11 @@ msgstr "Widget etiqueta"
 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:221 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Tamaño do expansor"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Tamaño da frecha do expansor"
 
@@ -23252,52 +23247,52 @@ msgstr "Modelo de refluxo"
 msgid "Column width"
 msgstr "Largura de columna"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Buscar"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Prema aquí para cambiar o tipo de busca"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../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:1007
+#: ../widgets/misc/e-search-bar.c:1006
 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:1024
+#: ../widgets/misc/e-search-bar.c:1023
 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:1036
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " e_n "
 
@@ -23453,19 +23448,19 @@ 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:278
+#: ../widgets/misc/e-task-widget.c:255
 #, 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
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminada)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Prema aquí para ir ao URL"
 
@@ -23689,7 +23684,7 @@ msgstr "Alternar as cores das filas"
 #: ../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
+#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Debuxar a grade horizontal"
 
@@ -23698,7 +23693,7 @@ msgstr "Debuxar a grade horizontal"
 #: ../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
+#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Debuxar a grade vertical"
 
@@ -23707,7 +23702,7 @@ msgstr "Debuxar a grade vertical"
 #: ../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
+#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Debuxar o foco"
 
@@ -23732,8 +23727,8 @@ msgstr "Modelo de selección"
 #: ../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
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "Límite de lonxitude"
 
@@ -23742,8 +23737,8 @@ msgstr "Límite de lonxitude"
 #: ../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
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "Altura uniforme da fila"
 
@@ -23838,8 +23833,8 @@ msgstr "Modelo da táboa"
 msgid "Cursor row"
 msgstr "Fila do cursor"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Buscar sempre"
 
@@ -23847,15 +23842,15 @@ msgstr "Buscar sempre"
 msgid "Use click to add"
 msgstr "Premer para engadir"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "Adaptador de táboa Etree"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Aparencia retro"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Debuxar liñas e expansores +/-."
 
@@ -23963,6 +23958,21 @@ msgstr "Contexto MI"
 msgid "Handle Popup"
 msgstr "Tirador emerxente"
 
+#~ msgid "Migrating `%s':"
+#~ msgstr "Migrando `%s':"
+
+#~ msgid "D_escription:"
+#~ msgstr "D_escrición:"
+
+#~ msgid "De_scription:"
+#~ msgstr "De_scrición:"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propiedades..."
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "Mostrar as mensaxes no estilo normal"
+
 #~ msgid "Mark all messages in this folder and subfolders as read?"
 #~ msgstr "Marcar todas as mensaxes no cartafol e subcartafoles como lidas?"
 
diff --git a/po/kn.po b/po/kn.po
index 0efb10669e..1187dd5d9a 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,14 +1,15 @@
-# translation of evolution.HEAD.po to Kannada
+# translation of evolution.HEAD.kn.po to Kannada
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
+#: ../shell/main.c:683
 # Shankar Prasad <svenkate@redhat.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD\n"
+"Project-Id-Version: evolution.HEAD.kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-11 05:03+0000\n"
-"PO-Revision-Date: 2008-01-27 18:21+0530\n"
+"POT-Creation-Date: 2008-08-12 10:37+0000\n"
+"PO-Revision-Date: 2008-08-13 12:19+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: Kannada <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,21 +20,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"
@@ -41,7 +42,6 @@ msgstr[0] "ಪ್ರಸ್ತುತ ಇರುವ %s ವಿಳಾಸ ಪುಸ್
 msgstr[1] "ಪ್ರಸ್ತುತ ಇರುವ %s ವಿಳಾಸ ಪುಸ್ತಕ ಕೋಶವು %d ಚೀಟಿಗಳನ್ನು ಹೊಂದಿದೆ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "ತೆರೆ"
 
@@ -151,7 +151,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:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -162,20 +162,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:1358
-#: ../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:760
+#: ../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:762
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -183,10 +181,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:781
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -196,17 +194,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:1362
-#: ../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:786
+#: ../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 "ಗ್ನೋಮ್ ಕ್ಯಾಲೆಂಡರ್"
 
@@ -318,27 +314,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 "ಸಕ್ರಿಯಗೊಳಿಸು"
 
-#: ../addressbook/addressbook.error.xml.h:1
+#. 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?"
@@ -346,23 +349,23 @@ msgstr ""
 "ಈ ವಿಳಾಸವನ್ನು ಹೊಂದಿರುವ ಸಂಪರ್ಕವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ನೀವು ಅದೇ ಹೆಸರಿನ ಒಂದು ಹೊಸ "
 "ಕಾರ್ಡನ್ನು ಸೇರಿಸಲು ಬಯಸುತ್ತೀರೇನು?"
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
 msgstr "ವಿಳಾಸ '{0}' ವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ."
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
 msgid "Cannot add new contact"
 msgstr "ಹೊಸ ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಜರುಗಿಸಲಾಗಿಲ್ಲ."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "ವರ್ಗ ಸಂಪಾದಕವು ಲಭ್ಯವಿಲ್ಲ."
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../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; "
@@ -372,80 +375,66 @@ msgstr ""
 "ಬೆಂಬಲಿತವಾಗಿದೆ ಎಂದು ಪರೀಕ್ಷಿಸಿ ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಹೆಚ್ಚಿನ ಗುಪ್ತಪದಗಳು ಕೇಸ್ ಸಂವೇದಿ "
 "ಆಗಿರುತ್ತವೆ; ನಿಮ್ಮ ಕ್ಯಾಪ್ಸ್‍ ಲಾಕ್ ಆನ್ ಆಗಿರಬಹುದು."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr "LDAP ಪರಿಚಾರಕಕ್ಕಾಗಿ ಸ್ಕೀಮಾ(schema) ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Could not remove addressbook."
 msgstr "ವಿಳಾಸಪುಸ್ತಕವನ್ನು ತೆಗೆದು ಹಾಕಲಾಗಿಲ್ಲ."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../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."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "ವಿಳಾಸ ಪುಸ್ತಕ '{0}' ಅನ್ನು ಅಳಿಸಬೇಕೆ?"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 msgid "Error loading addressbook."
 msgstr "ವಿಳಾಸಪುಸ್ತಕವನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ದೋಷ ಸಂಭವಿಸಿದೆ."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0} ಅನ್ನು {1} ಗೆ ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಸಂಭವಿಸಿದೆ: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP ಪರಿಚಾರಕದೊಂದಿಗೆ ದೃಢೀಕರಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:14
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1705
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಅಳಿಸಿ ಹಾಕುವಲ್ಲಿ ವಿಫಲತೆ ಉಂಟಾಗಿದೆ"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "ಸಮೂಹಕ್ರಮದಲ್ಲಿ ವಿಳಾಸ ಪುಸ್ತಕದ ರಚನೆ:"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP ಪರಿಚಾರಕವು ಮಾನ್ಯ ಸ್ಕೀಮಾ ಮಾಹಿತಿಯೊಂದಿಗೆ ಪ್ರತ್ಯುತ್ತರಿಸಿಲ್ಲ."
 
-#: ../addressbook/addressbook.error.xml.h:17
-msgid "Permission Denied."
-msgstr "ಅನುಮತಿಯನ್ನು ನಿರಾಕರಿಸಲ್ಪಟ್ಟಿದೆ."
-
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Server Version"
 msgstr "ಪರಿಚಾರಕ ಆವೃತ್ತಿ"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "ನಿಮ್ಮ ಪ್ರಸಕ್ತ ಪರಿಚಾರಕದಲ್ಲಿ ಕೆಲವೊಂದು ವೈಶಿಷ್ಟ್ಯಗಳು ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "ಇವಲ್ಯೂಶನ್ ವಿಳಾಸ ಪುಸ್ತಕವು ಅನಿರೀಕ್ಷಿತವಾಗಿ ನಿರ್ಗಮಿಸಿದೆ."
 
-#: ../addressbook/addressbook.error.xml.h:21
-msgid ""
-"The address book {0} is read only, thus you cannot add contacts there. "
-"Select other address book, please."
-msgstr ""
-"{0} ವಿಳಾಸಪುಸ್ತಕವು ಕೇವಲ ಓದಲು ಮಾತ್ರವಾಗಿದೆ, ಆದ್ದರಿಂದ ಇದಕ್ಕೆ ಸಂಪರ್ಕವಿಳಾಸಗಳನ್ನು ಸೇರಿಸಲು "
-"ಸಾಧ್ಯವಿಲ್ಲ. ದಯವಿಟ್ಟು ಬೇರೆ ವಿಳಾಸಪುಸ್ತಕವನ್ನು ಆರಿಸಿ."
-
 #: ../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 ""
@@ -516,6 +505,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 "
 "changes?"
@@ -523,56 +516,55 @@ msgstr ""
 "ಈ ಸಂಪರ್ಕ ವಿಳಾಸದಲ್ಲಿ ಕೆಲವು ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡಿದ್ದೀರಿ. ನೀವು ಈ ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸಲು "
 "ಬಯಸುತ್ತೀರೆ?"
 
-#: ../addressbook/addressbook.error.xml.h:36
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:37
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ಇವಲ್ಯೂಶನ್ ಪುನರ್ ಆರಂಭಗೊಳಿಸದೆ {0} ಗಾಗಿನ ನಿಮ್ಮ ಸಂಪರ್ಕವಿಳಾಸಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ."
 
-#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:512
+#: ../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 "ಸೇರಿಸು(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "ತಿರಸ್ಕರಿಸು(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "ಉಳಿಸಬೇಡ(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "ಗಾತ್ರ ಬದಲಾಯಿಸು(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 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:43
-#: ../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}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:46
 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 ""
 
@@ -594,10 +586,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:402
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:580
 msgid "Contacts"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸಗಳು"
 
@@ -606,7 +598,8 @@ msgid "Evolution Address Book"
 msgstr "ಇವಲ್ಯೂಶನ್ ವಿಳಾಸಪುಸ್ತಕ"
 
 #: ../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 "ಇವಲ್ಯೂಶನ್ ವಿಳಾಸಪುಸ್ತಕ ವಿಳಾಸ ಪುಟಿಕೆ(ಪಾಪ್ಅಪ್)"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -622,7 +615,8 @@ msgid "Evolution Address Book component"
 msgstr "ಇವಲ್ಯೂಶನ್ ವಿಳಾಸ ಪುಸ್ತಕ ಘಟಕ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#, fuzzy
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "ಇವಲ್ಯೂಶನ್ S/Mime ಪ್ರಮಾಣಪತ್ರ ನಿರ್ವಹಣಾ ನಿಯಂತ್ರಣ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -636,13 +630,14 @@ msgstr "ನಿಮ್ಮ S/MIME ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು
 #. 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:497
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:305
-#: ../mail/mail-vfolder.c:216
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:236
+#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
+#: ../calendar/gui/tasks-component.c:195 ../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:1457
 msgid "On This Computer"
 msgstr "ಈ ಗಣಕದಲ್ಲಿ"
 
@@ -652,23 +647,26 @@ msgstr "ಈ ಗಣಕದಲ್ಲಿ"
 #. Create the default Person addressbook
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:505
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:491
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../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:247 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:208 ../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:204
+#: ../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-migrate.c:515
+#: ../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
+#, fuzzy
+msgctxt "New"
 msgid "_Contact"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸ(_C)"
 
@@ -677,6 +675,8 @@ msgid "Create a new contact"
 msgstr "ಹೊಸ ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ನಿರ್ಮಿಸಿ"
 
 #: ../addressbook/gui/component/addressbook-component.c:237
+#, fuzzy
+msgctxt "New"
 msgid "Contact _List"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸ ಪಟ್ಟಿ(_L)"
 
@@ -690,6 +690,8 @@ msgid "New Address Book"
 msgstr "ಹೊಸ ಸಂಪರ್ಕವಿಳಾಸ ಪುಸ್ತಕ"
 
 #: ../addressbook/gui/component/addressbook-component.c:245
+#, fuzzy
+msgctxt "New"
 msgid "Address _Book"
 msgstr "ಹೊಸ ಸಂಪರ್ಕವಿಳಾಸ(_B)"
 
@@ -701,34 +703,34 @@ msgstr "ಒಂದು ಹೊಸ ಸಂಪರ್ಕವಿಳಾಸವನ್ನು
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "ವಿಳಾಸ ಪುಸ್ತಕದ ಸಂಯೋಜನೆಗಳನ್ನು ಅಥವ ಫೋಲ್ಡರುಗಳನ್ನು ನವೀಕರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ. "
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "ಮೂಲ"
 
-#: ../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 "ಬಗೆ(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 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
 #: ../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:87
-#: ../plugins/itip-formatter/itip-formatter.c:2318
+#: ../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:2367
 #: ../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/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "ವಿಳಾಸ ಪುಸ್ತಕ"
 
@@ -742,12 +744,12 @@ 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
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "ವಿವರಗಳು"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:932
+#: ../mail/em-folder-browser.c:982
 msgid "Searching"
 msgstr "ಹುಡುಕಲಾಗುತ್ತಿದೆ"
 
@@ -756,30 +758,30 @@ msgid "Downloading"
 msgstr "ಡೌನ್‍ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../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
-#, c-format
-msgid "Migrating `%s':"
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
+#, fuzzy, c-format
+msgid "Migrating '%s':"
 msgstr "`%s' ಅನ್ನು ರವಾನಿಸಲಾಗುತ್ತಿದೆ:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:643
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP ಪರಿಚಾರಕಗಳು"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:758
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "ಸ್ವಯಂಪೂರ್ಣಗೊಳಿಕೆಯ ಸಂಯೋಜನೆಗಳು"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -791,7 +793,7 @@ msgstr ""
 "\n"
 "ಇವಲ್ಯೂಶನ್ ನಿಮ್ಮ ಫೋಲ್ಡರ್‍ಗಳನ್ನು ರವಾನಿಸುವವರೆಗೆ ದಯವಿಟ್ಟು ತಾಳ್ಮೆಯಿಂದ ಕಾಯಿರಿ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -801,7 +803,7 @@ msgstr ""
 "\n"
 "ಇವಲ್ಯೂಶನ್ ನಿಮ್ಮ ಫೋಲ್ಡರ್‍ಗಳನ್ನು ರವಾನಿಸುವವರೆಗೆ ದಯವಿಟ್ಟು ತಾಳ್ಮೆಯಿಂದ ಕಾಯಿರಿ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -811,7 +813,7 @@ msgstr ""
 "\n"
 "ಇವಲ್ಯೂಶನ್ ನಿಮ್ಮ ಫೋಲ್ಡರ್‍ಗಳನ್ನು ರವಾನಿಸುವವರೆಗೆ ದಯವಿಟ್ಟು ತಾಳ್ಮೆಯಿಂದ ಕಾಯಿರಿ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -821,66 +823,79 @@ msgstr ""
 "\n"
 "ಇವಲ್ಯೂಶನ್ ನಿಮ್ಮ Pilot Sync ದತ್ತಾಂಶವನ್ನು ರವಾನಿಸುವವರೆಗೆ ತಾಳ್ಮೆಯಿಂದ ಕಾಯಿರಿ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:502
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" ಫೋಲ್ಡರನ್ನು ಈ ಹೆಸರಿಗೆ ಬದಲಾಯಿಸಿ:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:504
 msgid "Rename Folder"
 msgstr "ಫೋಲ್ಡರಿನ ಹೆಸರನ್ನು ಬದಲಾಯಿಸು"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:510
 msgid "Folder names cannot contain '/'"
 msgstr "ಫೋಲ್ಡರ್ ಹೆಸರುಗಳು '/' ಅನ್ನು ಹೊಂದಿರುವಂತಿಲ್ಲ"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "ಹೊಸ ವಿಳಾಸಪುಸ್ತಕ(_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "ವಿಕಾರ್ಡ್ ಆಗಿ ಉಳಿಸು..."
 
-#: ../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:1347
-#: ../calendar/gui/e-calendar-view.c:1696 ../calendar/gui/e-memo-table.c:937
+#: ../addressbook/gui/component/addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/calendar-component.c:619
+#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-view.c:1696 ../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:1342
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
 #: ../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
-msgid "_Properties..."
-msgstr "ಗುಣಲಕ್ಷಣಗಳು(_P)..."
+#: ../addressbook/gui/component/addressbook-view.c:949
+#: ../calendar/gui/calendar-component.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "ಗುಣಲಕ್ಷಣಳುK_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "ಮೂಲ ಆಯ್ಕೆಗಾರನನ್ನು ಸಂಪರ್ಕಿಸು"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ಪರಿಚಾರಕವನ್ನು ಅನಾಮಧೇಯವಾಗಿ ನಿಲುಕಿಸಿಕೊಳ್ಳುವುದು"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../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
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../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:222
+#: ../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"
+msgstr "ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸು"
+
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "ಸ್ವಯಂಪೂರ್ಣಗೊಳಿಕೆಯ ಉದ್ದ"
@@ -907,8 +922,7 @@ msgstr "ಮುನ್ನೋಟ ಫಲಕವನ್ನು ತೋರಿಸು"
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr ""
-"ಇವಲ್ಯೂಶನ್, ತಾನಾಗಿಯೆ ಪೂರ್ಣಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸುವ ಮೊದಲು ನೀವು ಟೈಪಿಸಲೇಬೇಕಾದ ಅಕ್ಷರಗಳ ಸಂಖ್ಯೆ."
+msgstr "ಇವಲ್ಯೂಶನ್, ತಾನಾಗಿಯೆ ಪೂರ್ಣಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸುವ ಮೊದಲು ನೀವು ಟೈಪಿಸಲೇಬೇಕಾದ ಅಕ್ಷರಗಳ ಸಂಖ್ಯೆ."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -952,38 +966,35 @@ 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 "ಅನಾಮಧೇಯವಾಗಿ"
 
+#. 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 ""
+
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "ಮೂಲಭೂತ"
@@ -997,8 +1008,7 @@ msgid "Email address"
 msgstr "ಇಮೇಲ್ ವಿಳಾಸ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-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:21
@@ -1010,14 +1020,14 @@ msgid "Lo_gin:"
 msgstr "ಪ್ರವೇಶ(_g):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../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
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "ಯಾವುದೆ ಗೂಢಲಿಪೀಕರಣವಿಲ್ಲ"
 
@@ -1029,7 +1039,7 @@ msgstr "ಒಂದು"
 #. 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
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL ಗೂಢಲಿಪೀಕರಣ"
 
@@ -1094,7 +1104,7 @@ msgstr "ಬೆಂಬಲಿತವಾಗಿರು ಹುಡುಕು ಮೂಲಗ�
 #. 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
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS ಗೂಢಲಿಪೀಕರಣ"
 
@@ -1117,8 +1127,7 @@ msgstr ""
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr ""
-"ಇದು ನಿಮ್ಮ ldap ಪರಿಚಾರಕದ ಸಂಪೂರ್ಣ ಹೆಸರು. ಉದಾಹರಣೆಗೆ, \"ldap.mycompany.com\"."
+msgstr "ಇದು ನಿಮ್ಮ ldap ಪರಿಚಾರಕದ ಸಂಪೂರ್ಣ ಹೆಸರು. ಉದಾಹರಣೆಗೆ, \"ldap.mycompany.com\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
@@ -1184,8 +1193,8 @@ 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:163
+#: ../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:"
@@ -1200,7 +1209,7 @@ msgid "_Search scope:"
 msgstr "ಹುಡುಕು ವ್ಯಾಪ್ತಿ(_S):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "ಪರಿಚಾರಕ(_S):"
@@ -1221,9 +1230,9 @@ msgstr "ಕಾರ್ಡುಗಳು"
 #: ../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 "ನಿಮಿಷಗಳು"
 
@@ -1264,97 +1273,100 @@ 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/widgets/eab-contact-display.c:551
+#: ../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
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../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:194
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "ಸಂಪರ್ಕ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../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/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:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "ಪೂರ್ಣ ಹೆಸರು (_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "ಚಿತ್ರ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "MSN Messenger"
 msgstr "MSN ಮೆಸೆಂಜರ್"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "ಅಂಚೆ ವಿಳಾಸ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#, fuzzy
+msgid "Nic_kname:"
 msgstr "ಉಪನಾಮ(_c):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "Novell Groupwise"
 msgstr "ನೋವೆಲ್ ಗುಂಪುಕ್ರಮದಲ್ಲಿ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "ದೂರವಾಣಿ"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../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:580
-#: ../mail/em-migrate.c:1055
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "ಕೆಲಸ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "ವಿಳಾಸ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "ವಾರ್ಷಿಕೋತ್ಸವ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "ಸಹಾಯಕ(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "ಹುಟ್ಟಿದ ದಿನ(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "ಕ್ಯಾಲೆಂಡರ್(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "ವರ್ಗಗಳು(_C)..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "ಊರು(_C):"
@@ -1439,1119 +1451,1122 @@ msgstr "ಎಲ್ಲಿ(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/ಅಂಚೆ ಕೋಡ್:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../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:98
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../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:397
+#: ../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:1832 ../widgets/text/e-text.c:3679
-#: ../widgets/text/e-text.c:3680
+#: ../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:131
 msgid "United States"
 msgstr "ಯುನೈಟೆಡ್ ಸ್ಟೇಟ್ಸ್‍"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "Afghanistan"
 msgstr "ಅಫ್ಘಾನಿಸ್ಥಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Albania"
 msgstr "ಅಲ್ಬೇನಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Algeria"
 msgstr "ಅಲ್ಜೀರಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "American Samoa"
 msgstr "ಅಮೇರಿಕನ್ ಸಮೋವಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Andorra"
 msgstr "ಆಂಡೋರಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Angola"
 msgstr "ಅಂಗೋಲಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Anguilla"
 msgstr "ಆಂಗ್ವಿಲ್ಲಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Antarctica"
 msgstr "ಅಂಟಾರ್ಟಿಕಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antigua And Barbuda"
 msgstr "ಆಂಟಿಗುವಾ ಹಾಗು ಬಾರ್ಬುಡಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Argentina"
 msgstr "ಅರ್ಜೆಂಟಿನಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Armenia"
 msgstr "ಅರ್ಮೇನಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Aruba"
 msgstr "ಅರುಬಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Australia"
 msgstr "ಆಸ್ಟ್ರೇಲಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Austria"
 msgstr "ಆಸ್ಟ್ರಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Azerbaijan"
 msgstr "ಅಝರ್ಬೈಜಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Bahamas"
 msgstr "ಬಹಮಾಸ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahrain"
 msgstr "ಬಹರೈನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bangladesh"
 msgstr "ಬಾಂಗ್ಲಾದೇಶ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Barbados"
 msgstr "ಬಾರ್ಬಡೋಸ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Belarus"
 msgstr "ಬೆಲಾರಸ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belgium"
 msgstr "ಬೆಲ್ಜಿಯಮ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belize"
 msgstr "ಬೆಲೀಸ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Benin"
 msgstr "ಬೆನಿನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bermuda"
 msgstr "ಬರ್ಮುಡಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bhutan"
 msgstr "ಭೂತಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bolivia"
 msgstr "ಬೊಲಿವಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bosnia And Herzegowina"
 msgstr "ಬೋಸ್ನಿಯಾ ಹಾಗು ಹರ್ಸೆಗೋವಿನಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Botswana"
 msgstr "ಬೋಟ್ಸ್‍ವಾನಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bouvet Island"
 msgstr "ಬೋವೆಟ್ ಐಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Brazil"
 msgstr "ಬ್ರಝಿಲ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 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:163
 msgid "Brunei Darussalam"
 msgstr "ಬ್ರೂನೈ ದರುಸೆಲಂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bulgaria"
 msgstr "ಬಲ್ಜೇರಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Burkina Faso"
 msgstr "ಬರ್ಕಿನಾ ಫಾಸೋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burundi"
 msgstr "ಬುರುಂಡಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cambodia"
 msgstr "ಕಾಂಬೋಡಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cameroon"
 msgstr "ಕೆಮರೂನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Canada"
 msgstr "ಕೆನಡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Cape Verde"
 msgstr "ಕೇಪ್ ವರ್ಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cayman Islands"
 msgstr "ಕೇಮ್ಯಾನ್ ಐಲ್ಯಾಂಡ್‍ಗಳು"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Central African Republic"
 msgstr "ಸೆಂಟ್ರಲ್ ಆಫ್ರಿಕನ್ ರಿಪಬ್ಲಿಕ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Chad"
 msgstr "ಚ್ಯಾಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chile"
 msgstr "ಚಿಲಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "China"
 msgstr "ಚೈನಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Christmas Island"
 msgstr "ಕ್ರಿಸ್‍ಮಸ್ ಐಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cocos (Keeling) Islands"
 msgstr "ಕೊಕೋಸ್ (ಕೀಲಿಂಗ್) ಐಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Colombia"
 msgstr "ಕೊಲೊಂಬಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Comoros"
 msgstr "ಕೊಮೊರೋಸ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Congo"
 msgstr "ಕಾಂಗೋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 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:182
 msgid "Cook Islands"
 msgstr "ಕುಕ್ ಐಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Costa Rica"
 msgstr "ಕೋಸ್ಟಾ ರಿಕಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Cote d'Ivoire"
 msgstr "ಕೋಟ್ ಡೆವಾಯರ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Croatia"
 msgstr "ಕ್ರೊಯೇಶಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cuba"
 msgstr "ಕ್ಯೂಬಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cyprus"
 msgstr "ಸೈಪ್ರಸ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Czech Republic"
 msgstr "ಚೆಕ್ ರಿಪಬ್ಲಿಕ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Denmark"
 msgstr "ಡೆನ್ಮಾರ್ಕ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Djibouti"
 msgstr "ಜಿಬೊಟಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Dominica"
 msgstr "ಡೊಮಿನಿಕಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominican Republic"
 msgstr "ಡೊಮಿನಿಕನ್ ರಿಪಬ್ಲಿಕ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Ecuador"
 msgstr "ಈಕ್ವೆಡಾರ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Egypt"
 msgstr "ಈಜಿಪ್ಟ್‍"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "El Salvador"
 msgstr "ಎಲ್ ಸಾಲ್ವೆಡಾರ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Equatorial Guinea"
 msgstr "ಈಕ್ವೆಟೋರಿಯಲ್ ಗಿಯಾನ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Eritrea"
 msgstr "ಎರಿಟ್ರಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Estonia"
 msgstr "ಎಸ್ಟೋನಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ethiopia"
 msgstr "ಇಥಿಯೋಪಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Falkland Islands"
 msgstr "ಫಾಕ್‍ಲ್ಯಾಂಡ್ ಐಲ್ಯಾಂಡ್‍ಗಳು"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Faroe Islands"
 msgstr "ಫಾರೊಯಿ ಐಲ್ಯಾಂಡ್‍ಗಳು"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Fiji"
 msgstr "ಫಿಜಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Finland"
 msgstr "ಫಿನ್‍ಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "France"
 msgstr "ಫ್ರಾನ್ಸ್‍"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Guiana"
 msgstr "ಫ್ರೆಂಚ್ ಗಿಯಾನ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Polynesia"
 msgstr "ಫ್ರೆಂಚ್ ಪಾಲಿನೆಶಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Southern Territories"
 msgstr "ಫ್ರೆಂಚ್ ಸೌತರ್ನ್ ಟೆರಿಟರಿಗಳು"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Gabon"
 msgstr "ಗೆಬಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gambia"
 msgstr "ಗ್ಯಾಂಬಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Georgia"
 msgstr "ಜಾರ್ಜಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Germany"
 msgstr "ಜರ್ಮನಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Ghana"
 msgstr "ಘಾನಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gibraltar"
 msgstr "ಜಿಬ್ರಾಲ್ಟರ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Greece"
 msgstr "ಗ್ರೀಸ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greenland"
 msgstr "ಗ್ರೀನ್‍ಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Grenada"
 msgstr "ಗ್ರೆನೆಡಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Guadeloupe"
 msgstr "ಗ್ವಾಡ್‍ಲೂಪ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guam"
 msgstr "ಗ್ವಾಮ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guatemala"
 msgstr "ಗ್ವಾಟೆಮಾಲಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guernsey"
 msgstr "ಗರ್ನಝಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 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:222
+#, fuzzy
+msgid "Guinea-Bissau"
 msgstr "ಗಿನಿ-ಬಿಸಾವ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guyana"
 msgstr "ಗಯಾನಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Haiti"
 msgstr "ಹೈತಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 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:226
 msgid "Holy See"
 msgstr "ಹೋಲಿ ಸೀ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Honduras"
 msgstr "ಹೊಂಡುರಾಸ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Hong Kong"
 msgstr "ಹಾಂಗ್ ಕಾಂಗ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hungary"
 msgstr "ಹಂಗೆರಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Iceland"
 msgstr "ಐಸ್‍ಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "India"
 msgstr "ಭಾರತ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Indonesia"
 msgstr "ಇಂಡೋನೇಶಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Iran"
 msgstr "ಇರಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iraq"
 msgstr "ಇರಾಕ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Ireland"
 msgstr "ಐರ್ಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Isle of Man"
 msgstr "ಐಲ್ ಆಫ್ ಮ್ಯಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Israel"
 msgstr "ಇಸ್ರೇಲ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Italy"
 msgstr "ಇಟಲಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Jamaica"
 msgstr "ಜಮೈಕಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Japan"
 msgstr "ಜಪಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jersey"
 msgstr "ಜರ್ಸಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jordan"
 msgstr "ಜೋರ್ಡಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "ಕಝಕಿಸ್ತಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "ಕೀನ್ಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "ಕೆರೆಬಾಟಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 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:247
 msgid "Korea, Republic Of"
 msgstr "ರಿಪಬ್ಲಿಕ್ ಆಫ್ ಕೊರಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "ಕುವೈತ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "ಕಿರ್ಗಿಸ್ತಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "ಲಾವೋಸ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "ಲಾಟ್ವಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "ಲೆಬೆನಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "ಲೆಸೋತೋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "ಲಿಬಿರಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Libya"
 msgstr "ಲಿಬಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Liechtenstein"
 msgstr "ಲಿಕ್ಟನ್‍ಸ್ಟೈನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lithuania"
 msgstr "ಲಿತುವಾನಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Luxembourg"
 msgstr "ಲಕ್ಸೆಂಬರ್ಗ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macao"
 msgstr "ಮಕಾವ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macedonia"
 msgstr "ಮೆಸೆಡೋನಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Madagascar"
 msgstr "ಮಡಗಾಸ್ಕರ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malawi"
 msgstr "ಮಲಾವಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malaysia"
 msgstr "ಮಲೇಶಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Maldives"
 msgstr "ಮಾಲ್ಡೀವ್ಸ್‍"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Mali"
 msgstr "ಮಾಲಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Malta"
 msgstr "ಮಾಲ್ಟಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Marshall Islands"
 msgstr "ಮಾರ್ಶಲ್ ಐಲ್ಯಾಂಡ್‍ಗಳು"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Martinique"
 msgstr "ಮಾರ್ಟಿನೀಕ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritania"
 msgstr "ಮಾರ್ಟೀನಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritius"
 msgstr "ಮಾರಿಶಿಸಿಯಸ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mayotte"
 msgstr "ಮೆಯೋಟ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mexico"
 msgstr "ಮೆಕ್ಸಿಕೋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Micronesia"
 msgstr "ಮೈಕ್ರೊನೀಶಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Moldova, Republic Of"
 msgstr "ರಿಪಬ್ಲಿಕ್ ಆಫ್ ಮೊಲ್ಡೊವಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Monaco"
 msgstr "ಮೊನಾಕೋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mongolia"
 msgstr "ಮಂಗೋಲಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Montserrat"
 msgstr "ಮೊಂಟ್ಸೆರಾಟ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Morocco"
 msgstr "ಮೊರೊಕ್ಕೋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Mozambique"
 msgstr "ಮೊಝಾಂಬಿಕ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Myanmar"
 msgstr "ಮಯನ್ಮಾರ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Namibia"
 msgstr "ನಮಿಬಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nauru"
 msgstr "ನವೂರೂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nepal"
 msgstr "ನೇಪಾಲ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands"
 msgstr "ನೆದರ್ಲ್ಯಾಂಡ್ಸ್‍"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands Antilles"
 msgstr "ನೆದರ್ಲ್ಯಾಂಡ್ಸ್‍ ಆಂಟಿಲ್ಲಿಸ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Caledonia"
 msgstr "ನ್ಯೂ ಕೆಲೆಡೋನಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Zealand"
 msgstr "ನ್ಯೂ ಝೀಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nicaragua"
 msgstr "ನಿಕರಾಗುವ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niger"
 msgstr "ನೈಜರ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Nigeria"
 msgstr "ನೈಜಿರೀಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Niue"
 msgstr "ನಿವುಯೆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Norfolk Island"
 msgstr "ನಾರ್ಫೋಕ್ ಐಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Northern Mariana Islands"
 msgstr "ನಾರ್ತರ್ನ್ ಮರಿಯಾನಾ ಐಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Norway"
 msgstr "ನಾರ್ವೆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Oman"
 msgstr "ಓಮನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Pakistan"
 msgstr "ಪಾಕಿಸ್ತಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palau"
 msgstr "ಪಲಾವ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palestinian Territory"
 msgstr "ಪ್ಯಾಲಿಸ್ಟೀನಿಯನ್ ಟೆರಿಟರಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Panama"
 msgstr "ಪನಾಮ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Papua New Guinea"
 msgstr "ಪಪುವಾ ನ್ಯೂ ಗಿನಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Paraguay"
 msgstr "ಪರುಗ್ವೇ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Peru"
 msgstr "ಪೆರು"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Philippines"
 msgstr "ಫಿಲಿಪ್ಪೀನ್ಸ್‍"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Pitcairn"
 msgstr "ಪಿಟ್‍ಕೈರ್ನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Poland"
 msgstr "ಪೊಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Portugal"
 msgstr "ಪೋರ್ಚುಗಲ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Puerto Rico"
 msgstr "ಪೋರ್ಟಾ ರಿಕಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Qatar"
 msgstr "ಕತಾರ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Reunion"
 msgstr "ರಿಯೂನಿಯನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Romania"
 msgstr "ರೊಮೇನಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Russian Federation"
 msgstr "ರಶಿಯನ್ ಫೆಡರೇಶನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Rwanda"
 msgstr "ರುವಾಂಡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 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:314
 msgid "Saint Lucia"
 msgstr "ಸೈಂಟ್ ಲ್ಯೂಸಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 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:316
 msgid "Samoa"
 msgstr "ಸಮೊವಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "San Marino"
 msgstr "ಸ್ಯಾನ್ ಮರಿನೋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 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:319
 msgid "Saudi Arabia"
 msgstr "ಸೌದಿ ಅರೇಬಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Senegal"
 msgstr "ಸೆನೆಗಲ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Serbia And Montenegro"
 msgstr "ಸರ್ಬಿಯಾ ಹಾಗು ಮೊಂಟೆನೆಗ್ರೋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Seychelles"
 msgstr "ಸಿಶೆಲ್ಸ್‍"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sierra Leone"
 msgstr "ಸಿಯೆರಾ ಲಿಯೋನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Singapore"
 msgstr "ಸಿಂಗಪೂರ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Slovakia"
 msgstr "ಸ್ಲೊವಾಕಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovenia"
 msgstr "ಸ್ಲೊವೇನಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Solomon Islands"
 msgstr "ಸೊಲೊಮನ್ ಐಲ್ಯಾಂಡ್‍ಗಳು"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Somalia"
 msgstr "ಸೊಮಾಲಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "South Africa"
 msgstr "ಸೌತ್ ಆಫ್ರಿಕಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 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:331
 msgid "Spain"
 msgstr "ಸ್ಪೇನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sri Lanka"
 msgstr "ಶ್ರೀಲಂಕಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "St. Helena"
 msgstr "ಸೈಂಟ್ ಹೆಲೆನಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 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:335
 msgid "Sudan"
 msgstr "ಸೂಡಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Suriname"
 msgstr "ಸುರಿನೇಮ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 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:338
 msgid "Swaziland"
 msgstr "ಸ್ವಾಝಿಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Sweden"
 msgstr "ಸ್ವೀಡನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Switzerland"
 msgstr "ಸ್ವಿಟ್ಜರ್ಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Syria"
 msgstr "ಸಿರಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Taiwan"
 msgstr "ತೈವಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tajikistan"
 msgstr "ತಜಿಕಿಸ್ತಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 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:345
 msgid "Thailand"
 msgstr "ಥಾಯ್‍ಲ್ಯಾಂಡ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Timor-Leste"
 msgstr "ತಿಮೋರ್-ಲೆಸ್ಟ್‍"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Togo"
 msgstr "ಟೊಗೊ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tokelau"
 msgstr "ಟೊಕೆಲಾವ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tonga"
 msgstr "ಟೊಂಗಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Trinidad And Tobago"
 msgstr "ಟ್ರಿನಿಡಾಡ್ ಮತ್ತು ಟೊಬ್ಯಾಗೊ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tunisia"
 msgstr "ಟುನಿಶಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Turkey"
 msgstr "ಟರ್ಕಿ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkmenistan"
 msgstr "ತುರ್ಕಮೆನಿಸ್ತಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 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:355
 msgid "Tuvalu"
 msgstr "ಟುವಾಲು"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Uganda"
 msgstr "ಉಗಾಂಡ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Ukraine"
 msgstr "ಉಕ್ರೇನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "United Arab Emirates"
 msgstr "ಯುನೈಟೆಡ್ ಅರಬ್ ಎಮಿರೈಟ್ಸ್‍"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Kingdom"
 msgstr "ಯುನೈಟೆಡ್ ಕಿಂಗ್‍ಡಮ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 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:361
 msgid "Uruguay"
 msgstr "ಉರುಗ್ವೆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uzbekistan"
 msgstr "ಉಜ್ಬೇಕಿಸ್ತಾನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Vanuatu"
 msgstr "ವನುವಾತು"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Venezuela"
 msgstr "ವೆನಿಝುವೆಲಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Viet Nam"
 msgstr "ವಿಯೆಟ್ನಾಮ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Virgin Islands, British"
 msgstr "ವರ್ಜಿನ್ ಐಲ್ಯಾಂಡ್‍ಗಳು, ಬ್ರಿಟಿಶ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 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:368
 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:369
 msgid "Western Sahara"
 msgstr "ವೆಸ್ಟರ್ನ್ ಸಹಾರಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Yemen"
 msgstr "ಯೆಮೆನ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Zambia"
 msgstr "ಜಾಂಬಿಯಾ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zimbabwe"
 msgstr "ಜಿಂಬಾಬ್ವೆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:327
-#: ../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:85
+#: ../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:53
 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/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../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:56
 msgid "Yahoo Messenger"
 msgstr "ಯಾಹೂ ಮೆಸೆಂಜರ್"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 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/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../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:111
 msgid "Service"
 msgstr "ಸೇವೆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
+#: ../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:127
 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/widgets/eab-contact-display.c:556
+#: ../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/widgets/eab-contact-display.c:557
+#: ../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/widgets/eab-contact-display.c:555
+#: ../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/widgets/eab-contact-display.c:552
+#: ../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"
@@ -2559,47 +2574,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"
@@ -2608,7 +2623,7 @@ msgstr ""
 "ನೀವು ಖಚಿತವಾಗಿಯೂ ವಿಳಾಸ\n"
 "ಪಟ್ಟಿಯನ್ನು (%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?"
@@ -2616,7 +2631,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"
@@ -2625,7 +2640,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?"
@@ -2769,12 +2784,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:383
-#: ../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-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "ಪುಸ್ತಕ"
 
@@ -2782,10 +2802,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 "ಬದಲಾಯಿಸಲಾದ ಸಂಪರ್ಕವಿಳಾಸ:"
@@ -2823,39 +2839,41 @@ 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:535
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../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: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:161
+#: ../calendar/gui/cal-search-bar.c:76 ../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:160
 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 "ಹೀಗೆ ಆರಂಭಗೊಳ್ಳುವ ಹೆಸರು"
+#, fuzzy
+msgid "Name contains"
+msgstr "ಟಿಪ್ಪಣಿಯು ಇದನ್ನು ಹೊಂದಿದೆ"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2869,10 +2887,10 @@ msgstr[0] "%d ಸಂಪರ್ಕವಿಳಾಸ"
 msgstr[1] "%d ಸಂಪರ್ಕವಿಳಾಸಗಳು"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../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-reflow-adapter.c:397
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "ಸಂದೇಹ"
 
@@ -2880,125 +2898,127 @@ msgstr "ಸಂದೇಹ"
 msgid "Error getting book view"
 msgstr "ಪುಸ್ತಕ ನೋಟದಲ್ಲಿ ಕಾಣಿಸುವಲ್ಲಿ ದೋಷ"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../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:3543
-#: ../widgets/text/e-text.c:3544
+#: ../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:104
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
 msgid "Error modifying card"
 msgstr "ಕಾರ್ಡನ್ನು ಮಾರ್ಪಡಿಸುವಲ್ಲಿ ದೋಷ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "ಹೀಗೆ ಆರಂಭಗೊಳ್ಳುವ ಹೆಸರು"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "ಮೂಲ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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:1924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "ವಿಕಾರ್ಡ್ ಆಗಿ ಉಳಿಸು ..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/e-calendar-table.c:1325
-#: ../calendar/gui/e-calendar-view.c:1674 ../calendar/gui/e-memo-table.c:920
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/dialogs/comp-editor.c:2032
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1674 ../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:935
 msgid "_New Contact..."
 msgstr "ಹೊಸ ಸಂಪರ್ಕವಿಳಾಸ(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "ಹೊಸ ಸಂಪರ್ಕವಿಳಾಸ ಪಟ್ಟಿ(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "ವಿಕಾರ್ಡ್ ಆಗಿ ಉಳಿಸು(_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಕಳುಹಿಸು(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸಗಳನ್ನು ಕಳುಹಿಸು(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "ಸಂಪರ್ಕ ವಿಳಾಸಕಕ್ಕೆ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸು(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "ಪಟ್ಟಿಗೆ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸು(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "ಸಂಪರ್ಕ ವಿಳಾಸಗಳಿಗೆ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸು(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "ಮುದ್ರಿಸು(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "ವಿಳಾಸ ಪುಸ್ತಕಕ್ಕೆ ನಕಲಿಸು(_y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 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:952
 msgid "Cu_t"
 msgstr "ಕತ್ತರಿಸು(_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1333
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:928
-#: ../composer/e-msg-composer.c:3103 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2056
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:479
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
 #: ../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-mail-message.xml.h:103 ../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:954
 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:1524
+#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
+#: ../calendar/gui/cal-search-bar.c:687
 msgid "Any Category"
 msgstr "ಯಾವುದೆ ವರ್ಗ"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1705
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../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:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
 msgstr "ಸಹಾಯಕ"
 
@@ -3028,7 +3048,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
@@ -3036,7 +3056,7 @@ msgid "Categories"
 msgstr "ವರ್ಗಗಳು"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Company"
 msgstr "ಕಂಪನಿ"
 
@@ -3085,22 +3105,22 @@ msgid "Journal"
 msgstr "ಜರ್ನಲ್"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../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:591
+#: ../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:545
+#: ../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:604
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Note"
 msgstr "ಟಿಪ್ಪಣಿ"
 
@@ -3129,14 +3149,14 @@ 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 "ಪಾತ್ರ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
 msgstr "ಗಂಡ ಅಥವ ಹೆಂಡತಿ"
 
@@ -3167,38 +3187,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:3021 ../widgets/table/e-table-item.c:3022
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../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:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../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 "ಗಮನವನ್ನು ಹೊಂದಿರುವ"
 
@@ -3218,11 +3238,22 @@ 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
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"ಸಂಪರ್ಕವಿಳಾಸಕ್ಕಾಗಿ ಹುಡುಕು."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3236,7 +3267,7 @@ msgstr ""
 "\n"
 "ಅಥವ ಒಂದು ಹೊಸ ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ರಚಿಸಲು ಇಲ್ಲಿ ಎರಡು ಬಾರಿ ಕ್ಲಿಕ್ಕಿಸಿ."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3250,7 +3281,7 @@ msgstr ""
 "\n"
 "ಒಂದು ಹೊಸ ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ರಚಿಸಲು ಇಲ್ಲಿ ಎರಡು ಬಾರಿ ಕ್ಲಿಕ್ಕಿಸಿ."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3260,7 +3291,7 @@ msgstr ""
 "\n"
 "ಸಂಪರ್ಕವಿಳಾಸಕ್ಕಾಗಿ ಹುಡುಕು."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3270,40 +3301,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:627
 msgid "_Open Link in Browser"
 msgstr "ಕೊಂಡಿಯನ್ನ್ನು ವೀಕ್ಷಕದಲ್ಲಿ ತೆರೆ(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2776
+#: ../mail/em-folder-view.c:2795
 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:628
 msgid "_Send New Message To..."
 msgstr "ಹೊಸ ಸಂದೇಶವನ್ನು ಇಲ್ಲಿಗೆ ಕಳುಹಿಸು(_S)..."
 
@@ -3313,195 +3345,205 @@ msgid "Copy _Email Address"
 msgstr "ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಕಲಿಸು(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../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:372
+#: ../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:456
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../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:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 msgid "Department"
 msgstr "ವಿಭಾಗ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Profession"
 msgstr "ಉದ್ಯೋಗ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "ಸ್ಥಾನ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 msgid "Video Chat"
 msgstr "ವಿಡಿಯೋ ಸಂಭಾಷಣೆ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../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:83
-#: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-component.c:805
+#: ../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:574
+#: ../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:113
 msgid "Free/Busy"
 msgstr "ಬಿಡುವು/ಕಾರ್ಯನಿರತ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
+#: ../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:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
 msgstr "ಫ್ಯಾಕ್ಸ್‍"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Home Page"
 msgstr "ನೆಲೆ ಪುಟ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Web Log"
 msgstr "ಜಾಲ ಲಾಗ್"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-#: ../calendar/gui/e-calendar-view.c:2318
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2346
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "ಹುಟ್ಟಿದದಿನ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../calendar/gui/e-calendar-view.c:2319
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2347
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "ವಾರ್ಷಿಕೋತ್ಸವ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "ಉದ್ಯೋಗದ ಶೀರ್ಷಿಕೆ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "ನೆಲೆ ಪುಟ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "ಬ್ಲಾಗ್"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../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:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "ಬ್ಯಾಕ್ಎಂಡ್ ಕಾರ್ಯನಿರತವಾಗಿದೆ"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../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:55
+#: ../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:56
+#: ../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:59
-#: ../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:60
+#: ../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:61
+#: ../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:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "ಪ್ರೊಟೊಕಾಲ್ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../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-model-tasks.c:350
-#: ../calendar/gui/e-cal-model-tasks.c:665
-#: ../calendar/gui/e-calendar-table.c:403 ../calendar/gui/print.c:2419
+#: ../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:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "ರದ್ದು ಮಾಡಲಾಗಿದೆ"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../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:65
-#: ../calendar/gui/comp-editor-factory.c:422
+#: ../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:66
+#: ../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:67
+#: ../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:69
+#: ../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:70
+#: ../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:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "ಅಮಾನ್ಯ ಪರಿಚಾರಕ ಆವೃತ್ತಿ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:95
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#, fuzzy
+msgid "Unsupported authentication method"
+msgstr "ಬೆಂಬಲವಿಲ್ಲದ ಕಾರ್ಯಾಚರಣೆ"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 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 "
@@ -3511,7 +3553,7 @@ msgstr ""
 "ಗುರುತಿಸಲ್ಪಟ್ಟಿಲ್ಲ ಅಥವ ಜಾಲದ ಹೊರಗೆ ಬಳಸಲು ಈ ಇನ್ನೂ ಡೌನ್‍ಲೋಡ್ ಮಾಡಲ್ಪಟ್ಟಿಲ್ಲ ಎಂದಾಗಿರುತ್ತದೆ. "
 "ದಯವಿಟ್ಟು ಡೌನ್‍ಲೋಡ್ ಮಾಡಲು ವಿಳಾಸಪುಸ್ತಕವನ್ನು ಜಾಲಕ್ರಮದಲ್ಲಿ ಲೋಡ್ ಮಾಡಿ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3520,7 +3562,7 @@ msgstr ""
 "ನಮಗೆ ಈ ವಿಳಾಸಪುಸ್ತಕವನ್ನು ತೆರೆಯಲಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು %s ಮಾರ್ಗವು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಹಾಗು ನಿಮಗೆ "
 "ಅದನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಅನುಮತಿ ಇದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3528,7 +3570,7 @@ msgstr ""
 "ನಮಗೆ ಈ ವಿಳಾಸಪುಸ್ತಕವನ್ನು ತೆರೆಯಲಾಗಿಲ್ಲ. ಇದರರ್ಥ ಒಂದೋ ನೀವು ಸರಿಯಾದ URI ಅನ್ನು "
 "ನಮೂದಿಸಿಲ್ಲ, ಅಥವ LDAP ಪರಿಚಾರಕವು ನಿಲುಕುತ್ತಿಲ್ಲ ಎಂದಾಗುತ್ತದೆ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 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 "
@@ -3538,7 +3580,7 @@ msgstr ""
 "ಬಳಸಲು ಬಯಸುವುದಾದರೆ, LDAP-ಶಕ್ತಗೊಂಡ ಇವಲ್ಯೂಶನ್ ಪ್ಯಾಕೇಜನ್ನು ಅನುಸ್ಥಾಪಿಸುವುದು "
 "ಅಗತ್ಯವಾಗಿರುತ್ತದೆ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:132
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3546,7 +3588,12 @@ msgstr ""
 "ನಮಗೆ ಈ ವಿಳಾಸಪುಸ್ತಕವನ್ನು ತೆರೆಯಲಾಗಿಲ್ಲ. ಇದರರ್ಥ, ಒಂದೋ ನೀವು ನಮೂದಿಸಿದ URI ಸರಿಯಾಗಿಲ್ಲ, "
 "ಅಥವ ಪರಿಚಾರಕವು ನಿಲುಕುತ್ತಿಲ್ಲ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:138
+#, fuzzy
+msgid "Detailed error:"
+msgstr "ನಿಭಾಯಿಸದ ದೋಷ"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3554,7 +3601,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 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"
@@ -3562,45 +3609,45 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "ಈ ವಿಳಾಸಪುಸ್ತಕದ ಬ್ಯಾಕ್ಎಂಡ್‍ಗೆ ಈ ಸಂದೇಹವನ್ನು ವಿವರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:176
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "ಈ ವಿಳಾಸಪುಸ್ತಕದ ಬ್ಯಾಕ್ಎಂಡ್‍ ಈ ಸಂದೇಹವನ್ನು ಪರಿಹರಿಸಲು ನಿರಾಕರಿಸಿದೆ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 msgid "This query did not complete successfully."
 msgstr "ಸಂದೇಹವು ಯಶಸ್ವಿಯಾಗಿ ಪೂರ್ಣಗೊಂಡಿಲ್ಲ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
 msgid "Error adding list"
 msgstr "ಪಟ್ಟಿಗೆ ಸೇರಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:666
+#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:677
 msgid "Error adding contact"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಸೇರಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying list"
 msgstr "ಪಟ್ಟಿಯನ್ನು ಮಾರ್ಪಡಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error modifying contact"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಮಾರ್ಪಡಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Error removing list"
 msgstr "ಪಟ್ಟಿಯನ್ನು ತೆಗೆದುಹಾಕುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:616
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:627
 msgid "Error removing contact"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ತೆಗೆದುಹಾಕುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:293
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3615,16 +3662,16 @@ msgstr[1] ""
 "%d ಸಂಪರ್ಕವಿಳಾಸಗಳನ್ನು ತೆರೆದಾಗ %d ಹೊಸ ವಿಂಡೋಗಳನ್ನೂ ಸಹ ತೆರೆಯುತ್ತದೆ.\n"
 "ನೀವು ನಿಜವಾಗಲೂ ಈ ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ತೆರೆಯಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:301
+#: ../addressbook/gui/widgets/eab-gui-util.c:314
 msgid "_Don't Display"
 msgstr "ತೋರಿಸಬೇಡ(_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:302
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Display _All Contacts"
 msgstr "ಎಲ್ಲಾ ಸಂಪರ್ಕವಿಳಾಸಗಳನ್ನು ತೋರಿಸು(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3633,69 +3680,70 @@ msgstr ""
 "%s ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ\n"
 "ನೀವದನ್ನು ತಿದ್ದಿಬರೆಯಲು ಬಯಸುತ್ತೀರಾ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:345
 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:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:386
+#: ../addressbook/gui/widgets/eab-gui-util.c:389
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "ಸಂಪರ್ಕವಿಳಾಸ"
 msgstr[1] "ಸಂಪರ್ಕವಿಳಾಸಗಳು"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:424
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:461
+#: ../addressbook/gui/widgets/eab-gui-util.c:472
 msgid "Select Address Book"
 msgstr "ವಿಳಾಸಪುಸ್ತಕವನ್ನು ಆರಿಸು"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "list"
 msgstr "ಪಟ್ಟಿ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:727
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Move contact to"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಇಲ್ಲಿಗೆ ಸ್ಥಳಾಂತರಿಸು"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:729
+#: ../addressbook/gui/widgets/eab-gui-util.c:740
 msgid "Copy contact to"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಇಲ್ಲಿಗೆ ನಕಲಿಸು"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:732
+#: ../addressbook/gui/widgets/eab-gui-util.c:743
 msgid "Move contacts to"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಇಲ್ಲಿಗೆ ಸ್ಥಳಾಂತರಿಸು"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:734
+#: ../addressbook/gui/widgets/eab-gui-util.c:745
 msgid "Copy contacts to"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಇಲ್ಲಿಗೆ ನಕಲಿಸು"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:960
+#: ../addressbook/gui/widgets/eab-gui-util.c:890
 msgid "Multiple vCards"
 msgstr "ಅನೇಕ ವಿಕಾರ್ಡುಗಳು"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:963
+#: ../addressbook/gui/widgets/eab-gui-util.c:897
 #, c-format
 msgid "vCard for %s"
 msgstr "%s ಗಾಗಿನ ವಿಕಾರ್ಡುಗಳು"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
-#: ../addressbook/gui/widgets/eab-gui-util.c:1022
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#: ../addressbook/gui/widgets/eab-gui-util.c:935
+#, c-format
 msgid "Contact information"
 msgstr "ಸಂಪರ್ಕ ಮಾಹಿತಿ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1024
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 #, 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 "ವಿಳಾಸಪುಸ್ತಕವನ್ನು ವಿಚಾರಿಸಲಾಗುತ್ತಿದೆ..."
 
@@ -3723,43 +3771,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 ಅಥವ Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "ಔಟ್‍ಲುಕ್ CSV ಹಾಗು Tab ಇಂಪೊರ್ಟರ್"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../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:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ಮೊಝಿಲ್ಲಾ 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 ಇಂಪೊರ್ಟರ್"
 
-#: ../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 ಇಂಪೊರ್ಟರ್"
 
@@ -3812,11 +3860,11 @@ msgid "Format"
 msgstr "ವಿನ್ಯಾಸ"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../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 "ಹೆಡರ್"
@@ -3919,7 +3967,7 @@ msgstr "ಛಾಯೆ"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:967
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -3938,7 +3986,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 "ಪ್ರಕಾರ:"
 
@@ -4020,8 +4068,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 "
 "ಆಯ್ಕೆಯನ್ನು ಬಳಸಿ."
@@ -4042,7 +4089,21 @@ msgstr "ಸಾಮಾನ್ಯ ಕ್ರಮದಲ್ಲಿ, ಗಾತ್ರ ಆ�
 msgid "Unhandled error"
 msgstr "ನಿಭಾಯಿಸದ ದೋಷ"
 
-#: ../calendar/calendar.error.xml.h:1
+#. 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."
@@ -4050,7 +4111,7 @@ msgstr ""
 "ನಿಮ್ಮ ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ಗೆ ಒಂದು ಅರ್ಥವತ್ತಾದ ಸಾರಾಂಶವನ್ನು ಸೇರಿಸುವುದರಿಂದ ನಿಮ್ಮ ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್ "
 "ಏನೆಂಬುದರ ಬಗ್ಗೆ ಅದನ್ನು ಸ್ವೀಕರಿಸುವವರಿಗೆ ಮಾಹಿತಿ ದೊರೆಯುತ್ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:2
+#: ../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."
@@ -4058,139 +4119,137 @@ msgstr ""
 "ನಿಮ್ಮ ಕಾರ್ಯಕ್ಕೆ ಒಂದು ಅರ್ಥವತ್ತಾದ ಸಾರಾಂಶವನ್ನು ಸೇರಿಸುವುದರಿಂದ ನಿಮ್ಮ ಕಾರ್ಯವು ಏನೆಂಬುದರ "
 "ಬಗ್ಗೆ ಅದನ್ನು ಸ್ವೀಕರಿಸುವವರಿಗೆ ಮಾಹಿತಿ ದೊರೆಯುತ್ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
-"ಈ ಮೆಮೋಗಳಲ್ಲಿನ ಎಲ್ಲಾ ಮಾಹಿತಿಗಳು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗು ಅದನ್ನು ಮರುಗಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
+msgstr "ಈ ಮೆಮೋಗಳಲ್ಲಿನ ಎಲ್ಲಾ ಮಾಹಿತಿಗಳು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗು ಅದನ್ನು ಮರುಗಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr ""
-"ಈ ಮೆಮೋದಲ್ಲಿರುವ ಎಲ್ಲಾ ಮಾಹಿತಿಯು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗು ಅದನ್ನು ಮರುಗಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
+msgstr "ಈ ಮೆಮೋದಲ್ಲಿರುವ ಎಲ್ಲಾ ಮಾಹಿತಿಯು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗು ಅದನ್ನು ಮರುಗಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr ""
-"ಈ ಅಪಾಯಿಂಟ್‍ಗಳಲ್ಲಿನ ಎಲ್ಲಾ ಮಾಹಿತಿಗಳು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗೂ ಎಂದಿಗೂ ಮರುಗಳಿಸಲ್ಪಡುವುದಿಲ್ಲ."
+msgstr "ಈ ಅಪಾಯಿಂಟ್‍ಗಳಲ್ಲಿನ ಎಲ್ಲಾ ಮಾಹಿತಿಗಳು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗೂ ಎಂದಿಗೂ ಮರುಗಳಿಸಲ್ಪಡುವುದಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"ಈ ಕಾರ್ಯಗಳಲ್ಲಿನ ಎಲ್ಲಾ ಮಾಹಿತಿಗಳು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗು ಅದನ್ನು ಮರುಗಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
+msgstr "ಈ ಕಾರ್ಯಗಳಲ್ಲಿನ ಎಲ್ಲಾ ಮಾಹಿತಿಗಳು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗು ಅದನ್ನು ಮರುಗಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:11
 #, fuzzy
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"ಈ ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ನಲ್ಲಿನ ಎಲ್ಲಾ ಮಾಹಿತಿಗಳು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗೂ ಎಂದಿಗೂ ಮರುಗಳಿಸಲ್ಪಡುವುದಿಲ್ಲ."
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "ಈ ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ನಲ್ಲಿನ ಎಲ್ಲಾ ಮಾಹಿತಿಗಳು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗೂ ಎಂದಿಗೂ ಮರುಗಳಿಸಲ್ಪಡುವುದಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:8
-msgid ""
-"All information on this meeting 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:9
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
-msgstr ""
-"ಈ ಮೆಮೋದಲ್ಲಿರುವ ಎಲ್ಲಾ ಮಾಹಿತಿಯು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗು ಅದನ್ನು ಮರುಗಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
+msgstr "ಈ ಮೆಮೋದಲ್ಲಿರುವ ಎಲ್ಲಾ ಮಾಹಿತಿಯು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗು ಅದನ್ನು ಮರುಗಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
-"ಈ ಕಾರ್ಯದಲ್ಲಿರುವ ಎಲ್ಲಾ ಮಾಹಿತಿಯು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗು ಅದನ್ನು ಮರುಗಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
+msgstr "ಈ ಕಾರ್ಯದಲ್ಲಿರುವ ಎಲ್ಲಾ ಮಾಹಿತಿಯು ಅಳಿಸಲ್ಪಡುತ್ತದೆ ಹಾಗು ಅದನ್ನು ಮರುಗಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "'{0}' ಕಾರ್ಯವನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಿ ಹಾಕಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../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:13
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "'{0}' ಮೆಮೊವನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಿ ಹಾಕಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "ಈ {0} ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ಗಳನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "'{0}' ಮೆಮೊಗಳನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಿ ಹಾಕಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "'{0}' ಕಾರ್ಯಗಳನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಿ ಹಾಕಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "ಈ ಅಪಾಯಿಂಟ್‍ಮೆಂಟನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಿ ಹಾಕಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "ಈ ಮೀಟಿಂಗನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಿ ಹಾಕಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
+#, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "ಈ ಮೆಮೊವನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಿ ಹಾಕಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "ಈ ಕಾರ್ಯವನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಿ ಹಾಕಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../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:22
+#: ../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:23
+#: ../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:24
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "ಒಂದು ಹೊಸ ಕಾರ್ಯಕ್ರಮವನ್ನು ಉಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:29
+#, fuzzy
+msgid "Cannot save event"
+msgstr "ಒಂದು ಹೊಸ ಕಾರ್ಯಕ್ರಮವನ್ನು ಉಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "'{0}' ಕ್ಯಾಲೆಂಡರನ್ನು ಅಳಿಸು?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "'{0}' ಮೆಮೊ ಪಟ್ಟಿಯನ್ನು ಅಳಿಸು?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "'{0}' ಕಾರ್ಯ ಪಟ್ಟಿಯನ್ನು ಅಳಿಸು?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "ಕಳುಹಿಸಬೇಡ(_n)"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ಡೌನ್‍ಲೋಡ್ ಚಾಲನೆಯಲ್ಲಿದೆ. ನೀವು ಈ ಅಪಾಯಿಂಟ್‍ಮೆಂಟನ್ನು ಉಳಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ಡೌನ್‍ಲೋಡ್ ಚಾಲನೆಯಲ್ಲಿದೆ. ನೀವು ಈ ಕಾರ್ಯವನ್ನು ಉಳಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "ಸಂಪಾದಕವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4198,26 +4257,25 @@ msgstr ""
 "ಪಾಲ್ಗೊಳ್ಳುವ ಎಲ್ಲರಿಗೂ ಇಮೈಲ್ ಆಹ್ವಾನವನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತದೆ ಹಾಗು ಅವರಿಗೆ ಈ ಕಾರ್ಯವನ್ನು "
 "ಅಂಗೀಕರಿಸಲು ಅವಕಾಶ ಒದಗಿಸಲಾಗುತ್ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:33
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+#: ../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:34
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "ಕ್ಯಾಲೆಂಡರನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ದೋಷ"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "ಮೆಮೊ ಪಟ್ಟಿಯನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ದೋಷ"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "ಕಾರ್ಯಪಟ್ಟಿಯನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ದೋಷ"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../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."
@@ -4225,7 +4283,7 @@ msgstr ""
 "ನೀವು ಒಂದು ರದ್ದತಿ ಸೂಚನೆಯನ್ನು ಕಳುಹಿಸದೆ ಹೋದಲ್ಲಿ, ಮೀಟಿಂಗ್ ರದ್ದಾಗಿದ್ದು ಪಾಲ್ಗೊಳ್ಳುವ "
 "ಇತರರಿಗೆ ತಿಳಿಯುವುದಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../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."
@@ -4233,7 +4291,7 @@ msgstr ""
 "ನೀವು ಒಂದು ರದ್ದತಿ ಸೂಚನೆಯನ್ನು ಕಳುಹಿಸದೆ ಹೋದಲ್ಲಿ, ಮೆಮೊ ಅಳಿಸಲ್ಪಟ್ಟಿದ್ದು ಪಾಲ್ಗೊಳ್ಳುವ "
 "ಇತರರಿಗೆ ತಿಳಿಯುವುದಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../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."
@@ -4241,7 +4299,7 @@ msgstr ""
 "ನೀವು ಒಂದು ರದ್ದತಿ ಸೂಚನೆಯನ್ನು ಕಳುಹಿಸದೆ ಹೋದಲ್ಲಿ, ಕಾರ್ಯವು ಅಳಿಸಲ್ಪಟ್ಟಿದ್ದು ಪಾಲ್ಗೊಳ್ಳುವ "
 "ಇತರರಿಗೆ ತಿಳಿಯುವುದಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4249,7 +4307,7 @@ msgstr ""
 "ಅಪ್ಡೇಟ್ ಆದ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸುವುದರಿಂದ ಪಾಲ್ಗೊಳ್ಳುವ ಇತರರಿಗೆ ತಮ್ಮ ಕ್ಯಾಲೆಂಡರುಗಳನ್ನು "
 "ಅಪ್ಡೇಟ್ ಮಾಡಿರಿಸಿಕೊಳ್ಳಲು ಸಹಾಯಕವಾಗುತ್ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4257,7 +4315,7 @@ msgstr ""
 "ಅಪ್ಡೇಟ್ ಆದ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸುವುದರಿಂದ ಪಾಲ್ಗೊಳ್ಳುವ ಇತರರಿಗೆ ತಮ್ಮ ಕಾರ್ಯಗಳನ್ನು ಅಪ್ಡೇಟ್ "
 "ಮಾಡಿರಿಸಿಕೊಳ್ಳಲು ಸಹಾಯಕವಾಗುತ್ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4265,7 +4323,7 @@ msgstr ""
 "ಕೆಲವೊಂದು ಅಟ್ಯಾಚ್‍ಮೆಮೆಂಟ್‍ಗಳು ಡೌನ್‍ಲೋಡ್ ಆಗುತ್ತಿವೆ. ಅಪಾಯಿಂಟ್‍ಮೆಂಟನ್ನು ಉಳಿಸಿದಲ್ಲಿ ಈ "
 "ಅಟ್ಯಾಚ್‍ಮೆಂಟ್‍ಗಳು ಕಾಣೆಯಾಗಲು ಕಾರಣವಾಗುತ್ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4273,83 +4331,84 @@ msgstr ""
 "ಕೆಲವೊಂದು ಅಟ್ಯಾಚ್‍ಮೆಮೆಂಟ್‍ಗಳು ಡೌನ್‍ಲೋಡ್ ಆಗುತ್ತಿವೆ. ಕಾರ್ಯವನ್ನು ಉಳಿಸಿದಲ್ಲಿ ಈ ಅಟ್ಯಾಚ್‍ಮೆಂಟ್‍ಗಳು "
 "ಕಾಣೆಯಾಗಲು ಕಾರಣವಾಗುತ್ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr "ನಿಮ್ಮ ಪ್ರಸಕ್ತ ಪರಿಚಾರಕದಲ್ಲಿ ಕೆಲವೊಂದು ವೈಶಿಷ್ಟ್ಯಗಳು ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ಇವಲ್ಯೂಶನ್ ಕ್ಯಾಲೆಂಡರ್ ಅನಿರೀಕ್ಷಿತವಾಗಿ ನಿರ್ಗಮಿಸಿದೆ."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ಇವಲ್ಯೂಶನ್ ಮೆಮೊ ಅನಿರೀಕ್ಷಿತವಾಗಿ ನಿರ್ಗಮಿಸಿದೆ."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ಇವಲ್ಯೂಶನ್ ಕಾರ್ಯಗಳು ಅನಿರೀಕ್ಷಿತವಾಗಿ ನಿರ್ಗಮಿಸಿದೆ."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "ಕ್ಯಾಲೆಂಡರನ್ನು ಜಾಲದ ಹೊರಗೆ ಬಳಸಲು ಗುರುತು ಹಾಕಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "The memo list is not marked for offline usage"
+#: ../calendar/calendar.error.xml.h:54
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
 msgstr "ಮೆಮೊ ಪಟ್ಟಿಯನ್ನು ಜಾಲದ ಹೊರಗೆ ಬಳಸಲು ಗುರುತು ಹಾಕಿಲ್ಲ"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "ಕಾರ್ಯಗಳ ಪಟ್ಟಿಯನ್ನು ಜಾಲದ ಹೊರಗೆ ಬಳಸಲು ಗುರುತು ಹಾಕಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "ಕ್ಯಾಲೆಂಡರ್ ಶಾಶ್ವತವಾಗಿ ತೆಗೆದುಹಾಕಲ್ಪಡುತ್ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "ಮೆಮೊ ಪಟ್ಟಿಯು ಶಾಶ್ವತವಾಗಿ ತೆಗೆದುಹಾಕಲ್ಪಡುತ್ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "ಕಾರ್ಯಗಳ ಪಟ್ಟಿ ಶಾಶ್ವತವಾಗಿ ತೆಗೆದುಹಾಕಲ್ಪಡುತ್ತದೆ."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "ನೀವು ಮಾಡಿದ ಬದಲಾವಣೆಗಳನ್ನು ಈ ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ಗೆ ಉಳಿಸಲು ಬಯಸುತ್ತೀರಾ?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "ನೀವು ಮಾಡಿದ ಬದಲಾವಣೆಗಳನ್ನು ಈ ಮೆಮೊಗೆ ಉಳಿಸಲು ಬಯಸುತ್ತೀರಾ?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "ನೀವು ಮಾಡಿದ ಬದಲಾವಣೆಗಳನ್ನು ಈ ಕಾರ್ಯಕ್ಕೆ ಉಳಿಸಲು ಬಯಸುತ್ತೀರಾ?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "ಈ ಮೆಮೊಗೆ ರದ್ದತಿ ಸೂಚನೆಯನ್ನು ಕಳುಹಿಸಲು ಬಯಸುತ್ತೇರೆ?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "ಪಾಲ್ಗೊಳ್ಳುವ ಎಲ್ಲರಿಗೂ ಈ ರದ್ದತಿ ಸೂಚನೆಯನ್ನು ಕಳುಹಿಸಲು ಬಯಸುತ್ತೇರೆ?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "ಪಾಲ್ಗೊಳ್ಳುವ ಎಲ್ಲರಿಗೂ ಮೀಟಿಂಗ್ ಆಹ್ವಾನವನ್ನು ಕಳುಹಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "ಪಾಲ್ಗೊಳ್ಳುವ ಎಲ್ಲರಿಗೂ ಕಾರ್ಯವನ್ನು ಕಳುಹಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "ಪಾಲ್ಗೊಳ್ಳುವ ಎಲ್ಲರಿಗೂ ಅಪ್ಡೇಟ್ ಆದ ಮೀಟಿಂಗ್ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "ಪಾಲ್ಗೊಳ್ಳುವ ಎಲ್ಲರಿಗೂ ಅಪ್ಡೇಟ್ ಆದ ಕಾರ್ಯದ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../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 "
@@ -4359,119 +4418,106 @@ msgstr ""
 "ಬಳಸುವಾಗ ತೊಂದರೆಗಳನ್ನು ಎದುರಿಸಬಹುದು. ಉತ್ತಮ ಫಲಿತಾಂಶಕ್ಕಾಗಿ ಪರಿಚಾರಕವನ್ನು ಒಂದು ಬೆಂಬಲಿತ "
 "ಆವೃತ್ತಿಗೆ ನವೀಕರಿಸಿ."
 
-#: ../calendar/calendar.error.xml.h:64
-msgid ""
-"You have a read-only calendar source selected. Change to Calendar View and "
-"highlight a calendar that can accept appointments."
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "ನೀವು ಈ ಅಪಾಯಿಂಟ್‍ಮೆಂಟನ್ನು ಬದಲಾಯಿಸಿದ್ದೀರಿ, ಆದರೆ ಇನ್ನೂ ಉಳಿಸಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "ನೀವು ಈ ಕಾರ್ಯವನ್ನು ಬದಲಾಯಿಸಿದ್ದೀರಿ, ಆದರೆ ಇನ್ನೂ ಉಳಿಸಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../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:68
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ಇವಲ್ಯೂಶನನ್ನು ಮರಳಿ ಆರಂಭಿಸದೆ ನಿಮ್ಮ ಕ್ಯಾಲೆಂಡರುಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "ಇವಲ್ಯೂಶನನ್ನು ಮರಳಿ ಆರಂಭಿಸದೆ ನಿಮ್ಮ ಮೆಮೊಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ಇವಲ್ಯೂಶನನ್ನು ಮರಳಿ ಆರಂಭಿಸದೆ ನಿಮ್ಮ ಕಾರ್ಯಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ."
 
-#: ../calendar/calendar.error.xml.h:71
-#: ../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:72 ../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:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸು(_S)"
 
-#: ../calendar/calendar.error.xml.h:74
-#: ../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:75
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "ಸೂಚನೆಯನ್ನು ಕಳುಹಿಸು(_S)"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:50
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸು"
-
-#: ../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:1515
-#: ../calendar/conduits/calendar/calendar-conduit.c:1516
-#: ../calendar/conduits/memo/memo-conduit.c:816
-#: ../calendar/conduits/memo/memo-conduit.c:817
-#: ../calendar/conduits/todo/todo-conduit.c:1014
-#: ../calendar/conduits/todo/todo-conduit.c:1015
+#: ../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:1623
-#: ../calendar/conduits/calendar/calendar-conduit.c:1626
+#: ../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:910
-#: ../calendar/conduits/memo/memo-conduit.c:913
+#: ../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:957
-#: ../calendar/conduits/memo/memo-conduit.c:960
+#: ../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:1098
-#: ../calendar/conduits/todo/todo-conduit.c:1101
+#: ../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:1143
-#: ../calendar/conduits/todo/todo-conduit.c:1146
+#: ../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:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 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:1402
 msgid "Calendars"
 msgstr "ಕ್ಯಾಲೆಂಡರುಗಳು"
 
@@ -4512,25 +4558,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:1166
-#: ../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:548
+#: ../calendar/gui/memos-component.c:1101 ../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:460 ../calendar/gui/e-tasks.c:1433
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1875
+#: ../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: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:83
-#: ../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/tasks-component.c:1090 ../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 "ಕಾರ್ಯಗಳು"
@@ -4548,25 +4594,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:101
 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:116
 #: ../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] "ಗಂಟೆ"
 msgstr[1] "ಗಂಟೆಗಳು"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "ಆರಂಭದ ಸಮಯ"
 
@@ -4577,9 +4623,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:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "ಸ್ಥಳ:"
@@ -4589,17 +4635,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:157
+#: ../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)"
 
@@ -4611,32 +4655,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:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 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:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "ಯಾವುದೆ ವಿವರಣೆ ಲಭ್ಯವಿಲ್ಲ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "ಯಾವುದೆ ಸ್ಥಳ ಮಾಹಿತಿಯು ಲಭ್ಯವಿಲ್ಲ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, 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:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1587
 msgid "Warning"
 msgstr "ಎಚ್ಚರಿಕೆ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4644,7 +4688,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4655,15 +4699,15 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 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 "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..."
@@ -4674,7 +4718,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"
@@ -4683,7 +4727,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"
@@ -4694,7 +4738,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"
@@ -4723,8 +4767,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 ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
@@ -4797,13 +4840,11 @@ 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 ""
-"ಕೆಲಸದ ದಿನವು ಕೊನೆಗೊಳ್ಳುವ ಗಂಟೆ, 0 ಯಿಂದ 23 ರ ವರೆಗೆ, ಇಪ್ಪತ್ನಾಲ್ಕು ಗಂಟೆಯ ಮಾದರಿಯಲ್ಲಿ."
+msgstr "ಕೆಲಸದ ದಿನವು ಕೊನೆಗೊಳ್ಳುವ ಗಂಟೆ, 0 ಯಿಂದ 23 ರ ವರೆಗೆ, ಇಪ್ಪತ್ನಾಲ್ಕು ಗಂಟೆಯ ಮಾದರಿಯಲ್ಲಿ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr ""
-"ಕೆಲಸದ ದಿನವು ಆರಂಭಗೊಳ್ಳುವ ಗಂಟೆ, 0 ಯಿಂದ 23 ರ ವರೆಗೆ, ಇಪ್ಪತ್ನಾಲ್ಕು ಗಂಟೆಯ ಮಾದರಿಯಲ್ಲಿ."
+msgstr "ಕೆಲಸದ ದಿನವು ಆರಂಭಗೊಳ್ಳುವ ಗಂಟೆ, 0 ಯಿಂದ 23 ರ ವರೆಗೆ, ಇಪ್ಪತ್ನಾಲ್ಕು ಗಂಟೆಯ ಮಾದರಿಯಲ್ಲಿ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
@@ -4926,12 +4967,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:105
+#: ../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:106
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "\"ಮುನ್ನೋಟ\" ಫಲಕವನ್ನು ತೋರಿಸು."
 
@@ -4977,7 +5018,7 @@ 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
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "ಕಾಲವಲಯ"
 
@@ -4998,8 +5039,7 @@ msgstr ""
 "\"."
 
 #: ../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 ""
 "ಎಂದು ಕಾರ್ಯಗಳನ್ನು ಅಡಗಿಸಬೇಕು ಎಂದು ಸೂಚಿಸಲು ಘಟಕಗಳು, \"ನಿಮಿಷಗಳು\", \"ಗಂಟೆಗಳು\" ಅಥವ "
 "\"ದಿನಗಳು\"."
@@ -5035,8 +5075,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
@@ -5064,8 +5103,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 ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
@@ -5108,82 +5146,82 @@ msgstr "ಕೆಲಸದ ದಿನ ಆರಂಭಗೊಳ್ಳುವ ನಿಮಿ
 msgid "daylight savings time"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "ಸಾರಾಂಶವು ಇದನ್ನು ಹೊಂದಿದೆ"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "ವಿವರವು ಇದನ್ನು ಹೊಂದಿದೆ"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "ವರ್ಗವು ಹೀಗಿದೆ"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "ಟಿಪ್ಪಣಿಯು ಇದನ್ನು ಹೊಂದಿದೆ"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
 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:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "ತಾಳೆಯಾಗದ"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "ಮುಂದಿನ ಏಳು ದಿನಗಳ ಕಾರ್ಯಗಳು"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "ಸಕ್ರಿಯ ಕಾರ್ಯಗಳು"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "ಅವಧಿ ಮೀರಿದ ಕಾರ್ಯಗಳು"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "ಪೂರ್ಣಗೊಂಡ ಕಾರ್ಯಗಳು"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "ಸಕ್ರಿಯ ಅಪಾಯಿಂಟ್‍ಮೆಂಟುಗಳು"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:703
 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 "
 "events."
 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:717
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "ದಿನಗಳು"
 
@@ -5192,102 +5230,102 @@ msgstr "ದಿನಗಳು"
 #. 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:511
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
 #: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "ಜಾಲದಲ್ಲಿ"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "ಹುಟ್ಟುಹಬ್ಬಗಳು ಹಾಗು ವಾರ್ಷಿಕೋತ್ಸವಗಳು"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "ಹವಾಮಾನ"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "ಹೊಸ ಕ್ಯಾಲೆಂಡರ್(_N)"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "ನಕಲಿಸು(_C)..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3634 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "ಗುಣಲಕ್ಷಣಳುK_P)"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "ಕ್ಯಾಲೆಂಡರುಗಳನ್ನು ನವೀಕರಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ."
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1595
 msgid "New appointment"
 msgstr "ಹೊಸ ಅಪಾಯಿಂಟ್‍ಮೆಟ್"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1596
+#, fuzzy
+msgctxt "New"
 msgid "_Appointment"
 msgstr "ಅಪಾಯಿಂಟ್‍ಮೆಟ್(_A)"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1597
 msgid "Create a new appointment"
 msgstr "ಒಂದು ಹೊಸ ಅಪಾಯಿಂಟ್‍ಮೆಟನ್ನು ನಿರ್ಮಿಸು"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1603
 msgid "New meeting"
 msgstr "ಹೊಸ ಮೀಟಿಂಗ್"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1604
+#, fuzzy
+msgctxt "New"
 msgid "M_eeting"
 msgstr "ಮೀಟಿಂಗ್(_e)"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1605
 msgid "Create a new meeting request"
 msgstr "ಒಂದು ಹೊಸ ಮೀಟಿಂಗ್ ಮನವಿಯನ್ನು ನಿರ್ಮಿಸು"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1611
 msgid "New all day appointment"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1612
+#, fuzzy
+msgctxt "New"
 msgid "All Day A_ppointment"
-msgstr ""
+msgstr "ಮುಂದಿನ ಏಳು ದಿನಗಳ ಅಪಾಯಿಂಟ್‍ಮೆಂಟುಗಳು"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1613
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1619
 msgid "New calendar"
 msgstr "ಹೊಸ ಕ್ಯಾಲೆಂಡರ್"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1620
+#, fuzzy
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ಕ್ಯಾಲೆಂಡರ್(_n)"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1621
 msgid "Create a new calendar"
 msgstr "ಒಂದು ಹೊಸ ಕ್ಯಾಲೆಂಡರನ್ನು ನಿರ್ಮಿಸು"
 
@@ -5308,32 +5346,252 @@ 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:297
+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/comp-editor-factory.c:404
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "ಶೋಧಕವನ್ನು ಅನ್ವಯಿಸು(_p)"
+
+#: ../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 "ಕ್ಯಾಲೆಂಡರನ್ನು ತೆರೆಯುವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../calendar/gui/comp-editor-factory.c:410
+#: ../calendar/gui/comp-editor-factory.c:411
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:416
+#: ../calendar/gui/comp-editor-factory.c:417
 msgid "Permission denied to open the calendar"
 msgstr "ಕ್ಯಾಲೆಂಡರನ್ನು ತೆರೆಯಲು ಅನುಮತಿ ಇಲ್ಲ"
 
-#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1285
+#: ../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:601
 msgid "Edit Alarm"
 msgstr "ಅಲಾರಂ ಅನ್ನು ಸಂಪಾದಿಸು"
 
@@ -5366,17 +5624,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 "ಒಂದು ಪ್ರೊಗ್ರಾಂ ಅನ್ನು ಚಲಾಯಿಸು"
 
@@ -5389,7 +5647,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 "ಒಂದು ಇಮೈಲನ್ನು ಕಳುಹಿಸು"
 
@@ -5436,7 +5694,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 "ನಿಮಿಷ(ಗಳು)"
 
@@ -5444,7 +5705,7 @@ msgstr "ನಿಮಿಷ(ಗಳು)"
 msgid "start of appointment"
 msgstr "ಅಪಾಯಿಂಟ್‍ಮೆಂಟಿನ ಆರಂಭ"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr ""
 
@@ -5455,16 +5716,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:82
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "ಕಡತವನ್ನು(ಗಳನ್ನು) ಲಗತ್ತಿಸು"
 
@@ -5488,8 +5748,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 ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
@@ -5532,8 +5791,8 @@ msgid "Display"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "ಶುಕ್ರವಾರ"
 
@@ -5548,8 +5807,8 @@ msgstr ""
 "ದಿನಗಳು"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "ಸೋಮವಾರ"
 
@@ -5572,7 +5831,7 @@ msgstr ""
 "ಭಾನುವಾರ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "ಒಂದು ಬಣ್ಣವನ್ನು ಆರಿಸಿ"
 
@@ -5582,8 +5841,8 @@ msgid "S_un"
 msgstr "ಭಾನು(_u)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "ಶನಿವಾರ"
 
@@ -5600,8 +5859,8 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "ಭಾನುವಾರ"
 
@@ -5619,13 +5878,13 @@ msgid "Template:"
 msgstr "ವಿನ್ಯಾಸ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:739
+#: ../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
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "ಕಾಲವಲಯ(_z):"
 
@@ -5634,14 +5893,14 @@ msgid "Time format:"
 msgstr "ಕಾಲದ ಮಾದರಿ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../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:1089
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "ಬುಧವಾರ"
 
@@ -5719,304 +5978,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+#, fuzzy
+msgid "Colo_r:"
 msgstr "ಬಣ್ಣ(_o):"
 
-#: ../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
+#, fuzzy
+msgid "New Task List"
+msgstr "ಹೊಸ ಕಾರ್ಯ ಪಟ್ಟಿ(_N)"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+#, fuzzy
+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:56
 msgid "This event has been deleted."
 msgstr ""
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "ಈ ಕಾರ್ಯವು ಅಳಿಸಲ್ಪಟ್ಟಿದೆ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "ಈ ಮೆಮೊ ಅಳಿಸಲ್ಪಟ್ಟಿದೆ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  ನೀವು ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡಿದ್ದೀರಿ. ಆ ಬದಲಾವಣೆಗಳನ್ನು ಆಲಕ್ಷಿಸಿ ಸಂಪಾದಕವನ್ನು ಮುಚ್ಚಬೇಕೆ?"
+msgstr "%s  ನೀವು ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡಿದ್ದೀರಿ. ಆ ಬದಲಾವಣೆಗಳನ್ನು ಆಲಕ್ಷಿಸಿ ಸಂಪಾದಕವನ್ನು ಮುಚ್ಚಬೇಕೆ?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, 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:80
 msgid "This event has been changed."
 msgstr ""
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "ಈ ಕಾರ್ಯವು ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "ಈ ಮೆಮೊ ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, 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:99
 #, 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 ""
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2247
+#: ../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:2251
+#: ../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:2253
+#: ../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:2258
+#: ../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:2260
+#: ../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:393 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3040
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1771
+#: ../composer/e-msg-composer.c:1990
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "ಲಗತ್ತಿಸಲಾದ ಸಂದೇಶ"
 msgstr[1] "ಲಗತ್ತಿಸಲಾದ %d ಸಂದೇಶಗಳು"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3104
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2057
+#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "ಜರುಗಿಸು(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3106
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2059
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2060
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:824
-msgid "Could not update object"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../composer/e-msg-composer.c:2487
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-msgid "Hide Attachment _Bar"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:1009
-#: ../calendar/gui/dialogs/comp-editor.c:1557
-msgid "Show Attachment _Bar"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3633
-#: ../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:1131
-#: ../composer/e-msg-composer.c:3636
-msgid "_Add attachment..."
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:1581
-#: ../mail/em-format-html-display.c:2374
-msgid "Show Attachments"
+#: ../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:1582
-msgid "Press space key to toggle attachment bar"
+#: ../calendar/gui/dialogs/comp-editor.c:841
+msgid "Could not update object"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2188
-#: ../calendar/gui/dialogs/comp-editor.c:2231
+#: ../calendar/gui/dialogs/comp-editor.c:929
 msgid "Edit Appointment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2194
-#: ../calendar/gui/dialogs/comp-editor.c:2237
+#: ../calendar/gui/dialogs/comp-editor.c:936
 #, c-format
 msgid "Meeting - %s"
 msgstr "ಮೀಟಿಂಗ್ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2196
-#: ../calendar/gui/dialogs/comp-editor.c:2239
+#: ../calendar/gui/dialogs/comp-editor.c:938
 #, c-format
 msgid "Appointment - %s"
 msgstr "ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2200
-#: ../calendar/gui/dialogs/comp-editor.c:2243
+#: ../calendar/gui/dialogs/comp-editor.c:944
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ನಿಯೋಜಿಸಲಾದ ಕಾರ್ಯ- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2202
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:946
 #, c-format
 msgid "Task - %s"
 msgstr "ಕಾರ್ಯ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2205
-#: ../calendar/gui/dialogs/comp-editor.c:2248
+#: ../calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Memo - %s"
 msgstr "ಮೆಮೊ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2216
-#: ../calendar/gui/dialogs/comp-editor.c:2258
-msgid "No summary"
+#: ../calendar/gui/dialogs/comp-editor.c:967
+#, fuzzy
+msgid "No Summary"
 msgstr "ಯಾವುದೆ ಸಾರಾಂಶವಿಲ್ಲ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2820 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:360
-msgid "attachment"
+#: ../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
+#, fuzzy
+msgid "_Insert"
+msgstr "ಸೇರಿಸು(_n)"
+
+#: ../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 ""
+
+#: ../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
+#, fuzzy
+msgid "Classify as private"
+msgstr "ಖಾಸಗಿ ಎಂದು ವರ್ಗೀಕರಿಸು"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "_Confidential"
+msgstr "ಗೌಪ್ಯವಾದ(_C)"
+
+#: ../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 "ರೋಲ್ ಕ್ಷೇತ್ರ(_F)"
+
+#: ../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
+#, 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"
+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:1871
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
+#: ../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:2036
+#: ../composer/e-msg-composer.c:1048
+#: ../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:2195
+msgid "Show Attachments"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2909
-#: ../calendar/gui/dialogs/comp-editor.c:2963
-#: ../calendar/gui/dialogs/comp-editor.c:2987
+#: ../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:3016
+#: ../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:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 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:55
 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:58
 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:61
 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:68
 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:71
 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:74
 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:77
 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:84
 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:87
 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:90
 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:93
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -6025,7 +6444,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 ""
 
@@ -6033,135 +6452,182 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:602
-msgid "Appoint_ment"
-msgstr "ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ಗಳು(_m)"
+#: ../calendar/gui/dialogs/event-editor.c:194
+msgid "_Alarms"
+msgstr "ಅಲರಾಂಗಳು(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "Click here to set or unset alarms for this event"
+msgstr "ಈ ಕಾರ್ಯಕ್ರಮಕ್ಕೆ ಅಲಾರಂಗಳನ್ನು ಹೊಂದಿಸಲು ಅಥವ ಹೊಂದಿಸದಿರಲು ಇಲ್ಲಿ ಕ್ಲಿಕ್ಕಿಸಿ"
+
+#: ../calendar/gui/dialogs/event-editor.c:201
+msgid "_Recurrence"
+msgstr "ಮರುಕಳಿಸುವಿಕೆ(_R)"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "Make this a recurring event"
+msgstr "ಇದನ್ನು ಒಂದು ಪುನರಾವರ್ತಿತ ಕಾರ್ಯಕ್ರಮವಾಗಿಸು"
+
+#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../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:210
+#: ../calendar/gui/dialogs/task-editor.c:123
+msgid "Insert advanced send options"
+msgstr "ಸುಧಾರಿತ ಕಳುಹಿಸುವ ಆಯ್ಕೆಗಳನ್ನು ಸೇರಿಸು"
+
+#: ../calendar/gui/dialogs/event-editor.c:218
+msgid "All _Day Event"
+msgstr "ದಿನಪೂರ್ತಿಯ ಕಾರ್ಯಕ್ರಮ(_D)"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "Toggles whether to have All Day Event"
+msgstr "ನೀವು ದಿನಪೂರ್ತಿ ಕಾರ್ಯಕ್ರಮವನ್ನು ಹೊಂದಿದ್ದೇರೆ ಎಂದು ಟೋಗಲ್ ಮಾಡುತ್ತದೆ"
+
+#: ../calendar/gui/dialogs/event-editor.c:226
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "ಸಮಯವನ್ನು ಬಿಡುವಿಲ್ಲ ಎಂದು ತೋರಿಸು(_b)"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Toggles whether to show time as busy"
+msgstr "ಸಮಯವನ್ನು ಬಿಡುವಿಲ್ಲ ಎಂದು ತೋರಿಸಬೇಕೆ ಎಂದು ಟೋಗಲ್ ಮಾಡುತ್ತದೆ"
+
+#: ../calendar/gui/dialogs/event-editor.c:237
+msgid "_Free/Busy"
+msgstr "ಬಿಡುವು/ಕಾರ್ಯನಿರತ(_F)"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "Query free / busy information for the attendees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-editor.c:294
+msgid "Appoint_ment"
+msgstr "ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ಗಳು(_m)"
+
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../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:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../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:1208
 msgid "End date is wrong"
 msgstr "ಮುಕ್ತಾಯ ದಿನಾಂಕವು ತಪ್ಪಾಗಿದೆ"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "ಆರಂಭ ಸಮಯವು ತಪ್ಪಾಗಿದೆ"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "ಮುಕ್ತಾಯ ಸಮಯವು ತಪ್ಪಾಗಿದೆ"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:740
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../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:746
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../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:1432
+#: ../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:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "ಸೇರಿಸು(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ಕ್ಯಾಲೆಂಡರನ್ನು ತೆರೆಯಲಾಗಿಲ್ಲ."
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:956
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../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:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, 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:2920
 #, 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:2926
 #, 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:2939
 msgid "Customize"
 msgstr ""
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../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-cal-model-tasks.c:669
+#: ../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:93
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:200
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1996
-#: ../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:2021
+#: ../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 "ಯಾವುದೂ ಇಲ್ಲ"
 
@@ -6181,33 +6647,30 @@ msgstr "ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ಗೆ 15 ನಿಮಿಷ �
 msgid "Attendee_s..."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-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 "ವಿವರಣೆ(_e):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "ಸಾರಾಂಶ(_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "ಅಲಾರಂ(_A)"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Description:"
+msgstr "ವಿವರಣೆ(_D):"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "ಸಮಯ(_T):"
@@ -6238,28 +6701,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:2355
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "ಮೆಮೊ"
 
-#: ../calendar/gui/dialogs/memo-page.c:918
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' ನಲ್ಲಿ ಮೆಮೊಗಳನ್ನು ತೆರೆಯಲಾಗಿಲ್ಲ."
 
-#: ../calendar/gui/dialogs/memo-page.c:1102 ../mail/em-format-html.c:1539
-#: ../mail/em-format-html.c:1597 ../mail/em-format-html.c:1623
-#: ../mail/em-format-quote.c:207 ../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: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"
 msgstr "ಗೆ"
 
@@ -6272,59 +6731,59 @@ msgstr "ಆರಂಭದ ದಿನಾಂಕ(_r):"
 msgid "T_o:"
 msgstr "ಗೆ(_o):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-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:498
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../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:932
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr ""
 
@@ -6332,7 +6791,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:996
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "ಮೊದಲ"
 
@@ -6341,7 +6800,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:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "ಎರಡನೆಯ"
 
@@ -6349,7 +6808,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:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "ಮೂರನೆ"
 
@@ -6357,7 +6816,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:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "ನಾಲ್ಕನೆಯ"
 
@@ -6365,13 +6824,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:1017
+#: ../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:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "ಇತರೆ ದಿನಾಂಕ"
 
@@ -6379,7 +6838,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:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1 ರಿಂದ 10 ನೆಯ"
 
@@ -6387,7 +6846,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:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11 ರಿಂದ 20 ನೆಯ"
 
@@ -6395,45 +6854,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:1063
+#: ../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:1086
+#: ../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:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../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 "ದಿನಾಂಕ/ಸಮಯ"
 
@@ -6484,12 +6943,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 "ಜಾಲ ಪುಟ"
 
@@ -6504,48 +6963,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-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:663
-#: ../calendar/gui/e-calendar-table.c:402 ../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:2416 ../plugins/save-calendar/csv-format.c:386
+#: ../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: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:327 ../mail/message-list.c:1062
+#: ../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:1065
 msgid "High"
 msgstr "ಉತ್ತಮ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-cal-model-tasks.c:736
-#: ../calendar/gui/e-calendar-table.c:401 ../calendar/gui/print.c:2413
+#: ../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: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:329 ../mail/message-list.c:1060
+#: ../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:1063
 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:965 ../calendar/gui/e-calendar-table.c:328
-#: ../mail/message-list.c:1061
+#: ../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:1064
 msgid "Normal"
 msgstr "ಸಾಮಾನ್ಯ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:400 ../calendar/gui/print.c:2410
+#: ../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:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "ಆರಂಭಗೊಂಡಿಲ್ಲ"
 
@@ -6558,7 +7024,7 @@ msgid "Stat_us:"
 msgstr "ಸ್ತಿತಿ(_u):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:330
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "ವಿವರಿಸದೆ ಇರುವ"
 
@@ -6567,7 +7033,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):"
 
@@ -6575,25 +7041,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:111
+msgid "_Status Details"
+msgstr "ಸ್ಥಿತಿಯ ವಿವರಗಳು(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:113
+#, fuzzy
+msgid "Click to change or view the status details of the task"
+msgstr "ಕಾರ್ಯದ ಸ್ತಿತಿಯ ವಿವರಗಳನ್ನು ಬದಲಾಯಿಸು / ತೋರಿಸು ಅನ್ನು ಕ್ಲಿಕ್ಕಿಸಿ"
+
+#: ../calendar/gui/dialogs/task-editor.c:121
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "ಕಳುಹಿಸುವ ಆಯ್ಕೆಗಳು(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:316
 msgid "_Task"
 msgstr "ಕಾರ್ಯ(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:319
 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 ""
 
-#: ../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' ನಲ್ಲಿ ತೆರೆಯುವಲ್ಲಿ ವಿಫಲತೆ ಎದುರಾಗಿದೆ."
@@ -6607,19 +7086,16 @@ msgid "Categor_ies..."
 msgstr "ವರ್ಗಗಳು(_i)..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "ವಿವರಗಳು(_s):"
+#, fuzzy
+msgid "D_ue date:"
+msgstr "ಕೊನೆಯ ದಿನಾಂಕ(_D):"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "ಕಾಲವಲಯ:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-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"
@@ -6627,142 +7103,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3295
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, 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-itip-control.glade.h:4 ../mail/mail-config.glade.h:68
+#: ../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:317
-#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:305
-msgid "Public"
-msgstr "ಸಾರ್ವಜನಿಕ"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:326
-#: ../calendar/gui/e-calendar-table.c:306
-msgid "Private"
-msgstr "ಖಾಸಗಿ"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:328
-#: ../calendar/gui/e-calendar-table.c:307
-msgid "Confidential"
-msgstr "ಗೌಪ್ಯವಾದ"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "ಮುಕ್ತಾಯ ದಿನಾಂಕ"
@@ -6772,25 +7232,18 @@ 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:379
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr ""
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:380
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "ಕಾರ್ಯನಿರತ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:611
+#: ../calendar/gui/e-cal-model-tasks.c:623
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6800,198 +7253,228 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1011 ../calendar/gui/e-cal-model.c:971
-#: ../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-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:1011 ../calendar/gui/e-cal-model.c:971
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../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:330 ../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 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:395
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:722
-#: ../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:409
+#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../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:967
+#: ../calendar/gui/e-cal-model.c:968
 msgid "Recurring"
 msgstr "ಮರುಕಳಿಸುವ"
 
-#: ../calendar/gui/e-cal-model.c:969
+#: ../calendar/gui/e-cal-model.c:970
 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:416
 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:2029
 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:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "ಶೀರ್ಷಿಕೆ ಇಲ್ಲದ ಚಿತ್ರ(_i).%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1327
-#: ../calendar/gui/e-calendar-view.c:1675 ../calendar/gui/e-memo-table.c:922
-#: ../mail/em-folder-view.c:1338 ../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:1675 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 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:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr ""
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr ""
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:791
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:837
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ನಲ್ಲಿ ತೆರೆ..."
 
-#: ../calendar/gui/e-calendar-table.c:349
+#: ../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:2218
+#, 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:2222
+#, 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:350
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:351
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:352
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:353
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:354
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:355
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:356
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:357
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:358
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:359
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:635
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:668 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:915
-#: ../calendar/gui/e-calendar-view.c:802 ../calendar/gui/e-memo-table.c:642
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:798 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1099
-#: ../calendar/gui/e-calendar-view.c:1224 ../calendar/gui/e-memo-table.c:817
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1224 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:278
 msgid "Save as..."
 msgstr "ಹೀಗೆ ಉಳಿಸು..."
 
-#: ../calendar/gui/e-calendar-table.c:1322
+#: ../calendar/gui/e-calendar-table.c:1571
 #: ../calendar/gui/e-calendar-view.c:1657
 msgid "New _Task"
 msgstr "ಹೊಸ ಕಾರ್ಯ(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1326 ../calendar/gui/e-memo-table.c:921
+#: ../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:1328
-#: ../calendar/gui/e-calendar-view.c:1660 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1660 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "ಮುದ್ರಿಸು(_r)..."
 
-#: ../calendar/gui/e-calendar-table.c:1332
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1680 ../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:1334
+#: ../calendar/gui/e-calendar-table.c:1583
 #: ../calendar/gui/e-calendar-view.c:1663
-#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-view.c:1682 ../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:1338 ../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:1339 ../calendar/gui/e-memo-table.c:933
+#: ../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 ""
 
-#: ../calendar/gui/e-calendar-table.c:1340
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "ಪೂರ್ಣಗೊಂಡಿದೆ ಎಂದು ಗುರುತು ಹಾಕು(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1341
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "ಆಯ್ದ ಕಾರ್ಯಗಳನ್ನು ಪೂರ್ಣಗೊಂಡಿದೆ ಎಂದು ಗುರುತು ಹಾಕು(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1342
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "ಪೂರ್ಣಗೊಂಡಿಲ್ಲ ಎಂದು ಗುರುತು ಹಾಕು(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1343
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "ಆಯ್ದ ಕಾರ್ಯಗಳನ್ನು ಪೂರ್ಣಗೊಂಡಿಲ್ಲ ಎಂದು ಗುರುತು ಹಾಕು(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "ಆಯ್ದ ಕಾರ್ಯಗಳನ್ನು ಅಳಿಸಿಹಾಕು(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "ಒಂದು ಕಾರ್ಯವನ್ನು ಸೇರಿಸಲು ಕ್ಲಿಕ್ ಮಾಡು"
@@ -7014,7 +7497,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 "ಆದ್ಯತೆ"
 
@@ -7022,13 +7506,6 @@ 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:69
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "ಸ್ತಿತಿ"
-
 #: ../calendar/gui/e-calendar-view.c:1343
 msgid "Moving items"
 msgstr ""
@@ -7090,8 +7567,8 @@ msgstr ""
 msgid "_Reply"
 msgstr "ಉತ್ತರಿಸು(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1692 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1692 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "ಎಲ್ಲರಿಗೂ ಉತ್ತರಿಸು(_R)"
@@ -7108,26 +7585,14 @@ msgstr ""
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2196
-#, 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:2200
-#, c-format
-msgid "Organizer: %s"
-msgstr "ಆಯೋಜಕರು: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2216 ../calendar/gui/print.c:2384
+#: ../calendar/gui/e-calendar-view.c:2238 ../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:2247
+#: ../calendar/gui/e-calendar-view.c:2272
 #, c-format
 msgid "Time: %s %s"
 msgstr "ಕಾಲ: %s %s"
@@ -7155,7 +7620,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 ನಿಮಿಷ ಭಾಗಗಳಲ್ಲಿ"
@@ -7166,46 +7631,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:1354
-#: ../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:1566
+#: ../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 "am"
 
 #. 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 "pm"
 
-#: ../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"
@@ -7213,9 +7666,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 "
@@ -7223,51 +7674,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"
@@ -7275,333 +7710,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 ""
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr ""
 
-#: ../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:344
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:520
+#: ../plugins/itip-formatter/itip-view.c:521
 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 ""
 
-#: ../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:730
-#: ../plugins/itip-formatter/itip-formatter.c:2009
+#: ../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:2034
 msgid "Accepted"
 msgstr "ಅಂಗೀಕರಿಸಲಾಗಿದೆ"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:733
-#: ../plugins/itip-formatter/itip-formatter.c:2012
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 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:736 ../calendar/gui/itip-utils.c:765
-#: ../plugins/itip-formatter/itip-formatter.c:2015
+#: ../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:2040
 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
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "ಬಿಡುವಿರುವ/ಕಾರ್ಯನಿರತ(_F)"
 
-#: ../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
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "ಬಿಡುವಿರುವ/ಕಾರ್ಯನಿರತ"
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:1988
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 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:753
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ರದ್ದು ಮಾಡು"
@@ -7630,107 +8064,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/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
-#: ../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/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/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/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/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/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/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:411
+#: ../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:739
-#: ../plugins/itip-formatter/itip-formatter.c:2018
+#: ../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:2043
 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:2116
+#: ../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"
 
@@ -7738,85 +8177,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:2147
+#: ../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:413
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "ಕಛೇರಿಯಿಂದ ಹೊರಕ್ಕೆ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "ಯಾವುದೆ ಮಾಹಿತಿ ಇಲ್ಲ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:429
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:450
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "ಆಯ್ಕೆಗಳು(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "ಕೆಲಸದ ವೇಳೆಯನ್ನು ಮಾತ್ರ ತೋರಿಸು(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:477
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:492
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "ಬಿಡುವು/ಕಾರ್ಯನಿರತವನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡು(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:507
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:525
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:540
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:557
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:575
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "ಅಗತ್ಯ ಜನರು(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:584
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-time-sel.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "ಆರಂಭದ ಸಮಯ(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:647
+#: ../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 ""
@@ -7841,16 +8276,16 @@ msgstr "ಭಾಷೆ"
 msgid "Member"
 msgstr "ಸದಸ್ಯ"
 
-#: ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "ಆರಿಸಲಾದ ಮೆಮೊಗಳನ್ನು ಅಳಿಸು(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1089 ../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:805 ../calendar/gui/e-tasks.c:920
-#: ../calendar/gui/gnome-cal.c:2867
+#: ../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"
@@ -7859,85 +8294,84 @@ msgstr ""
 "%s ನಲ್ಲಿ ದೋಷ:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:854
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "ಮೆಮೊಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-#: ../calendar/gui/e-memos.c:935
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s ನಲ್ಲಿ ಮೆಮೊಗಳನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ"
 
-#: ../calendar/gui/e-memos.c:1108 ../calendar/gui/e-tasks.c:1325
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: ../calendar/gui/e-tasks.c:970
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr ""
 
-#: ../calendar/gui/e-tasks.c:1057
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ನಲ್ಲಿ ಕಾರ್ಯಗಳನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ"
 
-#: ../calendar/gui/e-tasks.c:1302
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "ಕಾರ್ಯಗಳನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ..."
 
-#: ../calendar/gui/e-tasks.c:1352
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr ""
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 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:1547
+#: ../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 ""
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2691
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s ನಲ್ಲಿ ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ಗಳನ್ನು ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-#: ../calendar/gui/gnome-cal.c:2710
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s ನಲ್ಲಿ ಕಾರ್ಯಗಳನ್ನು ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-#: ../calendar/gui/gnome-cal.c:2719
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s ನಲ್ಲಿ ಮೆಮೊಗಳನ್ನು ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-#: ../calendar/gui/gnome-cal.c:2826
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "%s ಅನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ"
 
-#: ../calendar/gui/gnome-cal.c:3783
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr ""
 
@@ -7997,57 +8431,57 @@ msgstr "ಸಪ್ಟೆಂಬರ್"
 msgid "_Select Today"
 msgstr "ಇಂದಿನ ದಿನಾಂಕವನ್ನು ಆರಿಸು(_S)"
 
-#: ../calendar/gui/itip-utils.c:451 ../calendar/gui/itip-utils.c:500
-#: ../calendar/gui/itip-utils.c:606
+#: ../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:487
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "ಕಾರ್ಯದ ಮಾಹಿತಿ"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "ಮೆಮೊ ಮಾಹಿತಿ"
 
-#: ../calendar/gui/itip-utils.c:698 ../calendar/gui/itip-utils.c:837
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "ಬಿಡುವು/ಕಾರ್ಯನಿರತ ಮಾಹಿತಿ"
 
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "ಕ್ಯಾಲೆಂಡರ್ ಮಾಹಿತಿ"
 
-#: ../calendar/gui/itip-utils.c:749
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "ಅಪ್ಡೇಟ್ ಆದ"
 
-#: ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ಬಿಡುವು/ಕಾರ್ಯನಿರತ ಮಾಹಿತಿ (%s ಯಿಂದ %s ವರೆಗೆ)"
 
-#: ../calendar/gui/itip-utils.c:843
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:1010
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -8091,6 +8525,8 @@ msgid "New memo"
 msgstr "ಹೊಸ ಮೆಮೊ"
 
 #: ../calendar/gui/memos-component.c:1260
+#, fuzzy
+msgctxt "New"
 msgid "Mem_o"
 msgstr "ಮೆಮೊ(_o)"
 
@@ -8103,8 +8539,10 @@ msgid "New shared memo"
 msgstr ""
 
 #: ../calendar/gui/memos-component.c:1268
+#, fuzzy
+msgctxt "New"
 msgid "_Shared memo"
-msgstr ""
+msgstr "%d ಮೆಮೊ"
 
 #: ../calendar/gui/memos-component.c:1269
 msgid "Create a shared new memo"
@@ -8115,6 +8553,8 @@ msgid "New memo list"
 msgstr "ಹೊಸ ಮೆಮೊ ಪಟ್ಟಿ"
 
 #: ../calendar/gui/memos-component.c:1276
+#, fuzzy
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "ಮೆಮೊ ಪಟ್ಟಿ(_s)"
 
@@ -8122,11 +8562,16 @@ msgstr "ಮೆಮೊ ಪಟ್ಟಿ(_s)"
 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
+#, fuzzy
+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"
@@ -8134,7 +8579,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../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"
@@ -8143,26 +8588,27 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr ""
 
-#: ../calendar/gui/migration.c:1226
-#: ../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 "ಟಿಪ್ಪಣಿಗಳು"
 
@@ -8319,50 +8765,54 @@ msgstr "ಶುಕ್ರ"
 msgid "Sa"
 msgstr "ಶನಿ"
 
-#: ../calendar/gui/print.c:2351
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್"
 
-#: ../calendar/gui/print.c:2353
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "ಕಾರ್ಯ"
 
-#: ../calendar/gui/print.c:2375
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "ಸಾರಾಂಶ: %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2522
+msgid "Attendees: "
+msgstr ""
+
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "ಸ್ಥಿತಿ: %s"
 
-#: ../calendar/gui/print.c:2443
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "ಆದ್ಯತೆ: %s"
 
-#: ../calendar/gui/print.c:2455
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ಪೂರ್ಣಗೊಂಡ ಪ್ರತಿಶತ: %i"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2480
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: ../calendar/gui/print.c:2491
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "ಸಂಪರ್ಕವಿಳಾಸಗಳು: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "ಮುಂಬರುವ ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ಗಳು"
 
@@ -8394,39 +8844,49 @@ msgstr "ಕಾರ್ಯಗಳನ್ನು ರಚಿಸಲು ಯಾವುದೆ
 msgid "Task Source Selector"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1324
 msgid "New task"
 msgstr "ಹೊಸ ಕಾರ್ಯ"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1325
+#, fuzzy
+msgctxt "New"
+msgid "_Task"
+msgstr "ಕಾರ್ಯ(_T)"
+
+#: ../calendar/gui/tasks-component.c:1326
 msgid "Create a new task"
 msgstr "ಒಂದು ಹೊಸ ಕಾರ್ಯವನ್ನು ರಚಿಸು"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1332
 msgid "New assigned task"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1333
+#, fuzzy
+msgctxt "New"
 msgid "Assigne_d Task"
-msgstr ""
+msgstr "ಕಾರ್ಯವನ್ನು ನಿಯೋಜಿಸು(_A)"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1334
 msgid "Create a new assigned task"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1340
 msgid "New task list"
 msgstr "ಹೊಸ ಕಾರ್ಯ ಪಟ್ಟಿ"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1341
+#, fuzzy
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "ಕಾರ್ಯ ಪಟ್ಟಿ(_k)"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1342
 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"
@@ -8434,49 +8894,72 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 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
+#, 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 "ಅಪಾಯಿಂಟ್‍ಮೆಂಟ್‍ಗಳು ಹಾಗು ಮೀಟಿಂಗ್‍ಗಳು"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1562
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "ಕ್ಯಾಲೆಂಡರನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr ""
 
-#: ../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 ""
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr ""
 
-#: ../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 ""
 
@@ -10010,125 +10493,310 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: ../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"
+#: ../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."
+#: ../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"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "ಲಗತ್ತಿಸು(_t)"
+
+#: ../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:1337
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:123 ../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
+#, fuzzy
+msgid "New _Message"
+msgstr "ಸಂದೇಶ(_M)"
+
+#: ../composer/e-composer-actions.c:537
+#, fuzzy
+msgid "Open New Message window"
+msgstr "ಹೊಸ ಸಂದೇಶವನ್ನು ಇಲ್ಲಿಗೆ ಕಳುಹಿಸು(_S)..."
+
+#: ../composer/e-composer-actions.c:544
+#, fuzzy
+msgid "Character _Encoding"
+msgstr "ಕ್ಯಾರೆಕ್ಟರ್ ಎನ್ಕೋಡಿಂಗ್"
+
+#: ../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
+#, fuzzy
+msgid "Re_quest Read Receipt"
+msgstr "ಓದಿದ ಖಾತರಿಗಾಗಿನ ಮನವಿ ಸಲ್ಲಿಕೆ(_e)"
+
+#: ../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 "_Bcc ಕ್ಷೇತ್ರ"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "ಸಹಿ(_g):"
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "_Cc ಕ್ಷೇತ್ರ"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "ಇಂದ(_o):"
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
+#: ../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-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "ಗೆ(_T):"
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "'ಇಲ್ಲಿಗೆ ಕಳುಹಿಸು' ಕ್ಷೇತ್ರ(_P)"
 
-#: ../composer/e-msg-composer-hdrs.c:337
-msgid "Enter the recipients of the message"
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:340
-msgid "_Cc:"
-msgstr "_Cc:"
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "'ಇವರಿಗೆ ಉತ್ತರಿಸು' ಕ್ಷೇತ್ರ(_R)"
 
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "_Bcc:"
+#: ../composer/e-composer-actions.c:649
+#, fuzzy
+msgid "_Subject Field"
+msgstr "_Cc ಕ್ಷೇತ್ರ"
+
+#: ../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-msg-composer-hdrs.c:348
+#: ../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-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "ಇಂದ(_o):"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "ಗೆ(_T):"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "_Bcc:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr ""
 
-#: ../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"
+#: ../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-msg-composer.c:819
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../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-msg-composer.c:826
+#: ../composer/e-composer-private.c:65
 #, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "ಗೂಢಲಿಪೀಕರಣ"
+msgid "Recent _Documents"
+msgstr "ಪೂರ್ಣಗೊಂಡ ಪ್ರತಿಶತ"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
-msgid "Hide _Attachment Bar"
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1558
+msgid "Show _Attachment Bar"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3881
-msgid "Show _Attachment Bar"
+#: ../composer/e-msg-composer.c:872
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "ಗೊತ್ತಿರದ ಕಾರಣ"
+#: ../composer/e-msg-composer.c:879
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "ಗೂಢಲಿಪೀಕರಣ"
 
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "ಕಡತವನ್ನು ತೆರಯಲಾಗಲಿಲ್ಲ"
+#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
+#: ../mail/em-format-html-display.c:2405 ../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:1533
-msgid "Unable to retrieve message from editor"
+#: ../composer/e-msg-composer.c:1556
+msgid "Hide _Attachment Bar"
 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:3761
-#: ../composer/e-msg-composer.c:3764
+#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
 msgid "Compose Message"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:5024
+#: ../composer/e-msg-composer.c:4055
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10154,8 +10822,7 @@ msgstr ""
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 
-#: ../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 ""
 
@@ -10220,8 +10887,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 ""
@@ -10258,23 +10924,28 @@ 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 "ಸಂಪಾದಿಸುವುದನ್ನು ಮುಂದುವರೆಸು"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:310
+#: ../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 "ಸಂದೇಶವನ್ನು ಉಳಿಸು(_S)"
+#: ../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:672
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr ""
 
@@ -10290,56 +10961,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 ""
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+#, fuzzy
+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
-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
+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?"
@@ -10347,51 +11041,62 @@ msgstr "ಕಡತವನ್ನು ತಿದ್ದಿ ಬರೆಯಬೇಕೆ?"
 
 #: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
-msgstr ""
+msgstr "ತಿದ್ದಿಬರೆ(_O)"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
-msgstr ""
+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 ""
+msgstr "ಮಾಡಬೇಕಿರುವ(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
-msgstr ""
+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 ""
+msgstr "ಲೇಬಲ್ ಅನ್ನು ಸಂಪಾದಿಸು"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
-msgstr ""
+msgstr "ಲೇಬಲ್ ಅನ್ನು ಸೇರಿಸು"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
-msgstr ""
+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
@@ -10509,65 +11214,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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -10591,7 +11296,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 "ಕಾಣೆಯಾದ ಹೆಸರು."
 
@@ -10661,7 +11366,7 @@ msgstr ""
 msgid "months"
 msgstr "ತಿಂಗಳುಗಳು"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:181
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "ಸೆಕೆಂಡ್‍ಗಳು"
 
@@ -10673,9 +11378,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:718
 msgid "weeks"
 msgstr "ವಾರಗಳು"
 
@@ -10691,7 +11396,7 @@ msgstr ""
 msgid "Edit Rule"
 msgstr ""
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr ""
 
@@ -10700,8 +11405,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 ""
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -10713,57 +11417,72 @@ msgid "Configure your email accounts here"
 msgstr "ನಿಮ್ಮ ಇಮೈಲ್ ಖಾತೆಯನ್ನು ಇಲ್ಲಿ ಸಂರಚಿಸಿ"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+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:608
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:572 ../mail/mail-component.c:573
-#: ../mail/mail-component.c:737
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Network configuration control"
+msgstr "ಇವಲ್ಯೂಶನ್ ಕ್ಯಾಲೆಂಡರ್ ಸಂರಚನಾ ಉಪಕರಣ"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../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:100
+#: ../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
+#, fuzzy
+msgid "Network Preferences"
+msgstr "ಆದ್ಯತೆಗಳು(_n)"
+
+#: ../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 ""
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10772,115 +11491,109 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: ../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:91
+#: ../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:118
+#: ../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 ""
 
-#: ../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:66
+#: ../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:124
-#: ../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:81
+#: ../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:325
-#: ../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:987
+#: ../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:897 ../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:1702
+#: ../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:1749
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10888,11 +11601,11 @@ msgstr ""
 "${AbbrevWeekdayName} ದಂದು, ${Year}-${Month}-${Day} ನ ${24Hour} ಗೆ :${Minute} "
 "${TimeZone}, ${Sender} ಹೀಗೆ ಬರೆದಿದ್ದಾರೆ:"
 
-#: ../mail/em-composer-utils.c:1890
+#: ../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 ""
 
@@ -10909,10 +11622,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"
@@ -10929,10 +11638,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 "ಫೋಲ್ಡರಿಗೆ ನಕಲಿಸು"
@@ -10946,7 +11651,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
@@ -10957,10 +11662,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 ""
@@ -10981,10 +11682,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 ""
@@ -10993,10 +11690,6 @@ msgstr ""
 msgid "ends with"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr ""
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr ""
@@ -11009,14 +11702,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 ""
@@ -11029,18 +11718,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 ""
@@ -11053,7 +11730,7 @@ msgstr ""
 msgid "is set"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:94
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "ಜಂಕ್"
@@ -11062,7 +11739,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 "ಲೇಬಲ್"
 
@@ -11102,150 +11779,151 @@ msgstr ""
 msgid "Play Sound"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:81
+#. 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:62
 msgid "Read"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:55
 msgid "Regex Match"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:56
 msgid "Replied to"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:57
 msgid "returns"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:58
 msgid "returns greater than"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:59
 msgid "returns less than"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:60
 msgid "Run Program"
 msgstr "ಪ್ರೊಗ್ರಾಂ ಅನ್ನು ಚಲಾಯಿಸು"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "ಕಳುಹಿಸಿದವರು"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:63
 msgid "Set Label"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "ಗಾತ್ರ (kB)"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "ಮೂಲ ಖಾತೆ"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:71 ../mail/em-format-html.c:1696
-#: ../mail/em-format-quote.c:320 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:336
+#: ../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:311
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:73
 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 ""
 
-#: ../mail/em-folder-browser.c:188
+#: ../mail/em-folder-browser.c:189
 msgid "C_reate Search Folder From Search..."
 msgstr ""
 
-#: ../mail/em-folder-browser.c:213
+#: ../mail/em-folder-browser.c:214
 msgid "All Messages"
 msgstr "ಎಲ್ಲಾ ಸಂದೇಶಗಳು"
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "Unread Messages"
 msgstr "ಓದದೆ ಇರುವ ಸಂದೇಶಗಳು"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:217
 msgid "No Label"
 msgstr "ಯಾವುದೆ ಲೇಬಲ್ ಇಲ್ಲ"
 
-#: ../mail/em-folder-browser.c:223
+#: ../mail/em-folder-browser.c:224
 msgid "Read Messages"
 msgstr "ಓದಲಾದ ಸಂದೇಶಗಳು"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Recent Messages"
 msgstr "ಇತ್ತೀಚಿನ ಸಂದೇಶಗಳು"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Last 5 Days' Messages"
 msgstr "5 ದಿನಗಳ ಹಿಂದಿನ ಸಂದೇಶಗಳು"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Messages with Attachments"
 msgstr ""
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Important Messages"
 msgstr "ಪ್ರಮುಖ ಸಂದೇಶಗಳು"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Messages Not Junk"
 msgstr "ಸಂದೇಶವು ಜಂಕ್ ಅಲ್ಲ"
 
-#: ../mail/em-folder-browser.c:1104
+#: ../mail/em-folder-browser.c:1170
 msgid "Account Search"
 msgstr ""
 
-#: ../mail/em-folder-browser.c:1148
+#: ../mail/em-folder-browser.c:1223
 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] "ಓದದೆ ಇರುವ ಸಂದೇಶಗಳು:"
@@ -11253,31 +11931,46 @@ 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
+#, fuzzy
+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 "<ಒಂದು ಫೋಲ್ಡರನ್ನು ಆರಿಸಲು ಇಲ್ಲಿ ಕ್ಲಿಕ್ಕಿಸಿ>"
 
-#: ../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:921 ../mail/mail-vfolder.c:1005
+#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr ""
 
@@ -11286,27 +11979,19 @@ msgstr ""
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../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:83
-#: ../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 "ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."
 
@@ -11325,383 +12010,373 @@ msgstr "ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr "%s (%u)"
+#: ../mail/em-folder-tree.c:380
+#, fuzzy, c-format
+msgctxt "folder-display"
+msgid "%s (%u)"
+msgstr "%s (...)"
 
-#: ../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:1965
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ಸಂದೇಶಗಳನ್ನು %s ಫೋಲ್ಡರಿಗೆ ಸ್ಥಳಾಂತರಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1967
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, 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:104
 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:117
 msgid "_Move to Folder"
 msgstr "ಫೋಲ್ಡರಿಗೆ ಸ್ಥಳಾಂತರಿಸು(_M)"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1055
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: ../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 ""
-
-#: ../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 ""
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' ಅನ್ನು `%s' ಗೆ ನಕಲಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "ಫೋಲ್ಡರನ್ನು ಆರಿಸು"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "ನಕಲಿಸು(_o)"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:586
 #: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' ಫೋಲ್ಡರನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/em-folder-utils.c:746
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:386
+#: ../mail/em-folder-utils.c:744
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "ಫೋಲ್ಡರನ್ನು ರಚಿಸು"
 
-#: ../mail/em-folder-utils.c:746
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:386
+#: ../mail/em-folder-utils.c:744
+#: ../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:1092 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "ಮೈಲ್ ಅಳಿಸುವುದು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../mail/em-folder-view.c:1093 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ಈ ಮೈಲನ್ನು ಅಳಿಸಲು ನಿಮಗೆ ಸಾಕಷ್ಟು ಅನುಮತಿಗಳಿಲ್ಲ."
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "ಕಳುಹಿಸಿದವರಿಗೆ ಪ್ರತ್ಯುತ್ತರಿಸು(_R)"
 
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:578 ../mail/em-popup.c:589
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../ui/evolution-mail-message.xml.h:109
 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:1337 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "ಹೊಸ ಸಂದೇಶವಾಗಿ ಸಂಪಾದಿಸು(_E)..."
 
-#: ../mail/em-folder-view.c:1339
-#: ../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:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "ಅಳಿಸಬೇಡ(_n)"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "ಫೋಲ್ಡರಿಗೆ ಸ್ಥಳಾಂತರಿಸು(_M)..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "ಫೋಲ್ಡರಿಗೆ ನಕಲಿಸು(_M)..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "ಓದಲಾಗಿದೆ ಎಂದು ಗುರುತು ಹಾಕು(_k)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "ಓದಲಾಗಿಲ್ಲ ಎಂದು ಗುರುತು ಹಾಕು(_U)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "ಜಂಕ್ ಎಂದು ಗುರುತು ಹಾಕು(_J)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "ಜಂಕ್ ಅಲ್ಲವೆಂದು ಗುರುತು ಹಾಕು(_N)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 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:1357 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "ಯಾವುದೂ ಇಲ್ಲ(_N)"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "ಹೊಸ ಲೇಬಲ್(_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 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:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 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:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2266 ../mail/em-folder-view.c:2310
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../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 "ಪೂರ್ವನಿಯೋಜಿತ"
 
-#: ../mail/em-folder-view.c:2528
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr ""
 
-#: ../mail/em-folder-view.c:2547
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:2775
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:2778
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr ""
 
-#: ../mail/em-folder-view.c:2779
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "ಈ ವಿಳಾಸದಿಂದ(_F)"
 
-#: ../mail/em-folder-view.c:2780
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "ಈ ವಿಳಾಸಕ್ಕೆ(_T)"
 
-#: ../mail/em-folder-view.c:3276
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s ಗೆ ಮೈಲ್ ಮಾಡಲು ಕ್ಲಿಕ್ಕಿಸಿ"
 
-#: ../mail/em-folder-view.c:3288
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "%s ಗೆ ಕರೆ ಮಾಡಲು ಕ್ಲಿಕ್ಕಿಸಿ"
 
-#: ../mail/em-folder-view.c:3293
+#: ../mail/em-folder-view.c:3313
 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:470
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:614
 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:638
 msgid "_Previous"
 msgstr "ಹಿಂದಿನ(_P)"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "ಮುಂದಿನ(_N)"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:635
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:649
 msgid "Unsigned"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:947
 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:636
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Valid signature"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:993
+#: ../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."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:637
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Invalid signature"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:949
 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:638
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Valid signature, but cannot verify sender"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:995
+#: ../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."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:639
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Signature exists, but need public key"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:951
 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:645
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:659
 msgid "Unencrypted"
 msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಳ್ಳದ"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:958
 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:646
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Encrypted, weak"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:959
 #, fuzzy
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
@@ -11709,21 +12384,21 @@ msgid ""
 "message in a practical amount of time."
 msgstr "ಗೂಢಲಿಪೀಕರಣ"
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted"
 msgstr "ಗೂಢಲಿಪೀಕರಣಗೊಂಡ"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../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."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted, strong"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:961
 #, fuzzy
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
@@ -11731,94 +12406,89 @@ msgid ""
 "practical amount of time."
 msgstr "ಗೂಢಲಿಪೀಕರಣ"
 
-#: ../mail/em-format-html-display.c:1107 ../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 "ಪ್ರಮಾಣಪತ್ರವನ್ನು ವೀಕ್ಷಿಸು(_V)"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "ಈ ಪ್ರಮಾಣಪತ್ರವನ್ನು ವೀಕ್ಷಿಸಲಾಗುವುದಿಲ್ಲ"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1371
 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:1379
 msgid "Overdue:"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1382
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1460
 msgid "_View Inline"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1461
 msgid "_Hide"
 msgstr "ಅಡಗಿಸು(_H)"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1462
 msgid "_Fit to Width"
 msgstr "ಗಾತ್ರಕ್ಕೆ ಹೊಂದಿಸು(_F)"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1463
 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:1983
 msgid "Save attachment as"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1987
 msgid "Select folder to save all attachments"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2038
 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:2105
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
 msgid "S_ave"
 msgstr "ಉಳಿಸು(_a)"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2123
 msgid "S_ave All"
 msgstr "ಎಲ್ಲವನ್ನೂ ಉಳಿಸು(_a)"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2197
 msgid "No Attachment"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
 msgid "View _Unformatted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2340
 msgid "Hide _Unformatted"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
 msgstr "ಇದರೊಂದಿಗೆ ತೆರೆ(_p)"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2468
 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 ""
 
@@ -11827,318 +12497,350 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr ""
 
-#: ../mail/em-format-html.c:489 ../mail/em-format-html.c:498
+#: ../mail/em-format-html.c:503 ../mail/em-format-html.c:512
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: ../mail/em-format-html.c:910
+#: ../mail/em-format-html.c:924
 msgid "Unknown external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:918
+#: ../mail/em-format-html.c:932
 msgid "Malformed external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:948
+#: ../mail/em-format-html.c:962
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:959
+#: ../mail/em-format-html.c:973
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: ../mail/em-format-html.c:961
+#: ../mail/em-format-html.c:975
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:982
+#: ../mail/em-format-html.c:996
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:993
+#: ../mail/em-format-html.c:1007
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: ../mail/em-format-html.c:1221
+#: ../mail/em-format-html.c:1235
 msgid "Formatting message"
 msgstr "ಸಂದೇಶವನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/em-format-html.c:1388
+#: ../mail/em-format-html.c:1409
 msgid "Formatting Message..."
 msgstr "ಸಂದೇಶವನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."
 
-#: ../mail/em-format-html.c:1540 ../mail/em-format-html.c:1604
-#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:889 ../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:1541 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1629 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:890 ../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 "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1700 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1287
+#: ../mail/em-format-html.c:1743 ../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:1727
+#: ../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:1732
+#: ../mail/em-format-html.c:1775
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:336
-#: ../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:1767 ../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:1860
+#: ../mail/em-format-html.c:1906
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:332
+#: ../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:307
 msgid "From"
 msgstr "ಯಿಂದ"
 
-#: ../mail/em-format-quote.c:207 ../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 ""
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 #, fuzzy
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ಗೂಢಲಿಪೀಕರಣ"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr ""
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 
-#: ../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:1658
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr ""
 
-#: ../mail/em-format.c:1658
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr ""
 
-#: ../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:319
+#: ../mail/em-mailer-prefs.c:326
+#, fuzzy
+msgid "Add Custom Junk Header"
+msgstr "ಕಸ್ಟಮ್ ಹೆಡರುಗಳು"
+
+#: ../mail/em-mailer-prefs.c:330
+#, fuzzy
+msgid "Header Name:"
+msgstr "ಫೋಲ್ಡರ್ ಹೆಸರು(_F):"
+
+#: ../mail/em-mailer-prefs.c:331
+msgid "Header Value Contains:"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:436
+#, fuzzy
+msgid "Contains Value"
+msgstr "ಮುಂದುವರೆ"
+
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "ಬಣ್ಣ"
 
-#: ../mail/em-mailer-prefs.c:322
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:915 ../mail/em-mailer-prefs.c:969
+#: ../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:923 ../mail/em-mailer-prefs.c:978
+#: ../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 ""
 
-#: ../mail/em-mailer-prefs.c:944
+#: ../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 ""
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: ../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 ""
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
+"Evolution 1.x ನ ಈಚೆಗೆ ಇವಲ್ಯೂಶನ್‍ನ ಸಂಪರ್ಕವಿಳಾಸ ಫೋಲ್ಡರುಗಳ ಸ್ಥಳ ಹಾಗು ಅನುಕ್ರಮವು "
+"ಬದಲಾಗಿದೆ.\n"
+"\n"
+"ಇವಲ್ಯೂಶನ್ ನಿಮ್ಮ ಫೋಲ್ಡರ್‍ಗಳನ್ನು ರವಾನಿಸುವವರೆಗೆ ದಯವಿಟ್ಟು ತಾಳ್ಮೆಯಿಂದ ಕಾಯಿರಿ..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "ಕಳುಹಿಸಿದವರಿಗೆ ಪ್ರತ್ಯುತ್ತರಿಸು(_R)"
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../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:629 ../mail/em-popup.c:858
 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 ""
@@ -12152,160 +12854,235 @@ msgid "Search Folder source"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:1
-msgid "Allows evolution to display text part of limited size"
+msgid "\"Send and Receive Mail\" window height"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:2
-msgid "Always request read receipt"
+msgid "\"Send and Receive Mail\" window maximize state"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:3
-msgid "Amount of time in seconds the error should be showed on the status bar."
+msgid "\"Send and Receive Mail\" window width"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Automatic emoticon recognition"
+msgid "Allows evolution to display text part of limited size"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:5
-msgid "Automatic link recognition"
+msgid "Always request read receipt"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:6
-msgid "Check incoming mail being junk"
+msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:7
-msgid "Citation highlight color"
+msgid "Automatic emoticon recognition"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:8
-msgid "Citation highlight color."
+msgid "Automatic link recognition"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:9
-msgid "Composer Window default height"
+msgid "Check incoming mail being junk"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Composer Window default width"
+msgid "Citation highlight color"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:11
-msgid "Composer load/attach directory"
+msgid "Citation highlight color."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:12
-msgid "Compress display of addresses in TO/CC/BCC"
+msgid "Composer Window default height"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:13
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
+msgid "Composer Window default width"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:14
-msgid "Default charset in which to compose messages"
+msgid "Composer load/attach directory"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:15
-msgid "Default charset in which to compose messages."
+msgid "Compress display of addresses in TO/CC/BCC"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:16
-msgid "Default charset in which to display messages"
+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 "Default charset in which to display messages."
+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
-msgid "Default forward style"
+msgid "Custom headers to use while checking for junk."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:19
-msgid "Default height of the Composer Window"
+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:20
-msgid "Default height of the Message Window"
+msgid "Default charset in which to compose messages"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:21
-msgid "Default height of the Subscribe dialog"
+msgid "Default charset in which to compose messages."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:22
-msgid "Default reply style"
+msgid "Default charset in which to display messages"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:23
-msgid "Default value for thread expand state"
+msgid "Default charset in which to display messages."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:24
-msgid "Default width of the Composer Window"
+msgid "Default forward style"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:25
-msgid "Default width of the Message Window"
-msgstr ""
+#, fuzzy
+msgid "Default height of the Composer Window."
+msgstr "ಮುಖ್ಯ ವಿಂಡೋದ ಪೂರ್ವನಿಯೋಜಿತ ಎತ್ತರ (ಪಿಕ್ಸೆಲ್‍ಗಳಲ್ಲಿ)."
 
 #: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default width of the Subscribe dialog"
-msgstr ""
+#, fuzzy
+msgid "Default height of the message window."
+msgstr "ಮುಖ್ಯ ವಿಂಡೋದ ಪೂರ್ವನಿಯೋಜಿತ ಎತ್ತರ (ಪಿಕ್ಸೆಲ್‍ಗಳಲ್ಲಿ)."
 
 #: ../mail/evolution-mail.schemas.in.h:27
-msgid "Directory for loading/attaching files to composer"
+msgid "Default height of the subscribe dialog."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:28
-msgid "Directory for saving mail component files"
+msgid "Default reply style"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:29
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default value for thread expand state"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:30
-msgid "Empty Junk folders on exit"
-msgstr ""
+#, fuzzy
+msgid "Default width of the Composer Window."
+msgstr "ಬದಿಪಟ್ಟಿಯ ಪೂರ್ವನಿಯೋಜಿತ ಅಗಲ (ಪಿಕ್ಸೆಲ್‍ಗಳಲ್ಲಿ)."
 
 #: ../mail/evolution-mail.schemas.in.h:31
-msgid "Empty Trash folders on exit"
-msgstr ""
+#, fuzzy
+msgid "Default width of the message window."
+msgstr "ಮುಖ್ಯ ವಿಂಡೋದ ಪೂರ್ವನಿಯೋಜಿತ ಅಗಲ (ಪಿಕ್ಸೆಲ್‍ಗಳಲ್ಲಿ)."
 
 #: ../mail/evolution-mail.schemas.in.h:32
-msgid "Empty all Junk folders when exiting Evolution."
-msgstr ""
+#, fuzzy
+msgid "Default width of the subscribe dialog."
+msgstr "ಬದಿಪಟ್ಟಿಯ ಪೂರ್ವನಿಯೋಜಿತ ಅಗಲ (ಪಿಕ್ಸೆಲ್‍ಗಳಲ್ಲಿ)."
 
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid "Empty all Trash folders when exiting Evolution."
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:34
-msgid "Enable Search Folders"
+msgid "Determines whether to lookup in addressbook for sender email"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:35
-msgid "Enable Search Folders on startup."
+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:36
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:37
-msgid "Enable or disable magic space bar"
+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:38
-msgid "Enable or disable type ahead search feature"
+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:39
+#, fuzzy
+msgid "Directory for loading/attaching files to composer."
+msgstr "ಅಲಾರಂನ ಧ್ವನಿ ಕಡತಗಳನ್ನು ಉಳಿಸಲು ಇರುವ ಕಡತಕೋಶ"
+
+#: ../mail/evolution-mail.schemas.in.h:40
+#, fuzzy
+msgid "Directory for saving mail component files."
+msgstr "ಅಲಾರಂನ ಧ್ವನಿ ಕಡತಗಳನ್ನು ಉಳಿಸಲು ಇರುವ ಕಡತಕೋಶ"
+
+#: ../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:43
+msgid "Empty Junk folders on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid "Empty Trash folders on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: ../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:48
+msgid "Enable or disable magic space bar"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Enable or disable type ahead search feature"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:50
+#, fuzzy
+msgid "Enable search folders"
+msgstr "ಫೋಲ್ಡರಿನಲ್ಲಿ ಹುಡುಕು(_o)"
+
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../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 "
@@ -12313,369 +13090,408 @@ msgid ""
 "that folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "ಸಂದೇಶ-ಪಟ್ಟಿ ಫಲಕದ ಎತ್ತರ"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "ಸಂದೇಶ-ಪಟ್ಟಿ ಫಲಕದ ಎತ್ತರ."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../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:48
+#: ../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 "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
-"It disables the feature where repeated prompts to ask if delete messages "
-"from search folder."
+"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:50
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
-"It disables the feature where repeated prompts to ask if offline sync is "
-"required."
+"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:51
+#: ../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:52
+#: ../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: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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:54
-msgid "Level beyond which it should the message should be logged."
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Level beyond which the message should be logged."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../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:79
+#: ../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:80
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../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:83
-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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../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:85
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../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:89
+#: ../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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../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:91
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid "Run junk test on incoming mail"
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Run junk test on incoming mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ HTML ಮೈಲನ್ನು ಕಳುಹಿಸು"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ HTML ಮೈಲನ್ನು ಕಳುಹಿಸು."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid "Sender email-address column in the message list"
+msgstr ""
+
+#: ../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:101
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../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:103
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
+"Show the email-address of the sender in a separate column in the message "
+"list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../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:109
-msgid "Show the sender email in the messages column in the message list"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:129
+#, fuzzy
+msgid "Spell checking color"
+msgstr "ಕಾಗುಣಿತ ಪರೀಕ್ಷೆ"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+#, fuzzy
+msgid "Spell checking languages"
+msgstr "ಕಾಗುಣಿತ ಪರೀಕ್ಷೆ"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../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:117
+#: ../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:118
-msgid "The terminal font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "The terminal font for mail display."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:119
-msgid "The variable width font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "The variable width font for mail display."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../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:123
+#: ../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:124
+#: ../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;"
@@ -12683,172 +13499,188 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../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:126
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../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"
+"collapsed state by default. Evolution requires a restart."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Timeout for marking message as seen"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Timeout for marking message as seen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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:136
-msgid "Use SpamAssassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "ಕಸ್ಟಮ್ ಅಕ್ಷರಶೈಲಿಗಳನ್ನು ಬಳಸು"
 
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "Use custom fonts for displaying mail"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:160
+#, fuzzy
+msgid "Use custom fonts for displaying mail."
+msgstr "ಕಸ್ಟಮ್ ಅಕ್ಷರಶೈಲಿಗಳನ್ನು ಬಳಸು"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../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:154
+#: ../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:155
+#: ../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:156
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../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 ""
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr ""
 
-#: ../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 ""
 
@@ -12856,7 +13688,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:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' ಅನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"
@@ -12866,15 +13698,15 @@ msgstr "`%s' ಅನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಲಾಗ�
 msgid "Scanning %s"
 msgstr ""
 
-#: ../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 ""
 
@@ -12902,145 +13734,164 @@ msgstr "%s ಮೈಲಿಂಗ್ ಲಿಸ್ತ್‍"
 msgid "Add Filter Rule"
 msgstr ""
 
-#: ../mail/mail-component.c:533
+#: ../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:537
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "ಅಳಿಸಲ್ಪಟ್ಟ %d"
 msgstr[1] "ಅಳಿಸಲ್ಪಟ್ಟ %d"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "ಜಂಕ್ %d"
 msgstr[1] "ಜಂಕ್ %d"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "ಡ್ರಾಫ್ಟ್‍ %d"
 msgstr[1] "ಡ್ರಾಫ್ಟ್‍ %d"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "ಕಳುಹಿಸಿದ %d"
 msgstr[1] "ಕಳುಹಿಸಿದ %d"
 
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "ಕಳುಹಿಸದೆ ಇರುವ %d"
 msgstr[1] "ಕಳುಹಿಸದೆ ಇರುವ %d"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "ಓದದೆ ಇರುವ %d, "
 msgstr[1] "ಓದದೆ ಇರುವ %d, "
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "ಒಟ್ಟು %d"
 msgstr[1] "ಒಟ್ಟು %d"
 
-#: ../mail/mail-component.c:890
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "ಹೊಸ ಮೈಲ್ ಸಂದೇಶ"
 
-#: ../mail/mail-component.c:891
+#: ../mail/mail-component.c:917
+#, fuzzy
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "ಮೈಲ್ ಸಂದೇಶ(_M)"
 
-#: ../mail/mail-component.c:892
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "ಒಂದು ಹೊಸ ಮೈಲ್ ಸಂದೇಶವನ್ನು ರಚಿಸು"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "ಹೊಸ ಮೈಲ್ ಫೋಲ್ಡರ್"
 
-#: ../mail/mail-component.c:899
+#: ../mail/mail-component.c:925
+#, fuzzy
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ಮೈಲ್ ಫೋಲ್ಡರ್(_F)"
 
-#: ../mail/mail-component.c:900
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "ಒಂದು ಹೊಸ ಮೈಲ್ ಫೋಲ್ಡರನ್ನು ರಚಿಸು"
 
-#: ../mail/mail-component.c:1047
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: ../mail/mail-component.c:1516
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "ದೋಷ"
 
-#: ../mail/mail-component.c:1516
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "ದೋಷಗಳು"
 
-#: ../mail/mail-component.c:1517
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "ಎಚ್ಚರಿಕೆಗಳು ಹಾಗು ದೋಷಗಳು"
 
-#: ../mail/mail-component.c:1518
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr ""
 
-#: ../mail/mail-component.c:1518
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr ""
 
-#: ../mail/mail-component.c:1628
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr ""
 
-#: ../mail/mail-component.c:1632
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr ""
 
-#: ../mail/mail-component.c:1639
-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
+#, fuzzy
+msgid "second(s)."
 msgstr "ಸೆಕೆಂಡುಗಳು."
 
-#: ../mail/mail-component.c:1649
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr ""
 
-#: ../mail/mail-component.c:1701
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr ""
 
-#: ../mail/mail-component.c:1708 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1801 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "ಸಮಯ"
 
-#: ../mail/mail-component.c:1715 ../mail/message-list.c:2397
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2435
 #: ../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 ""
 
 #: ../mail/mail-config.glade.h:2
-msgid "(Note: Requires restart)"
+msgid "(Note: Requires restart of the application)"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:4
@@ -13048,8 +13899,9 @@ 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 ""
+#, fuzzy
+msgid "<b>Sender Photograph</b>"
+msgstr "<b>ಪರಿಚಾರಕದ ಮಾಹಿತಿ</b>"
 
 #: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
@@ -13129,73 +13981,74 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">ಮುದ್ರಿಸಲಾದ ಅಕ್ಷರಶೈಲಿ</span>"
 
 #: ../mail/mail-config.glade.h:27
+#, fuzzy
+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 ""
 
-#: ../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 ""
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "ಮೂಲ ಸಂದೇಶವನ್ನು ಲಗತ್ತಿಸು"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr ""
@@ -13217,34 +14070,38 @@ msgid "Ch_eck for Supported Types "
 msgstr ""
 
 #: ../mail/mail-config.glade.h:51
-msgid "Check incoming _messages for junk"
+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:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "ಅಳಿಸು(_a)"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "ಅಳಿಸು(_r)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "ಕಾಗುಣಿತ ತಪ್ಪಾದ ಅಕ್ಷರಗಳ ಬಣ್ಣ(_m):"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13260,409 +14117,470 @@ msgstr ""
 "\n"
 "ನಿಮ್ಮ ಸಂಯೋಜನೆಗಳನ್ನು ಉಳಿಸಲು \"ಅನ್ವಯಿಸು\" ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ."
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ(_f)"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಕ್ಯಾರೆಕ್ಟರ್ ಎನ್ಕೋಡಿಂಗ್‍ಗಳು(_n):"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:68
 msgid "Delete junk messages on e_xit"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:69
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr ""
-
 #: ../mail/mail-config.glade.h:70
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Digitally sign o_utgoing messages (by default)"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not quote original message"
-msgstr "ಮೂಲ ಸಂದೇಶವನ್ನು ಬರೆಯಬೇಡ"
+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 ""
+
+#: ../mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Do not quote"
+msgstr "ಅಳಿಸಬೇಡ"
+
+#: ../mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "ಆಯಿತು"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "ಇಮೈಲ್ ಖಾತೆಗಳು"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "ಇಮೈಲ್ ವಿಳಾಸ (_A):"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:79
 msgid "Enable Magic S_pacebar "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:82
 msgid "Encrypt out_going messages (by default)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:85
 msgid "Fix_ed width Font:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "ಅಕ್ಷರಶೈಲಿಯ ಗುಣಲಕ್ಷಣಗಳು"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "ಸಂದೇಶಗಳನ್ನು _HTML ನಲ್ಲಿ ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡು"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:88
 msgid "Full Nam_e:"
 msgstr "ಸಂಪೂರ್ಣ ಹೆಸರು(_e):"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:90
 msgid "HTML Messages"
 msgstr "HTML ಸಂದೇಶಗಳು"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:91
+#, fuzzy
+msgid "H_TTP Proxy:"
+msgstr "ಅಂಚೆಪೆಟ್ಟಿಗೆ(_P):"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "ಹೆಡರುಗಳು"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:93
-msgid "Inline original message (Outlook style)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:96 ../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:97
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "ಭಾಷೆಗಳ ಪಟ್ಟಿ"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "ಮೈಲ್ ಸಂರಚನೆ"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:103
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:104
+#: ../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:105
+#: ../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:106
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:112
+#, fuzzy
+msgid "Pass_word:"
+msgstr "ಗುಪ್ತಪದ(_P):"
+
+#: ../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 ""
 
-#: ../mail/mail-config.glade.h:110
+#: ../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:111
+#: ../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:112
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:113
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
+#: ../mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Port:"
+msgstr "ಸಂಪರ್ಕಸ್ಥಾನ(_P):"
 
-#: ../mail/mail-config.glade.h:114
-msgid "Quote original message"
+#: ../mail/mail-config.glade.h:120
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "ಗುಪ್ತಪದವನ್ನು ನೆನಪಿಟ್ಟುಕೊ(_m)"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "ಇಲ್ಲಿಗೆ ಉತ್ತರಿಸು(_p):"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "ಗುಪ್ತಪದವನ್ನು ನೆನಪಿಟ್ಟುಕೊ(_p)"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "ಆರಿಸು(_e)..."
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:125
-msgid "Select Drafts Folder"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:130
-msgid "Select Sent Folder"
-msgstr ""
-
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
 "for display purposes only. "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:146
+#: ../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:148 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+#, fuzzy
+msgid "Us_ername:"
+msgstr "ಬಳಕೆದಾರ ಹೆಸರು(_n):"
+
+#: ../mail/mail-config.glade.h:155
+#, fuzzy
+msgid "Use Authe_ntication"
+msgstr "ದೃಢೀಕರಣ"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../plugins/google-account-setup/google-source.c:678
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "ಬಳಕೆದಾರ ಹೆಸರು(_n):"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "ಸಹಿಯನ್ನು ಸೇರಿಸು(_A)"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "ಯಾವಾಗಲೂ ಅಂತರ್ಜಾಲದಿಂದ ಚಿತ್ರಗಳನ್ನು ಲೋಡ್ ಮಾಡು(_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../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:156
+#: ../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:158
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "ಸಂಪರ್ಕವಿಳಾಸಗಳಿಂದ ಸಂದೇಶಗಳಲ್ಲಿ ಚಿತ್ರಗಳನ್ನು ಲೋಡ್ ಮಾಡು(_L)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../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:162
+#: ../mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Manual proxy configuration:"
+msgstr "ಮೈಲ್ ಸಂರಚನೆ"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "ಓದಿದ ನಂತರ ಸಂದೇಶಗಳನ್ನು ಗುರುತು ಹಾಕು(_M)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "ಅಂತರ್ಜಾಲದಿಂದ ಎಂದಿಗೂ ಚಿತ್ರಗಳನ್ನು ಲೋಡ್ ಮಾಡಬೇಡ(_N)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "ಪಥ(_P):"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "ಸ್ಕ್ರಿಪ್ಟ್‍(_S):"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr ""
+
+#: ../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:173
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "ಸುರಕ್ಷಿತ ಸಂಪರ್ಕವನ್ನು ಬಳಸು(_U):"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:190
+#, fuzzy
+msgid "_Use system defaults"
+msgstr "ಪೂರ್ವನಿಯೋಜಿತವನ್ನು ಬಳಸು(_D)"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "ವಿಳಾಸಗಳು"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "ಬಣ್ಣ"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "ವಿವರಣೆ"
 
@@ -13702,65 +14620,65 @@ msgstr ""
 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:297
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
 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."
 msgstr ""
 
-#: ../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 ""
 
-#: ../mail/mail-folder-cache.c:823
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "%s ಅನ್ನು ಪಿಂಗ್ ಮಾಡಲಾಗುತ್ತಿದೆ"
@@ -13805,11 +14723,11 @@ msgstr ""
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "ರದ್ದು ಮಾಡಲಾಗಿದೆ."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "ಪೂರ್ಣಗೊಂಡಿದೆ."
 
@@ -13827,176 +14745,185 @@ msgstr "%s ಗೆ ಸಂದೇಶಗಳನ್ನು ಸ್ಥಳಾಂತರಿ�
 msgid "Copying messages to %s"
 msgstr "%s ಗೆ ಸಂದೇಶಗಳನ್ನು ನಕಲಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/mail-ops.c:1161
+#: ../mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "ಫಾರ್ವರ್ಡ್ ಮಾಡಲಾದ ಸಂದೇಶಗಳು"
 
-#: ../mail/mail-ops.c:1202
+#: ../mail/mail-ops.c:1205
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s ಫೋಲ್ಡರನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/mail-ops.c:1267
+#: ../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 ""
 
-#: ../mail/mail-ops.c:1338
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s ಫೋಲ್ಡರನ್ನು ತೆಗೆದು ಹಾಕಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/mail-ops.c:1427
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1490
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' ಖಾತೆಯನ್ನು ಉಳಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/mail-ops.c:1545
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1582 ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1629
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "ಸ್ಥಳೀಯ ಫೋಲ್ಡರ್"
 
-#: ../mail/mail-ops.c:1711
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-ops.c:1903
-#, c-format
+#: ../mail/mail-ops.c:1978
+#, fuzzy, 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:1973
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2045
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr ""
 
-#: ../mail/mail-ops.c:2057 ../mail/mail-ops.c:2063
+#: ../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:2073
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ದತ್ತಾಂಶವನ್ನು ಬರೆಯಲಾಗಲಿಲ್ಲ: %s"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ನಿಂದ ಸಂಪರ್ಕ ಕಡಿದುಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ನೊಂದಿಗೆ ಪುನರ್ ಸಂಪರ್ಕ ಹೊಂದಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "ಜಾಲದಿಂದ ಹೊರಗೆ ಬಳಸಲು '%s' ಖಾತೆಯನ್ನು ತಯಾರು ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/mail-ops.c:2401
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "ಸೇವೆಯನ್ನು ಪರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "ರದ್ದುಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "ಎಲ್ಲವನ್ನೂ ರದ್ದುಗೊಳಿಸು(_A)"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "ಅಪ್ಡೇಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "ಕಾಯಲಾಗುತ್ತಿದೆ..."
 
-#: ../mail/mail-send-recv.c:792
+#: ../mail/mail-send-recv.c:799
+#, c-format
 msgid "Checking for new mail"
 msgstr "ಹೊಸ ಮೈಲ್‍ಗಾಗಿ ಕಾಯಲಾಗುತ್ತಿದೆ"
 
-#: ../mail/mail-session.c:204
+#: ../mail/mail-session.c:205
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s ಗಾಗಿ ಗುಪ್ತನುಡಿಯನ್ನು ನಮೂದಿಸಿ"
 
-#: ../mail/mail-session.c:206
+#: ../mail/mail-session.c:207
 msgid "Enter Passphrase"
 msgstr "ಗುಪ್ತನುಡಿಯನ್ನು ನಮೂದಿಸಿ"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:210
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ಗಾಗಿ ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸಿ"
 
-#: ../mail/mail-session.c:211
+#: ../mail/mail-session.c:212
 msgid "Enter Password"
 msgstr "ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸಿ"
 
-#: ../mail/mail-session.c:253
+#: ../mail/mail-session.c:254
 msgid "User canceled operation."
 msgstr "ಬಳಕೆದಾರ ರದ್ದುಪಡಿಸಿದ ಕಾರ್ಯಾಚರಣೆ."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "ಸಹಿಯನ್ನು ಸಂಪಾದಿಸು"
+#: ../mail/mail-signature-editor.c:201
+#, fuzzy
+msgid "_Save and Close"
+msgstr "ಉಳಿಸು ಹಾಗು ಮುಚ್ಚು"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "ಈ ಸಹಿಗೆ ಒಂದು ಹೆಸರನ್ನು ನಮೂದಿಸು."
+#: ../mail/mail-signature-editor.c:355
+#, fuzzy
+msgid "Edit Signature"
+msgstr "ಸಹಿಯನ್ನು ಸಂಪಾದಿಸು"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "ಹೆಸರು:"
+#: ../mail/mail-signature-editor.c:370
+#, fuzzy
+msgid "_Signature Name:"
+msgstr "ಸಹಿ(_g):"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14037,31 +14964,31 @@ msgstr ""
 msgid "Updating Search Folders for '%s'"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:1044
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:1134
+#: ../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."
+#, fuzzy
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 "&quot;{0}&quot; ಎಂಬ ಹೆಸರಿನ ಫೋಲ್ಡರ್ ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ದಯವಿಟ್ಟು ಬೇರೊಂದು "
 "ಹೆಸರನ್ನು ಬಳಸಿ."
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "&quot;{1}&quot; ಎಂಬ ಹೆಸರಿನ ಫೋಲ್ಡರ್ ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ದಯವಿಟ್ಟು ಬೇರೊಂದು "
 "ಹೆಸರನ್ನು ಬಳಸಿ."
 
 #: ../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."
@@ -14069,15 +14996,18 @@ msgstr ""
 
 #: ../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 ""
 
 #: ../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 ""
+"&quot;{0}&quot; ಎಂಬ ಹೆಸರಿನ ಫೋಲ್ಡರ್ ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ದಯವಿಟ್ಟು ಬೇರೊಂದು "
+"ಹೆಸರನ್ನು ಬಳಸಿ."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14094,8 +15024,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 ""
 "ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಹಾಗು ಅದರ ಎಲ್ಲಾ ಪ್ರಾಕ್ಸಿಗಳನ್ನು ಖಚಿತವಾಗಿಯೂ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು "
 "ಬಯಸುತ್ತೀರೇನು?"
@@ -14111,10 +15040,11 @@ msgid ""
 msgstr ""
 
 #: ../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;?"
-msgstr ""
+"folder \"{0}\"?"
+msgstr "ಈ ಫೋಲ್ಡರನಿಂದ ಅಳಿಸಿ ಹಾಕಲಾದ ಎಲ್ಲಾ ಸಂದೇಶಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ತೆಗೆದುಹಾಕು"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14129,11 +15059,13 @@ 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;."
+#, fuzzy
+msgid "Because \"{0}\"."
 msgstr "ಏಕೆಂದರೆ &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+#, fuzzy
+msgid "Because \"{2}\"."
 msgstr "ಏಕೆಂದರೆ &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:21
@@ -14141,15 +15073,17 @@ msgid "Blank Signature"
 msgstr "ಖಾಲಿ ಸಹಿ"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "&quot;{0}&quot; ಫೋಲ್ಡರನ್ನು &quot;{1}&quot; ಗೆ ನಕಲಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
 msgstr "&quot;{0}&quot; ಫೋಲ್ಡರನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ."
 
 #: ../mail/mail.error.xml.h:25
@@ -14157,112 +15091,123 @@ msgid "Cannot create temporary save directory."
 msgstr ""
 
 #: ../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 ""
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
 msgstr "&quot;{0}&quot; ಫೋಲ್ಡರನ್ನು ಅಳಿಸಲಾಗಿಲ್ಲ."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "&quot;{0}&quot; ಫೋಲ್ಡರನ್ನು ಅಳಿಸಲಾಗಿಲ್ಲ."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr ""
+#, fuzzy
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "ಫೋಲ್ಡರ್ ಹುಡುಕು ವಿವರಣೆಗಳನ್ನು ರಚಿಸು ಅಥವ ಸಂಪಾದಿಸು"
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "&quot;{0}&quot; ಫೋಲ್ಡರನ್ನು &quot;{1}&quot; ಗೆ ಸ್ಥಳಾಂತರಿಸಲಾಗಿಲ್ಲ."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr ""
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "ಕಡತವನ್ನು ತೆರೆಯಲಾಗಿಲ್ಲ"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "ಕಡತವನ್ನು ತೆರೆಯಲಾಗಿಲ್ಲ"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಜರುಗಿಸಲಾಗಿಲ್ಲ."
 
 #: ../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 ""
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "&quot;{0}&quot; ಫೋಲ್ಡರನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ."
 
 #: ../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;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr "&quot;{0}&quot; ಕಡತವನ್ನು ಉಳಿಸಲಾಗಿಲ್ಲ."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:41
+#, fuzzy
+msgid "Check Junk Failed"
+msgstr "ಜಂಕ್‍ಗಾಗಿ ಹುಡುಕು(_J)"
+
+#: ../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: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 "ಖಾತೆಯನ್ನು ಅಳಿಸಬೇಕೆ?"
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "ಅಳಿಸಲಾಗಿದೆ: "
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr ""
+msgid "Delete account?"
+msgstr "ಖಾತೆಯನ್ನು ಅಳಿಸಬೇಕೆ?"
 
 #: ../mail/mail.error.xml.h:46
+#, fuzzy
+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: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
-msgid "Do not disable"
-msgstr ""
-
 #: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
+msgid "Do not disable"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:52
@@ -14360,73 +15305,74 @@ 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."
 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"
 "{0}"
 msgstr ""
 
-#: ../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;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: ../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
 #, fuzzy
 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 ""
+
+#: ../mail/mail.error.xml.h:90
+#, fuzzy
+msgid "Report Junk Failed"
+msgstr "ಕಡತವನ್ನು ಆಮದು ಮಾಡಿಕೊ"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+msgid "Report Not Junk Failed"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:92
@@ -14470,7 +15416,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 ""
 
@@ -14479,7 +15425,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 ""
 
@@ -14500,8 +15446,7 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:116
@@ -14578,9 +15523,9 @@ msgid ""
 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; ಆಗಿ ನೀವು ಪ್ರವೇಶಿಸುವುದು ವಿಫಲಗೊಂಡಿದೆ."
+#, fuzzy
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "&quot;{0}&quot; ಪರಿಚಾರಕಕ್ಕೆ &quot;{0}&quot; ಆಗಿ ನೀವು ಪ್ರವೇಶಿಸುವುದು ವಿಫಲಗೊಂಡಿದೆ."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -14602,77 +15547,93 @@ msgstr "ತೆಗೆದುಹಾಕು(_E)"
 msgid "_Open Messages"
 msgstr "ಸಂದೇಶಗಳನ್ನು ತೆರೆ(_O)"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr ""
-
-#: ../mail/message-list.c:1050
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "ನೋಡದೆ ಇರುವ"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "ನೋಡಲಾದ"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "ಉತ್ತರಿಸಲಾದ"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1055
+#, fuzzy
+msgid "Forwarded"
+msgstr "ಫಾರ್ವಾರ್ಡ್"
+
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "ನೋಡದೆ ಇರುವ ಅನೇಕ ಸಂದೇಶಗಳು"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "ಅನೇಕ ಸಂದೇಶಗಳು"
 
-#: ../mail/message-list.c:1058
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr ""
 
-#: ../mail/message-list.c:1059
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr ""
 
-#: ../mail/message-list.c:1063
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr ""
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr ""
 
-#: ../mail/message-list.c:1608 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1615 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "ಇಂದು %l:%M %p"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "ನಿನ್ನೆ %l:%M %p"
 
-#: ../mail/message-list.c:1636 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1644 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1646 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3840
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3897 ../mail/message-list.c:4354
 msgid "Generating message list"
 msgstr ""
 
+#: ../mail/message-list.c:4204
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4206
+#, fuzzy
+msgid "There are no messages in this folder."
+msgstr ""
+"\n"
+"\n"
+"ಈ ನೋಟದಲ್ಲಿ ತೋರಿಸಲು ಯಾವುದೆ ಅಂಶಗಳಿಲ್ಲ."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr ""
@@ -14702,39 +15663,39 @@ msgstr "ಕಳುಹಿಸಲಾದ ಸಂದೇಶಗಳು"
 msgid "Size"
 msgstr "ಗಾತ್ರ"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:55
 msgid "Call"
 msgstr "ಕರೆ ಮಾಡು"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:56
 msgid "Do Not Forward"
 msgstr "ಫಾರ್ವಾರ್ಡ್ ಮಾಡಬೇಡ"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:57
 msgid "Follow-Up"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:58
 msgid "For Your Information"
 msgstr "ನಿಮ್ಮ ಮಾಹಿತಿಗಾಗಿ"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "ಫಾರ್ವಾರ್ಡ್"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:60
 msgid "No Response Necessary"
 msgstr "ಯಾವುದೆ ಪ್ರತ್ಯುತ್ತರದ ಅಗತ್ಯವಿಲ್ಲ"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "ಉತ್ತರಿಸು"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "ಎಲ್ಲರಿಗೂ ಉತ್ತರಿಸು"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:65
 msgid "Review"
 msgstr "ಅವಲೋಕಿಸು"
 
@@ -14759,6 +15720,11 @@ msgid "Subject contains"
 msgstr ""
 
 #: ../mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "ವಿವರವು ಇದನ್ನು ಹೊಂದಿದೆ"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr ""
 
@@ -14771,23 +15737,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"
+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"
+"body."
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../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 ""
-
 #: ../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"
@@ -14809,9 +15774,10 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr ""
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "ಸಂಪಾದಿಸುವುದನ್ನು ಮುಂದುವರೆಸು"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#, fuzzy
+msgid "_Edit Message"
+msgstr "ಸಂದೇಶವನ್ನು ಸಂಪಾದಿಸು(_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -14823,122 +15789,147 @@ 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 ""
 
-#: ../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"
 "It also restores all your personal settings, mail filters etc."
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../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: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
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "ಬ್ಯಾಕ್ಅಪ್‍ನ ನಂತರ ಇವಲ್ಯೂಶನನ್ನು ಪುನರ್ ಆರಂಭಿಸು(_R)"
+
+#: ../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 ""
@@ -14953,8 +15944,7 @@ 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?"
+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
@@ -14966,14 +15956,23 @@ msgid ""
 msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "Invalid Evolution backup file"
+msgid "Insufficient Permissions"
 msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Please select a valid backup file to restore."
+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
+#, fuzzy
+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 "
@@ -14994,38 +15993,35 @@ msgstr ""
 msgid "_Backup Settings..."
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../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"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr ""
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
@@ -15040,7 +16036,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)"
 
@@ -15059,20 +16076,25 @@ msgid "Bogofilter Options"
 msgstr "Bogofilter ಆದ್ಯತೆಗಳು"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+#, fuzzy
+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 ""
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/caldav/caldav-source.c:249
+#: ../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/caldav/caldav-source.c:271
+#: ../plugins/google-account-setup/google-source.c:671
 msgid "Use _SSL"
 msgstr "_SSL ಅನ್ನು ಬಳಸು"
 
@@ -15092,17 +16114,18 @@ 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 ""
+#: ../plugins/google-account-setup/google-source.c:695
+#, fuzzy
+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):"
 
@@ -15182,8 +16205,7 @@ 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."
+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
@@ -15199,13 +16221,28 @@ 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:624
+#: ../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"
+#, fuzzy
+msgid "Mark as _default address book"
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಫೋಲ್ಡರ್ ಎಂದು ಗುರುತು ಹಾಕು(_d)"
+
+#: ../plugins/default-source/default-source.c:102
+#, fuzzy
+msgid "Mark as _default calendar"
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಫೋಲ್ಡರ್ ಎಂದು ಗುರುತು ಹಾಕು(_d)"
+
+#: ../plugins/default-source/default-source.c:103
+#, fuzzy
+msgid "Mark as _default task list"
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಫೋಲ್ಡರ್ ಎಂದು ಗುರುತು ಹಾಕು(_d)"
+
+#: ../plugins/default-source/default-source.c:104
+#, fuzzy
+msgid "Mark as _default memo list"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಫೋಲ್ಡರ್ ಎಂದು ಗುರುತು ಹಾಕು(_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
@@ -15218,6 +16255,55 @@ msgid ""
 "default one."
 msgstr ""
 
+#: ../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"
+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
+#, fuzzy
+msgid "Custom Header"
+msgstr "ಕಸ್ಟಮ್ ಹೆಡರುಗಳು"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+#, fuzzy
+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 "ಇತರೆ ಬಳಕೆದಾರದ ಫೋಲ್ಡರನ್ನು ತೆರೆಯಿರಿ"
@@ -15235,111 +16321,117 @@ 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
 #, fuzzy
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr "ದೃಢೀಕರಣ"
 
-#: ../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
 #, fuzzy
 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."
 msgstr ""
 
-#: ../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:618
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:644
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "ದೃಢೀಕರಿಸು(_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:840
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#, fuzzy
+msgid "_Mailbox:"
+msgstr "ಮೈಲ್(_M)"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "ದೃಢೀಕರಣದ ಬಗೆ(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:960
+#: ../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:962
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
@@ -15353,16 +16445,15 @@ 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 ""
-"ಎರಡೂ ಗುಪ್ತಪದಗಳು ಒಂದಕ್ಕೊಂದು ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ. ದಯವಿಟ್ಟು ಗುಪ್ತಪದಗಳನ್ನು ಪುನಃ ನಮೂದಿಸಿ."
+msgstr "ಎರಡೂ ಗುಪ್ತಪದಗಳು ಒಂದಕ್ಕೊಂದು ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ. ದಯವಿಟ್ಟು ಗುಪ್ತಪದಗಳನ್ನು ಪುನಃ ನಮೂದಿಸಿ."
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Confirm Password:"
@@ -15385,33 +16476,33 @@ msgstr ""
 msgid "Your password will expire in the next %d days"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:159
-#: ../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:189
+#: ../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:193
+#: ../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:197
+#: ../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:247
+#: ../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:258
-#: ../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 ಗಾಗಿನ ಅನುಮತಿಗಳು"
@@ -15419,7 +16510,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:348
+#: ../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."
@@ -15427,66 +16518,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../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:371
+#: ../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:378
+#: ../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:410
+#: ../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: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 ""
 
-#: ../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 ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:981
 msgid "Error reading delegates list."
 msgstr ""
 
@@ -15532,20 +16623,26 @@ msgstr ""
 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:310
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+#, fuzzy
+msgid "User"
+msgstr "ಬಳಕೆದಾರ(_U)"
+
+#: ../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 ""
@@ -15554,20 +16651,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 ""
 
-#: ../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 ""
@@ -15626,15 +16723,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 ""
 
@@ -15756,11 +16856,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 "ವಿಳಾಸ ಪುಸ್ತಕ..."
 
@@ -15774,7 +16874,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 ""
 
@@ -15860,10 +16960,14 @@ msgid "Could not update out-of-office state"
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Exchange Account is offline."
+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"
@@ -15879,110 +16983,108 @@ msgid ""
 "  "
 msgstr ""
 
-#: ../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:1283
+#: ../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."
 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 ""
 
-#: ../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 ""
-"ಪರಿಚಾರಕದ ಹೆಸರನ್ನು ಸರಿಯಾಗಿ ನಮೂದಿಸಿದ್ದಿರೆಂದು ಖಚಿತಪಡಿಸಿಕೊಂಡು ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."
+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 ""
-"ಬಳಕೆದಾರ ಹೆಸರು ಹಾಗು ಗುಪ್ತಪದವು ಸರಿಯಾಗಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಂಡು ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."
+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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 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"
@@ -15991,87 +17093,88 @@ msgid ""
 "Or you might have just typed your password wrong."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "ಗೊತ್ತಿರದ ದೋಷ."
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -16083,6 +17186,15 @@ msgstr ""
 msgid "Check folder permissions"
 msgstr "ಫೋಲ್ಡರ್ ಅನುಮತಿಗಳನ್ನು ಪರೀಕ್ಷಿಸಿ"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#, fuzzy
+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 "
@@ -16094,23 +17206,55 @@ msgstr ""
 msgid "External Editor"
 msgstr "ಹೊರಗಿನ ಸಂಪಾದಕ"
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#, fuzzy
+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
+#, fuzzy
+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/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 ""
 
-#: ../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)"
 
@@ -16142,20 +17286,68 @@ 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: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 "ಗೂಗಲ್"
 
+#: ../plugins/google-account-setup/google-source.c:493
+#, fuzzy
+msgid "Please enter user name first."
+msgstr "ದಯವಿಟ್ಟು ಬೇರೊಂದು ಹೆಸರನ್ನು ಸೂಚಿಸಿ."
+
+#: ../plugins/google-account-setup/google-source.c:497
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:597
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:747
+#, fuzzy
+msgid "Cal_endar:"
+msgstr "ಕ್ಯಾಲೆಂಡರ್(_C):"
+
+#: ../plugins/google-account-setup/google-source.c:782
+#, fuzzy
+msgid "Retrieve _list"
+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 "ಬಳಕೆದಾರ ಹೆಸರು(_n):"
+
+#. 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 "ಬಿಡುವು/ಕಾರ್ಯನಿರತವನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡು(_U)"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+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 ""
 
@@ -16167,7 +17359,7 @@ msgstr ""
 msgid "Groupwise Account Setup"
 msgstr ""
 
-#: ../plugins/groupwise-features/install-shared.c:215
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16182,11 +17374,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr ""
 
-#: ../plugins/groupwise-features/install-shared.c:222
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr ""
 
@@ -16225,10 +17417,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 ""
 
@@ -16236,12 +17439,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 ""
@@ -16250,6 +17447,85 @@ msgstr ""
 msgid "Groupwise Features"
 msgstr ""
 
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#, fuzzy
+msgid "Message retract failed"
+msgstr "ಸಂದೇಶ ಇದನ್ನು ಹೊಂದಿದೆ"
+
+#: ../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 "ಆಯ್ದ ಸಂದೇಶಗಳನ್ನು ಕಾರ್ಯಕ್ಕೆ ಬದಲಾಯಿಸು"
+
+#: ../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
+#, fuzzy
+msgid "Invalid user"
+msgstr "ಅಮಾನ್ಯ ಆರ್ಗ್ಯುಮೆಂಟ್‍ಗಳು"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#, fuzzy
+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
+#, fuzzy
+msgid "Specify User"
+msgstr "ಬಳಕೆದಾರನನ್ನು ಆರಿಸು"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "This is a recurring meeting"
+msgstr "ಇದನ್ನು ಒಂದು ಪುನರಾವರ್ತಿತ ಕಾರ್ಯಕ್ರಮವಾಗಿಸು"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#, fuzzy
+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: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 ""
@@ -16328,14 +17604,15 @@ msgid "Subscribe to my _notifications"
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "ಓದು(_R)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 msgid "_Write"
 msgstr "ಬರೆ(_W)"
 
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#, fuzzy
+msgid "permission to read|_Read"
+msgstr "ಅನುಮತಿಯು ನಿರಾಕರಿಸಲ್ಪಟ್ಟಿದೆ"
+
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
 msgstr "ಪ್ರಾಕ್ಸಿ"
@@ -16348,9 +17625,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)"
@@ -16359,40 +17636,45 @@ 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: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:320
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../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:321
+#: ../plugins/groupwise-features/share-folder-common.c:320
 msgid "Enter the users and set permissions"
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:340
+#: ../plugins/groupwise-features/share-folder-common.c:339
 msgid "New _Shared Folder..."
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:448
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+#, fuzzy
+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 "ಮಾರ್ಪಡಿಸು"
 
@@ -16457,11 +17739,11 @@ msgstr ""
 msgid "Hula Account Setup"
 msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:319
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "ಕಸ್ಟಮ್ ಹೆಡರುಗಳು"
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP ಹೆಡರುಗಳು"
 
@@ -16508,28 +17790,28 @@ msgstr ""
 msgid "IMAP Features"
 msgstr "IMAP ವೈಶಿಷ್ಟ್ಯಗಳು"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:77
 msgid "_Import to Calendar"
 msgstr "ಕ್ಯಾಲೆಂಡರ್‍ಗೆ ಆಮದು ಮಾಡಿಕೊ(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:88
+#: ../plugins/import-ics-attachments/icsimporter.c:82
 msgid "_Import to Tasks"
 msgstr "ಕಾರ್ಯಕ್ಕೆ ಆಮದು ಮಾಡಿಕೊ(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:206
+#: ../plugins/import-ics-attachments/icsimporter.c:200
 msgid "Import ICS"
 msgstr "ICS ಅನ್ನು ಆಮದು ಮಾಡಿಕೊ"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:233
+#: ../plugins/import-ics-attachments/icsimporter.c:223
 msgid "Select Task List"
 msgstr "ಕಾರ್ಯ ಪಟ್ಟಿಯನ್ನು ಆರಿಸು"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:237
+#: ../plugins/import-ics-attachments/icsimporter.c:227
 msgid "Select Calendar"
 msgstr "ಕ್ಯಾಲೆಂಡರನ್ನು ಆರಿಸು"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:267
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr "ಆಮದು ಮಾಡಿಕೊ(_I)"
 
@@ -16562,8 +17844,8 @@ msgid ""
 "connected to the system or it is not powered on."
 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 ""
 
@@ -16579,604 +17861,601 @@ msgstr ""
 msgid "iPod Synchronization"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:429
-#: ../plugins/itip-formatter/itip-formatter.c:554
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "'%s' ಕ್ಯಾಲೆಂಡರನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:574
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:600
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:676
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "ಯಾವುದೆ ಕ್ಯಾಲೆಂಡರುಗಳು ಕಂಡು ಬಂದಿಲ್ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:683
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:687
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:776
 #, fuzzy
 msgid "Searching for an existing version of this appointment"
 msgstr "ಆವೃತ್ತಿ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:927
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:985
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:1003
+#, fuzzy, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' ಕ್ಯಾಲೆಂಡರಿಗೆ .  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:997
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' ಕ್ಯಾಲೆಂಡರಿಗೆ ಕಳುಹಿಸಿದ್ದು ಅಂಗೀಕರಿಸಲ್ಪಟ್ಟಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1006
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "'%s' ಕ್ಯಾಲೆಂಡರಿಗೆ ಕಳುಹಿಸಿದ್ದು ತಿರಸ್ಕರಿಸಲ್ಪಟ್ಟಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1011
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' ಕ್ಯಾಲೆಂಡರಿಗೆ ಕಳುಹಿಸಿದ್ದು ರದ್ದು ಮಾಡಲ್ಪಟ್ಟಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1105
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1112
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1114
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1199
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1226
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1230
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "ಮೀಟಿಂಗ್ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1258
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "ಕಾರ್ಯ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1261
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "ಮೆಮೊ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1270
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ಮೀಟಿಂಗ್ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಲಾಗಿಲ್ಲ, ಮೀಟಿಂಗ್ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "ಕಾರ್ಯ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಲಾಗಿಲ್ಲ, ಕಾರ್ಯವು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ಮೆಮೊ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಲಾಗಿಲ್ಲ, ಮೆಮೊ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1351
-#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "ಲಗತ್ತಿಸಲಾದ ಕ್ಯಾಲೆಂಡರ್ ಸರಿಯಾದುದಲ್ಲ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1352
-#: ../plugins/itip-formatter/itip-formatter.c:1367
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1402
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1435
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1403
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1418
+#: ../plugins/itip-formatter/itip-formatter.c:1436
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 #, fuzzy
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "ಬಿಡುವಿರುವ/ಕಾರ್ಯನಿರತ(_F)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1432
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1433
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2123
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "ಈ ಮೀಟಿಂಗ್ ಪುನರಾವರ್ತಿತಗೊಳ್ಳುತ್ತದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2126
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "ಈ ಕಾರ್ಯ ಪುನರಾವರ್ತಿತಗೊಳ್ಳುತ್ತದೆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2129
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "ಈ ಮೆಮೊ ಪುನರಾವರ್ತಿತಗೊಳ್ಳುತ್ತದೆ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2334
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2344
-#: ../plugins/itip-formatter/itip-formatter.c:2376
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr ""
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 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:189 ../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:194
 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:198
 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:207
 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:217
 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:222
 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:226
 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:231
 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:235
 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:254
 #, 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:259
 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:263
 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:268
 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:272
 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:281
 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:287
 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:291
 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:296
 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:300
 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:306
 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:311
 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:315
 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:320
 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:324
 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:349
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:525
 #, 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:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
 #, 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:356
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:380
 #, 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:385
+#: ../plugins/itip-formatter/itip-view.c:382
 #, 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 ""
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, 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:398
 #, 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:400
 #, 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:404
 #, 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:406
 #, 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:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, 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:462
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:468
 #, 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:473
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, 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 ""
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, 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 ""
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:545
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr ""
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 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:824
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
 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:825
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Accept"
 msgstr "ಅಂಗೀಕರಿಸು(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "ಎಲ್ಲವನ್ನೂ ತಿರಸ್ಕರಿಸು(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr ""
 
-#: ../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:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 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:841
 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:845
 msgid "_Update Attendee Status"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr ""
 
@@ -17239,8 +18518,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 ""
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -17277,11 +18555,12 @@ 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."
+"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 messages in Inbox only."
+msgid "Notify new messages for Inbox only."
 msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
@@ -17324,62 +18603,81 @@ msgstr ""
 msgid "Generate a _D-Bus message"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:362
-#, c-format
+#: ../plugins/mail-notification/mail-notification.c:377
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "ಇವಲ್ಯೂಶನ್ ಮೈಲ್"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+#, 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:457
+#, fuzzy, c-format
 msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
-msgstr ""
+msgstr[0] ""
+"ನಿಮಗೆ %d ಹೊಸ ಸಂದೇಶಗಳು\n"
+"%s ನಲ್ಲಿ ಬಂದಿವೆ."
+msgstr[1] ""
 "ನಿಮಗೆ %d ಹೊಸ ಸಂದೇಶಗಳು\n"
 "%s ನಲ್ಲಿ ಬಂದಿವೆ."
 
-#: ../plugins/mail-notification/mail-notification.c:365
-#, c-format
-msgid "You have received %d new messages."
-msgstr "ನಿಮಗೆ %d ಹೊಸ ಸಂದೇಶಗಳು ಬಂದಿವೆ."
+#: ../plugins/mail-notification/mail-notification.c:462
+#, fuzzy, 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:376
-#: ../plugins/mail-notification/mail-notification.c:381
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "ಹೊಸ ಇಮೇಲ್"
 
-#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:439
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:441
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:622
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:628
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "ಬೀಪ್(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:629
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:640
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "ಕಡತದ ಹೆಸರನ್ನು ಸೂಚಿಸಿ (_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:641
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:781
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
@@ -17459,8 +18757,7 @@ msgid "Mailing _List"
 msgstr "ಮೈಲಿಂಗ್ ಲಿಸ್ಟ್‍(_L)"
 
 #: ../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 ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
@@ -17513,7 +18810,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 ""
@@ -17587,6 +18884,27 @@ msgstr ""
 msgid "_Unsubscribe from List"
 msgstr ""
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "ಸಂದೇಶಗಳನ್ನು %s ಫೋಲ್ಡರಿಗೆ ಸ್ಥಳಾಂತರಿಸಲಾಗುತ್ತಿದೆ"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+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 ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+#, fuzzy
+msgid "Current Folder and _Subfolders"
+msgstr "ಪ್ರಸ್ತುತ ಫೋಲ್ಡರ್"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+#, fuzzy
+msgid "Current _Folder Only"
+msgstr "ಪ್ರಸ್ತುತ ಫೋಲ್ಡರ್"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr ""
@@ -17629,7 +18947,7 @@ msgstr ""
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:227
+#: ../plugins/plugin-manager/plugin-manager.c:236
 msgid "Plugin Manager"
 msgstr ""
 
@@ -17641,33 +18959,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:240
+#: ../plugins/plugin-manager/plugin-manager.c:249
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ಸೂಚನೆ: ನೀವು ಪುನರ್ ಆರಂಭಿಸದ ಹೊರತು ಬದಲಾವಣೆ ಸಕ್ರಿಯಗೊಳ್ಳುವುದಿಲ್ಲ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "ಅವಲೋಕನ"
 
-#: ../plugins/plugin-manager/plugin-manager.c:263
-msgid "Configuration"
-msgstr "ಸಂರಚನೆ"
-
-#: ../plugins/plugin-manager/plugin-manager.c:279
-msgid "There is no configuration option for this plugin."
-msgstr ""
-
-#: ../plugins/plugin-manager/plugin-manager.c:332
-#: ../plugins/plugin-manager/plugin-manager.c:394
+#: ../plugins/plugin-manager/plugin-manager.c:346
+#: ../plugins/plugin-manager/plugin-manager.c:408
 msgid "Plugin"
 msgstr "ಪ್ಲಗ್ಇನ್"
 
@@ -17688,41 +18997,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 "HT_ML ಬಗೆ"
 
-#: ../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 ""
@@ -17747,13 +19037,7 @@ msgstr "ತಾಣಗಳು"
 msgid "_Publish Calendar Information"
 msgstr ""
 
-#: ../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 ಅನ್ನು ಖಚಿತವಾಗಿಯೂ ತೆಗೆಯ ಬೇಕೆ?"
 
@@ -17838,15 +19122,78 @@ 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
+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"
+#: ../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:854
+#: ../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 "'%s' ಕ್ಯಾಲೆಂಡರನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"%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 "ಕ್ರಿಯೆಯು ಲಭ್ಯವಿಲ್ಲ"
+
+#: ../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 ""
 
@@ -17870,7 +19217,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 ""
 
@@ -17882,16 +19229,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 "ಉಳಿಸು"
 
@@ -17899,79 +19245,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:548
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:555
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:564
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:570
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:576
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:598
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr ""
 
@@ -17992,15 +19338,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:393
+#: ../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 ""
 
@@ -18025,22 +19371,23 @@ 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 "ಆರಂಭಿಸುವ ವಿಝಾರ್ಡ್"
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "ಸಹಾಯಕ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "ಇವಲ್ಯೂಶನ್ ಹೊಂದಿಸುವ ಸಹಾಯಕ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "ಸುಸ್ವಾಗತ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18053,28 +19400,29 @@ msgstr ""
 "\n"
 "ಮುಂದುವರೆಯಲು ದಯವಿಟ್ಟು \"ಮುಂದಕ್ಕೆ\" ಗುಂಡಿಯನ್ನು ಒತ್ತಿ. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "ಕಡತವನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:143
 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
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "%s ನಿಂದ:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:507
+#, c-format
 msgid "Importing data."
 msgstr "ದತ್ತಾಂಶವನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "ದಯವಿಟ್ಟು ಕಾಯಿರಿ"
 
@@ -18095,6 +19443,31 @@ 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
+#, 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 "tnef ಅಟ್ಯಾಚ್‍ಮೆಂಟ್‍ಗಳನ್ನು ಡಿಕೋಡ್ ಮಾಡಲು ytnef ಅನ್ನು ಬಳಸುವ ಒಂದು ಸಾಮಾನ್ಯ ಪ್ಲಗ್‍ಇನ್."
@@ -18103,6 +19476,30 @@ 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 ""
+
+#: ../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 "_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 "ಎವಲ್ಯೂಶನ್ ಶೆಲ್"
@@ -18120,147 +19517,267 @@ msgid "Evolution Test component"
 msgstr "ಇವಲ್ಯೂಶನ್ ಪರೀಕ್ಷಾ ಘಟಕ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings"
+msgid "Authenticate proxy server connections"
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
+#, fuzzy
+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:3
-msgid "Decides whether the crash recovery should be run or not"
+#: ../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 ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+#, fuzzy
+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: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
 #, fuzzy
 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: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
+#, fuzzy
+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 ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+"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:11
+#: ../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:569
+#: ../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
 #, fuzzy
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "ಆವೃತ್ತಿ"
 
-#: ../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
 #, fuzzy
 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: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 "
 "by the GNOME toolbar setting."
 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
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "ಆವೃತ್ತಿ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Use HTTP proxy"
+msgstr ""
+
+#: ../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
-msgid "Whether crash recovery should be done or not"
+#: ../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
 #, fuzzy
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+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 ""
 
@@ -18276,11 +19793,11 @@ msgstr "ಸಕ್ರಿಯ ಸಂಪರ್ಕಗಳು"
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:134
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -18289,11 +19806,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:140
 msgid "Choose the destination for this import"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:146
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18301,120 +19818,105 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:284
 msgid "F_ilename:"
 msgstr "ಕಡತದ ಹೆಸರು(_i):"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:289
 msgid "Select a file"
 msgstr "ಒಂದು ಕಡತವನ್ನು ಆರಿಸು"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:298
 msgid "File _type:"
 msgstr "ಕಡತದ ಬಗೆ(_t):"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:334
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:337
 msgid "Import a _single file"
 msgstr ""
 
-#: ../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:341
+#: ../shell/e-shell-view.c:47 ../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 "ಶಂಕರ್ ಪ್ರಸಾದ್ ಎಂ. ವಿ."
 
-#: ../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:888
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "ಜಾಲದ ಒಳಗೆ ಕೆಲಸ ಮಾಡು(_W)"
 
-#: ../shell/e-shell-window-commands.c:901 ../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:914
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "ಜಾಲದ ಹೊರಗೆ ಕೆಲಸ ಮಾಡು"
 
-#: ../shell/e-shell-window.c:381
-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 ""
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: ../shell/e-shell-window.c:394
-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 ""
 
-#: ../shell/e-shell-window.c:795
+#: ../shell/e-shell-window.c:782
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ಗೆ ಬದಲಾಯಿಸು"
 
-#: ../shell/e-shell.c:640
-msgid "Uknown system error."
+#: ../shell/e-shell.c:638
+#, fuzzy
+msgid "Unknown system error."
 msgstr "ಗೊತ್ತಿರದ ಗಣಕದ ದೋಷ"
 
 #: ../shell/e-shell.c:836 ../shell/e-shell.c:837
@@ -18422,25 +19924,25 @@ msgstr "ಗೊತ್ತಿರದ ಗಣಕದ ದೋಷ"
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1275 ../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:1277
+#: ../shell/e-shell.c:1280
 msgid "Invalid arguments"
 msgstr "ಅಮಾನ್ಯ ಆರ್ಗ್ಯುಮೆಂಟ್‍ಗಳು"
 
-#: ../shell/e-shell.c:1279
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "OAF ನಲ್ಲಿ ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ"
 
-#: ../shell/e-shell.c:1281
+#: ../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 "ಹೊಸ"
 
@@ -18449,6 +19951,8 @@ msgid "New Test"
 msgstr "ಹೊಸ ಪರೀಕ್ಷೆ"
 
 #: ../shell/test/evolution-test-component.c:108
+#, fuzzy
+msgctxt "New"
 msgid "_Test"
 msgstr "ಪರೀಕ್ಷೆ(_T)"
 
@@ -18492,8 +19996,8 @@ msgid ""
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:226
-#, fuzzy
+#: ../shell/main.c:222
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -18512,7 +20016,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr "ಆವೃತ್ತಿ"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18520,19 +20024,20 @@ msgstr ""
 "ಧನ್ಯವಾದಗಳು\n"
 "ಇವಲ್ಯೂಶನ್ ತಂಡ\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "ಪುನಃ ನನಗೆ ಹೇಳಬೇಡ"
 
-#: ../shell/main.c:307
-msgid "Evolution Crash Recovery"
-msgstr ""
+#: ../shell/main.c:303
+#, fuzzy
+msgid "Evolution Crash Detection"
+msgstr "ಇವಲ್ಯೂಶನ್ ಮಾಹಿತಿ"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:305
 msgid "Ig_nore"
 msgstr "ನಿರ್ಲಕ್ಷಿಸು(_n)"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -18540,43 +20045,43 @@ msgid ""
 "You can restore the preview panes from the View menu.\n"
 msgstr ""
 
-#: ../shell/main.c:335
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
 msgstr "ಈ ಸಂದೇಶವನ್ನು ಪುನಃ ತೋರಿಸಬೇಡ(_D)"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: ../shell/main.c:571
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr ""
 
-#: ../shell/main.c:574
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "ಎಲ್ಲಾ ಇವಲ್ಯೂಶನ್ ಘಟಕಗಳನ್ನು ಬಲವಂತವಾಗಿ ಮುಚ್ಚು"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ಇವಲ್ಯೂಶನ್ 1.4 ರಿಂದ ಬಲವಂತವಾಗಿ ಪುನರ್-ವರ್ಗಾಯಿಸು"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: ../shell/main.c:583
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "ಯಾವುದೆ ಪ್ಲಗ್ಿನ್‍ಗಳನ್ನು ಲೋಡ್ ಮಾಡುವುದನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:615
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ಇವಲ್ಯೂಶನ್ PIM ಹಾಗು ಇಮೈಲ್ ಕ್ಲೈಂಟ್"
 
-#: ../shell/main.c:628
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18688,7 +20193,7 @@ msgid ""
 "data.\n"
 msgstr ""
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -18696,14 +20201,14 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: ../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 "
 "indicated here"
 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 "
@@ -18758,11 +20263,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"
@@ -18773,7 +20283,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"
@@ -18782,7 +20292,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"
@@ -18791,7 +20301,7 @@ msgstr ""
 "ಒದಗಿಸಿದವರು:\n"
 "  ವಿಷಯ: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆರಿಸು"
 
@@ -18960,8 +20470,7 @@ 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
@@ -18977,7 +20486,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 "ಪ್ರಮಾಣಪತ್ರವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
 
@@ -19185,8 +20694,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 "ನಕಲಿಸು"
@@ -19211,8 +20719,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 "ಕತ್ತರಿಸು"
@@ -19253,8 +20760,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 "ಅಂಟಿಸು"
@@ -19291,13 +20797,11 @@ msgstr "ಆರಿಸಲಾದ ಸಂಪರ್ಕವಿಳಾಸಗಳನ್ನ�
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "ಆರಿಸಲಾದ ಫೋಲ್ಡರಿನ ಸಂಪರ್ಕವಿಳಾಸಗಳನ್ನು ವಿಕಾರ್ಡ್ ಆಗಿ ಉಳಿಸು"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2715
+#: ../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)"
 
@@ -19366,7 +20870,7 @@ msgstr "ಸಂಪರ್ಕ ವಿಳಾಸವನ್ನು ಇಲ್ಲಿಗೆ
 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)"
 
@@ -19427,7 +20931,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 "ಮುಂದಿನ"
 
@@ -19436,7 +20940,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 "ಹಿಂದಿನ"
 
@@ -19504,232 +21008,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 "ರೋಲ್ ಕ್ಷೇತ್ರ(_F)"
-
-#: ../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 "ಪ್ರಸಕ್ತ ಮೈಲ್ ಕಾರ್ಯವನ್ನು ರದ್ದು ಮಾಡು"
@@ -19759,7 +21037,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)"
 
@@ -19893,8 +21170,7 @@ msgid "Hide _Read Messages"
 msgstr "ಓದಲಾದ ಸಂದೇಶಗಳನ್ನು ಅಡಗಿಸಿಡು(_R)"
 
 #: ../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
@@ -19977,7 +21253,7 @@ msgstr "ಎಳೆ ಮಾಡಲಾದ ಸಂದೇಶ ಪಟ್ಟಿ"
 msgid "_Group By Threads"
 msgstr "ಎಳೆಗಳಿಗೆ ಅನುಗುಣವಾಗಿ ಗುಂಪುಮಾಡು(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "ಸಂದೇಶ(_M)"
@@ -20313,101 +21589,102 @@ 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
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "ಸಂದೇಶದ ಕಚ್ಛಾ ಇಮೇಲ್ ಮೂಲವನ್ನು ತೋರಿಸು"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "ಆರಿಸಲಾದ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಬೇಡ"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "ಪ್ರಮುಖವಾದುದಲ್ಲ(_m)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "ಚಿಕ್ಕದಾಗಿಸು(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "ಲಗತ್ತಿಸಲಾದ(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "ಕ್ಯಾರೆಟ್(_Caret) ಕ್ರಮ"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "ಫ್ಲಾಗ್‍ ಅನ್ನು ತೆರವುಗೊಳಿಸು(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "ಸಂದೇಶವನ್ನು ಅಳಿಸು(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "ಸಂದೇಶದಲ್ಲಿ ಹುಡುಕು(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "ಪೂರ್ಣಗೊಂಡಿದ್ದನ್ನು ಗುರುತು ಹಾಕು(_F)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "ಇಲ್ಲಿಗೆ ತೆರಳು(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "ಪ್ರಮುಖವಾದದ್ದು(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "ಸಾಲಿನೊಳಗೆ(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "ಜಂಕ್(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "ಚಿತ್ರಗಳನ್ನು ಲೋಡ್ ಮಾಡು(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "ಸಂದೇಶದ ಮೂಲ(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "ಮುಂದಿನ ಸಂದೇಶ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "ಸಾಮಾನ್ಯ ಗಾತ್ರ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "ಜಂಕ್ ಅಲ್ಲ(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "ಹೊಸ ಕಿಟಿಕಿಯಲ್ಲಿ ತೆರೆ(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "ಹಿಂದಿನ ಸಂದೇಶ(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "ಕೋಟ್ ಮಾಡಲಾದ(_Q)"
 
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:126
+msgid "_Read"
+msgstr "ಓದು(_R)"
+
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "ಸಂದೇಶವನ್ನು ಉಳಿಸು(_U)..."
@@ -20428,9 +21705,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"
@@ -20468,290 +21745,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 "_Bcc ಕ್ಷೇತ್ರ"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "_Cc ಕ್ಷೇತ್ರ"
-
-#: ../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 "ಆರಿಸಲಾದ ಕಾರ್ಯಗಳನ್ನು ನಕಲಿಸು"
@@ -20945,50 +21938,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 "ಬಗ್ಗೆ(_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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "ಪಠ್ಯ ಮಾತ್ರ(_T)"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "ವಿಂಡೊ(_W)"
 
@@ -21064,12 +22062,12 @@ msgstr "ಕೊನೆಯ ದಿನಾಂಕದೊಂದಿಗೆ(_D)"
 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:213
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:410
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
+#. 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"
 
@@ -21086,8 +22084,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 ""
@@ -21099,19 +22097,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 "ನೋಟಗಳನ್ನು ವಿವರಿಸು"
 
@@ -21121,17 +22119,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 "ಪ್ರಸಕ್ತ ನೋಟವನ್ನು ಉಳಿಸು"
 
@@ -21183,11 +22181,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 "ಹೊಸ ನೋಟವನ್ನು ವಿವರಿಸಿ"
 
@@ -21203,17 +22201,17 @@ msgstr "ನೋಟದ ಬಗೆ"
 msgid "Type of view:"
 msgstr "ನೋಟದ ಬಗೆ:"
 
-#: ../widgets/misc/e-attachment-bar.c:1029
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "ಲಗತ್ತಿಸುವ ಪಟ್ಟಿ"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:507 ../widgets/misc/e-attachment.c:524
+#: ../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:299 ../widgets/misc/e-attachment.c:516
+#: ../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 ಕಡತವನ್ನು ಲಗತ್ತಿಸಲಾಗಿಲ್ಲ: ಇದು ಒಂದು ಸಾಮಾನ್ಯ ಕಡತವಲ್ಲ"
@@ -21235,33 +22233,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:1724
+#: ../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:3635
-#: ../widgets/text/e-text.c:3636
+#: ../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:3642
-#: ../widgets/text/e-text.c:3643 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651
+#: ../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:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "ಸ್ಟಿಪ್ಪಲ್‍ನಿಂದ ತುಂಬಿಸು"
 
@@ -21286,29 +22283,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:3014
+#: ../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:3015
+#: ../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"
@@ -21317,244 +22314,252 @@ msgstr "ಸಮಯವು ಈ ಮಾದರಿಯಲ್ಲಿ ಇರಬೇಕು: %
 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 "ಬಳಸಲು ಕ್ಯಾರೆಕ್ಟರ್ ಸೆಟ್ ಅನ್ನು ನಮೂದಿಸಿK"
 
-#: ../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"
 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:3354
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "ವಿಸ್ತಾರಕ ಗಾತ್ರ"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3355
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 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:129 ../widgets/misc/e-filter-bar.c:182
-#: ../widgets/misc/e-filter-bar.c:310 ../widgets/misc/e-filter-bar.c:747
+#: ../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:233
+#: ../widgets/misc/e-filter-bar.c:234
 msgid "Save Search"
 msgstr "ಹುಡುಕಿದ್ದನ್ನು ಉಳಿಸು"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:271
 msgid "_Searches"
 msgstr "ಹುಡುಕಾಟಗಳು(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:272
+#: ../widgets/misc/e-filter-bar.c:273
 msgid "Searches"
 msgstr "ಹುಡುಕಾಟಗಳು"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
 msgstr "ಹುಡುಕಿದ್ದನ್ನು ಉಳಿಸು(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
 msgstr "ಉಳಿಸಲಾದ ಹುಡುಕಾಟಗಳನ್ನು ಸಂಪಾದಿಸು(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
 msgstr "ಸುಧಾರಿತ ಹುಡುಕಾಟ(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "All Accounts"
 msgstr "ಎಲ್ಲಾ ಖಾತೆ"
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Account"
 msgstr "ಪ್ರಸ್ತುತ ಖಾತೆ"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Folder"
 msgstr "ಪ್ರಸ್ತುತ ಫೋಲ್ಡರ್"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "Current Message"
 msgstr "ಪ್ರಸ್ತುತ ಸಂದೇಶ"
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../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
+#, fuzzy
+msgid "Online"
+msgstr "ಸಾಲಿನೊಳಗೆ(_I)"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
 msgstr ""
 
 #: ../widgets/misc/e-pilot-settings.c:103
@@ -21581,61 +22586,61 @@ msgstr "ರಿಫ್ಲೋ ಮಾದರಿ"
 msgid "Column width"
 msgstr "ಕಾಲಂ ಅಗಲ"
 
-#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
-#: ../widgets/misc/e-search-bar.c:479
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "ಹುಡುಕು"
 
-#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
-#: ../widgets/misc/e-search-bar.c:479
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "ಹುಡುಕುವ ರೀತಿಯನ್ನು ಬದಲಾಯಿಸಲು ಇಲ್ಲಿ ಕ್ಲಿಕ್ಕಿಸಿ"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "ಹುಡುಕು(_S)"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "ಈಗಲೆ ಹುಡುಕು(_F)"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "ಅಳಿಸು(_C)"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "ಅಂಶ ಐಡಿ"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3557
-#: ../widgets/text/e-text.c:3558
+#: ../widgets/misc/e-search-bar.c:875 ../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:1010
+#: ../widgets/misc/e-search-bar.c:1006
 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:1027
+#: ../widgets/misc/e-search-bar.c:1023
 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:1039
+#: ../widgets/misc/e-search-bar.c:1035
 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 "ತೆರೆಸೂಚಕ ಕಾಲಂ"
@@ -21652,7 +22657,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):"
 
@@ -21676,10 +22681,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 "ಮಾಹಿತಿಯ ಜಾಡು ಹಿಡಿಯಲು ಒಂದು ಕಳುಹಿಸಲ್ಪಟ್ಟ ಅಂಶವನ್ನು ನಿರ್ಮಿಸು"
@@ -21760,44 +22761,45 @@ 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:255
 #, 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:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ಪೂರ್ಣಗೊಂಡಿದೆ)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "URL ಗೆ ತೆರಳಲು ಇಲ್ಲಿ ಕ್ಲಿಕ್ ಮಾಡಿ"
 
@@ -21825,35 +22827,35 @@ msgstr "ಪುಟಿಕೆ ಪಟ್ಟಿ"
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:383
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "ಆರಿಸಲಾದ ಕಾಲಂ"
 
-#: ../widgets/table/e-cell-pixbuf.c:390
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "ಕೇಂದ್ರೀಕರಿಸಲಾದ ಕಾಲಂ"
 
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "ಆರಿಸದೆ ಇರುವ ಕಾಲಂ"
 
-#: ../widgets/table/e-cell-text.c:1804
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "ಕಾಲಂ ಅನ್ನು ಹೊಡೆದು ಹಾಕು"
 
-#: ../widgets/table/e-cell-text.c:1811
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "ಕಾಲಂನ ಕೆಳಗೆ ಗೆರೆಯನ್ನು ಎಳೆ"
 
-#: ../widgets/table/e-cell-text.c:1818
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "ಬೋಲ್ಡ್‍ ಕಾಲಂ"
 
-#: ../widgets/table/e-cell-text.c:1825
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "ಬಣ್ಣ ಕಾಲಂ"
 
-#: ../widgets/table/e-cell-text.c:1839
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "BG ಬಣ್ಣ ಕಾಲಂ"
 
@@ -21891,7 +22893,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 "ಏರಿಕೆ ಕ್ರಮದಲ್ಲಿ"
 
@@ -21904,7 +22906,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 "ಇಳಿಕೆ ಕ್ರಮದಲ್ಲಿ"
 
@@ -21967,14 +22969,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 "ಸಂಪೂರ್ಣ ಹೆಡರ್"
 
@@ -22008,289 +23010,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:2972 ../widgets/table/e-table-item.c:2973
+#: ../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:2979 ../widgets/table/e-table-item.c:2980
-#: ../widgets/table/e-tree.c:3307 ../widgets/table/e-tree.c:3308
+#: ../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:3344 ../widgets/table/e-tree.c:3345
 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:2986 ../widgets/table/e-table-item.c:2987
-#: ../widgets/table/e-tree.c:3313 ../widgets/table/e-tree.c:3314
+#: ../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:3350 ../widgets/table/e-tree.c:3351
 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:2993 ../widgets/table/e-table-item.c:2994
-#: ../widgets/table/e-tree.c:3319 ../widgets/table/e-tree.c:3320
+#: ../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:3356 ../widgets/table/e-tree.c:3357
 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:3000 ../widgets/table/e-table-item.c:3001
+#: ../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:2965 ../widgets/table/e-table-item.c:2966
+#: ../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:3007 ../widgets/table/e-table-item.c:3008
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3301
-#: ../widgets/table/e-tree.c:3302
+#: ../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:3338
+#: ../widgets/table/e-tree.c:3339
 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:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../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:3370
+#: ../widgets/table/e-tree.c:3371
 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 "ಉತ್ತಮವಾಗಿ ಸರಿಹೊಂದುವ(_B)"
 
-#: ../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:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "ಟೇಬಲ್ ಹೆಡರ್"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "ಟೇಬಲ್ ಮಾದರಿ"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../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:3340
-#: ../widgets/table/e-tree.c:3341
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 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:3326 ../widgets/table/e-tree.c:3327
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ಇಟ್ರೀ ಟೇಬಲ್ ಅಡಾಪ್ಟರ್"
 
-#: ../widgets/table/e-tree.c:3347
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "ಪುರಾತನ ನೋಟ (ರೆಟ್ರೋ ಲುಕ್)"
 
-#: ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "ಸಾಲುಗಳನ್ನು ಹಾಗು +/- ವಿಸ್ತಾರಕಗಳನ್ನು (ಎಕ್ಸ್‍ಪ್ಯಾಂಡರ್) ಎಳೆಯಿರಿ."
 
-#: ../widgets/text/e-text.c:2727
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "ಆದಾನ ಕ್ರಮಗಳು"
 
-#: ../widgets/text/e-text.c:3550 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "ಕಾರ್ಯಕ್ರಮ ಪರಿಷ್ಕಾರಕ"
 
-#: ../widgets/text/e-text.c:3564 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "ಬೋಲ್ಡ್‍"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "ಹೊಡೆದುಹಾಕು"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "ಲಂಗರು(Anchor)"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "ಜಸ್ತಿಫಿಕೇಶನ್"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "ಕ್ಲಿಪ್ ಅಗಲ"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "ಕ್ಲಿಪ್ ಎತ್ತರ"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "ಕ್ಲಿಪ್"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "ಕ್ಲಿಪ್ ಆಯತವನ್ನು ತುಂಬಿಸು"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X ಆಫ್‍ಸೆಟ್"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y ಆಫ್‍ಸೆಟ್"
 
-#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "ಪಠ್ಯದ ಅಗಲ"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "ಪಠ್ಯದ ಎತ್ತರ"
 
-#: ../widgets/text/e-text.c:3686 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "ಎಲಿಪ್ಸಿಸನ್ನು ಬಳಸು"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "ಎಲಿಪ್ಸಿಸ್"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "ಸಾಲು ಆವರಿಕೆ(wrap)"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "ಬ್ರೇಕ್ ಅಕ್ಷರಗಳು"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "ಮ್ಯಾಕ್ಸ್ ಸಾಲುಗಳು"
 
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "ಅಂಚುಗಳನ್ನು ಎಳೆ"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "ಹೊಸಸಾಲುಗಳನ್ನು ಅನುಮತಿಸು"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "ಹಿನ್ನಲೆಯನ್ನು ಎಳೆ"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "ಗುಂಡಿಯನ್ನು ಎಳೆ"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "ತೆರೆಸೂಚಕದ ಸ್ಥಳ"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM ಸನ್ನಿವೇಶ"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "ಪುಟಿಕೆಯನ್ನು ನಿಭಾಯಿಸು"
+
diff --git a/po/pt.po b/po/pt.po
index b5d11fca82..835b2ceb53 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,12 +4,13 @@
 # Duarte Loreto <happyguy_pt@hotmail.com>, 2002, 2003, 2004, 2005, 2006, 2007, 2008.
 # Tiago Antão <tiagoantao@bigfoot.com>, 2000.
 #
+#: ../shell/main.c:683
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.22\n"
+"Project-Id-Version: 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-14 00:47+0000\n"
-"PO-Revision-Date: 2008-02-14 00:50+0000\n"
+"POT-Creation-Date: 2008-08-11 16:03+0100\n"
+"PO-Revision-Date: 2008-08-11 16:05+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,21 +20,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 "livro de endereços 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"
@@ -41,7 +42,6 @@ msgstr[0] "pasta do livro de endereços actual %s tem %d cartão"
 msgstr[1] "pasta do livro de endereços actual %s tem %d cartões"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Abrir"
 
@@ -151,7 +151,7 @@ msgid "calendar view for one or more days"
 msgstr "vista de calendário para um ou mais dias"
 
 #: ../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"
 
@@ -162,20 +162,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:1358
-#: ../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"
 
@@ -183,10 +181,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"
 
@@ -196,17 +194,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:1362
-#: ../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 "Calendário Gnome"
 
@@ -318,34 +314,34 @@ msgstr "Calendário: de %s a %s"
 msgid "evolution calendar item"
 msgstr "item de calendário evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:39
 msgid "Combo Button"
 msgstr "Botão de Caixa de Selecção"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:49
 msgid "Activate Default"
 msgstr "Activar Valor Por Omissão"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:51
 msgid "Popup Menu"
 msgstr "Menu de Popup"
 
-#: ../a11y/widgets/ea-expander.c:40
+#: ../a11y/widgets/ea-expander.c:39
 msgid "Toggle Attachment Bar"
 msgstr "Alternar 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}' é uma origem de livro de endereços apenas de leitura. Vá à Vista de "
-"Contactos e seleccione um livro de endereços que aceite contactos."
+"'{0}' é um livro de endereços apenas de leitura e não pode ser alterado. "
+"Seleccione outro livro de endereços na barra lateral da vista de Contactos."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -393,11 +389,11 @@ msgstr "Incapaz de remover o livro de endereços."
 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 apenas pode aceder através do Evolution a Livros de Endereços do "
-"Sistema Groupwise. Utilize uma vez um qualquer outro cliente de email "
-"Groupwise para criar as suas pastas de Contactos Frequentes e Pessoais."
+"Sistema GroupWise. Utilize uma vez um qualquer outro cliente de email "
+"GroupWise para criar as suas pastas de Contactos Frequentes e Pessoais."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -417,7 +413,7 @@ msgstr "Falha ao autenticar-se no servidor 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 "Falha ao apagar o contacto"
 
@@ -430,31 +426,27 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "O servidor LDAP não respondeu com informação de esquema válida."
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "Autorização Negada."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "Versão do Servidor"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Algumas funcionalidades poderão não funcionar correctamente com a versão "
 "actual do servidor"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "O livro de endereços do Evolution terminou inesperadamente."
 
-#: ../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 ""
 "A imagem que seleccionou é demasiado grande. Deseja redimensioná-la e "
 "armazená-la?"
 
-#: ../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 "
@@ -464,21 +456,21 @@ msgstr ""
 "suporta esta funcionalidade, ou estar mal configurado. Peça ao administrador "
 "do servidor por suporte para bases de procura."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "Este livro de endereços será definitivamente removido."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "Incapaz de abrir este livro de endereços."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr ""
 "Este servidor de livros de endereços não possui nenhuma base de procura "
 "sugerida."
 
-#: ../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 ""
 "Este servidor de livro de endereços pode estar indisponível, o nome do "
 "servidor mal escrito ou a sua ligação à rede em baixo."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Este servidor não suporta esquema de informação LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "Incapaz de abrir o livro de endereços"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Incapaz de efectuar a procura."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Incapaz de gravar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Deseja gravar as suas alterações?"
 
-#: ../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 ""
 "Está a tentar mover um contacto de um livro de endereços para outro mas este "
 "não pode ser removido da origem. Deseja antes gravar uma cópia?"
 
-#: ../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 ""
 "problemas na utilização do Evolution. Para melhores resultados o servidor "
 "deverá ser actualizado para uma versão suportada"
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "Não possui permissões para apagar contactos neste livro de endereços."
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -561,8 +557,8 @@ msgid "_Use as it is"
 msgstr "_Utilizar 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
-#: ../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}"
 
@@ -571,17 +567,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Endereço de Sincronização Por Omissão:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
+#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load addressbook"
 msgstr "Incapaz de ler o livro de endereços"
 
-#: ../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 "Incapaz de ler o bloco da aplicação de Endereços da pilot"
 
@@ -603,10 +599,10 @@ msgstr "Configurar aqui o completar automaticamente"
 
 #. 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:402
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../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"
 
@@ -615,7 +611,7 @@ msgid "Evolution Address Book"
 msgstr "Livro de Endereços Evolution"
 
 #: ../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 "Popup de endereço do Livro de Endereços Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -645,13 +641,14 @@ msgstr "Efectue aqui a gestão dos seus certificados S/MIME"
 #. 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:497
+#: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
+#: ../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:305
-#: ../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:1457
 msgid "On This Computer"
 msgstr "Neste Computador"
 
@@ -661,34 +658,27 @@ msgstr "Neste Computador"
 #. Create the default Person addressbook
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:505
+#: ../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:491
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
-#: ../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 "Pessoal"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:515
+#: ../addressbook/gui/component/addressbook-component.c:163
+#: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "Em Servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_Contacto"
-
 #: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Criar um novo contacto"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "_Lista de Contactos"
-
 #: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Criar uma nova lista de contactos"
@@ -698,10 +688,6 @@ msgstr "Criar uma nova lista de contactos"
 msgid "New Address Book"
 msgstr "Novo Livro de Endereços"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "Livro de _Endereços"
-
 #: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Criar um novo livro de endereços"
@@ -710,16 +696,16 @@ msgstr "Criar um novo livro de endereços"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Falha ao actualizar as pastas ou definições do Livro de Endereços."
 
-#: ../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 conteúdo do _livro localmente para trabalhar em modo desligado"
@@ -727,18 +713,18 @@ msgstr ""
 #: ../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: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:2338
+#: ../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 "Geral"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "Livro de Endereços"
 
@@ -752,12 +738,12 @@ msgstr "Autenticação"
 
 #: ../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
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalhes"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../mail/em-folder-browser.c:965
 msgid "Searching"
 msgstr "A procurar"
 
@@ -766,30 +752,30 @@ msgid "Downloading"
 msgstr "A Efectuar Download"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propriedades do Livro de Endereços"
 
 #: ../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 "A migrar..."
 
 #: ../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 "A migrar `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:643
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:758
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "Definições de Completar Automaticamente"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -801,7 +787,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -811,7 +797,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -821,7 +807,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -832,48 +818,53 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra os seus dados 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 a pasta \"%s\" para:"
 
-#: ../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 a Pasta"
 
-#: ../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 "Nomes de pastas não podem conter '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:950
 msgid "_New Address Book"
 msgstr "_Novo Livro de Endereços"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:951
 msgid "Save As vCard..."
 msgstr "Gravar como um 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:1349
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:938
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1345
+#: ../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:1340
 #: ../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 "Apa_gar"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "_Propriedades..."
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../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 "_Propriedades"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Selector de Origem do Contacto"
 
@@ -882,16 +873,24 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "A aceder anonimamente ao Servidor 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 "Falha ao autenticar-se.\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 "Introduza a senha para %s (utilizador %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"
+msgstr "Introduza a senha"
+
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "Comprimento do completar automaticamente"
@@ -966,38 +965,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>Autenticação</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Apresentação</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>A Efectuar Download</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>A Procurar</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Informação de Servidor</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>Tipo:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Adicionar Livro de Endereços"
 
-#: ../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 "Sempre"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonimamente"
 
+#. 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 "Navega_r neste livro até atingir o limite"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Básico"
@@ -1025,14 +1021,14 @@ msgid "Lo_gin:"
 msgstr "_Sessão:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../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:25
-#: ../mail/em-account-editor.c:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "Sem encriptação"
 
@@ -1044,7 +1040,7 @@ msgstr "Um"
 #. 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
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "Encriptação SSL"
 
@@ -1112,7 +1108,7 @@ msgstr "Bases de Procura Suportadas"
 #. 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
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "Encriptação TLS"
 
@@ -1211,8 +1207,8 @@ msgid "_Login method:"
 msgstr "_Método de autenticação:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../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:"
@@ -1227,7 +1223,7 @@ msgid "_Search scope:"
 msgstr "Â_mbito da procura:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
@@ -1248,9 +1244,9 @@ msgstr "cartões"
 #: ../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"
 
@@ -1291,7 +1287,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Emprego</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"
@@ -1303,16 +1299,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
 
 #: ../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 "Contacto"
 
 #: ../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 "Editor de Contactos"
 
@@ -1325,7 +1321,7 @@ msgid "Image"
 msgstr "Imagem"
 
 #: ../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"
 
@@ -1338,7 +1334,7 @@ msgid "Nic_kname:"
 msgstr "Al_cunha:"
 
 #: ../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"
 
@@ -1352,11 +1348,11 @@ msgstr "Telefone"
 
 #. 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 "Emprego"
 
@@ -1378,7 +1374,7 @@ msgid "_Birthday:"
 msgstr "_Data de Nascimento:"
 
 #: ../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:"
@@ -1468,1119 +1464,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 "Endereço"
 
-#: ../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:397
+#: ../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 "Editável"
 
-#: ../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ão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albânia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Algéria"
 
-#: ../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árctida"
 
-#: ../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 "Antígua 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 "Argentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Arménia"
 
-#: ../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 "Austrália"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Áustria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Azerbeijão"
 
-#: ../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 "Baraí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 "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Bielorrússia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../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 "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ão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolívia"
 
-#: ../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 "Bósnia e Herzegowina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Bostwana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Ilha 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 "Território Britânico no Oceano Í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 "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 "Bulgária"
 
-#: ../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 "Cambodja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Camarões"
 
-#: ../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 "Ilhas Caimão"
 
-#: ../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 Centro-Africana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Chade"
 
-#: ../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 "Ilha do Natal"
 
-#: ../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 "Ilhas 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 "Colômbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Comoros"
 
-#: ../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, 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 "Ilhas 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 do Marfim"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Croácia"
 
-#: ../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 "Djibouti"
 
-#: ../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 "Equador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Egipto"
 
-#: ../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 "Guiné Equatorial"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Eritreia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Estónia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Ilhas 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 "Ilhas Faraoe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fiji"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finlândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "França"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Guiana 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 "Polinésia 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 "Territórios Sul Franceses"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Gabão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Gâmbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Geórgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Alemanha"
 
-#: ../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écia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Greenland"
 
-#: ../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 "Guadaloupe"
 
-#: ../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 "Guiné"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
-msgstr "Guiné-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
+msgstr "Guiné-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guiana"
 
-#: ../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 "Ilhas 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 "Mar Santo"
 
-#: ../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 "Hungria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Islândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "Índia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonésia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Irão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Iraque"
 
-#: ../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 "Ilha 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 "Itália"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Japão"
 
-#: ../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 "Jordão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Casaquistão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Quénia"
 
-#: ../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 "Coreia, República Popular Democrática da"
 
-#: ../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 "Coreia, República da"
 
-#: ../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 "Kyrgyzstão"
 
-#: ../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 "Letónia"
 
-#: ../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 "Lesoto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Libéria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Líbia"
 
-#: ../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 "Lituânia"
 
-#: ../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 "Macau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Macedónia"
 
-#: ../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 "Malásia"
 
-#: ../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 "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 "Ilhas 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 "Mauritânia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Maurícias"
 
-#: ../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 "Micronésia"
 
-#: ../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 "Moldávia, República da"
 
-#: ../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 "Mongólia"
 
-#: ../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 "Moçambique"
 
-#: ../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 "Namíbia"
 
-#: ../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 "Holanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Antilhas 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 Caledónia"
 
-#: ../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 Zelândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Niquerágua"
 
-#: ../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 "Negéria"
 
-#: ../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 "Ilha 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 "Ilhas 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 "Noruéga"
 
-#: ../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 "Paquistão"
 
-#: ../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 "Território Palestiniano"
 
-#: ../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 "Papua Nova-Guiné"
 
-#: ../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 "Polónia"
 
-#: ../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 "Quatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "Reunião"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Roménia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Federação Russa"
 
-#: ../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 "São Kitts e 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 Lucia"
 
-#: ../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 "São Vicente e as 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 "São 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 "Arábia Saudita"
 
-#: ../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 "Sérvia 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 "Seicheles"
 
-#: ../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 Leoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Singapura"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Eslováquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Eslovénia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Ilhas Salomão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somália"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "África do Sul"
 
-#: ../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 "Geórgia Sul e as Ilhas Sandwich Sul"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Espanha"
 
-#: ../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 "São 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ão"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Suriname"
 
-#: ../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 "Ilhas 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 "Suazilândia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Suécia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Suiça"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Síria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Ilha Formosa (Taiwan)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Tajiquistão"
 
-#: ../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 "Tanzânia, República Unida da"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Tailândia"
 
-#: ../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 "Tunísia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turquemenistão"
 
-#: ../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 "Ilhas Turks 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 "Ucrânia"
 
-#: ../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 "Emirados Á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 "Ilhas Menores Destacadas dos Estados Unidos"
 
-#: ../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 "Uzbequistão"
 
-#: ../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 "Vietname"
 
-#: ../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 "Ilhas Virgens 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 "Ilhas Virgens dos E.U.A"
 
-#: ../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 "Ilhas 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 "Saará Ocidental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Yemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Zâmbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Zimbabué"
 
-#: ../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 "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 "Serviço"
 
-#: ../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 "Localização"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Utilizador"
 
-#: ../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 "Casa"
 
-#: ../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 "Outro"
 
-#: ../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 "Livro de Origem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Target Book"
 msgstr "Livro de Destino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 msgid "Is New Contact"
 msgstr "É um Novo Contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Writable Fields"
 msgstr "Campos Editáveis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Required Fields"
 msgstr "Campos Requeridos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Alterado"
 
-#: ../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 "Editor de Contactos - %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 "Seleccione uma imagem para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "_No image"
 msgstr "_Nenhuma imagem"
 
-#: ../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"
@@ -2588,47 +2586,47 @@ msgstr ""
 "Os dados do contacto são inválidos:\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' possui um formato inválido"
 
-#: ../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' possui um formato inválido"
 
-#: ../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á vazio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
-#: ../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 "Adição Rápida de Contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "_Edição Completa"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "Nome comp_leto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../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:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "_Seleccione o Livro de Endereços"
 
-#: ../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"
@@ -2637,7 +2635,7 @@ msgstr ""
 "Tem a certeza de que deseja\n"
 "apagar 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?"
@@ -2645,7 +2643,7 @@ msgstr ""
 "Tem a certeza de que deseja\n"
 "apagar 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"
@@ -2654,7 +2652,7 @@ msgstr ""
 "Tem a certeza de que deseja\n"
 "apagar este 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?"
@@ -2797,12 +2795,17 @@ msgstr ""
 msgid "Contact List Members"
 msgstr "Membros da Lista de Contacto"
 
+#: ../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 "_Membros"
+
 #: ../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:383
-#: ../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-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 "Livro"
 
@@ -2810,10 +2813,6 @@ msgstr "Livro"
 msgid "Is New List"
 msgstr "É uma Nova Lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "_Membros"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Contacto Alterado:"
@@ -2851,40 +2850,40 @@ msgstr ""
 "O nome ou endereço de email deste contacto já existe nesta\n"
 "pasta.  Ainda assim deseja adicioná-lo?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "Agregar 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 "_Agregar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:185
+msgid "Merge Contact"
+msgstr "Agregar 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: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 "Email"
 
 #: ../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 "Qualquer campo contém"
 
 #: ../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 "Email começa por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Nome começa por"
+msgid "Name contains"
+msgstr "Nome contém"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2898,10 +2897,10 @@ msgstr[0] "%d contacto"
 msgstr[1] "%d contactos"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../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-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 "Consulta"
 
@@ -2909,12 +2908,12 @@ msgstr "Consulta"
 msgid "Error getting book view"
 msgstr "Erro ao obter a vista de livro"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../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 "Modelo"
 
@@ -2922,107 +2921,109 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao alterar o cartão"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "Nome começa por"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Origem"
 
-#: ../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 "Tipo"
 
-#: ../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 "Gravar como um vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1134
-#: ../calendar/gui/e-calendar-table.c:1327
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:921
+#: ../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:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Novo Contacto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Nova _Lista de Contactos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_Gravar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Reenviar Contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Reenviar Contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Enviar _Mensagem para o Contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Enviar _Mensagem para a Lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Enviar _Mensagem para os Contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "C_opiar para o Livro de Endereços..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver para o Livro de Endereços..."
 
-#: ../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 "Cor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1335
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:929
-#: ../composer/e-msg-composer.c:3103 ../mail/em-folder-tree.c:1013
-#: ../mail/em-folder-view.c:1330 ../mail/message-list.c:2062
+#: ../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:1325 ../mail/message-list.c:2044
 #: ../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-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "Col_ar"
 
 #. 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 "Qualquer Categoria"
 
 #. 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 "Outro erro"
 
@@ -3057,7 +3058,7 @@ msgstr "Telefone do Carro"
 
 #: ../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
@@ -3158,9 +3159,9 @@ msgid "Radio"
 msgstr "Rádio"
 
 #: ../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 "Cargo"
 
@@ -3196,38 +3197,38 @@ msgid "Web Site"
 msgstr "Página 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:3069 ../widgets/table/e-table-item.c:3070
-#: ../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 "Largura"
 
 #: ../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:3075 ../widgets/table/e-table-item.c:3076
-#: ../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 "Altura"
 
 #: ../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 "Tem Foco"
 
@@ -3247,11 +3248,21 @@ msgstr "Modelo de Texto"
 msgid "Max field name length"
 msgstr "Comprimento máx. do nome do campo"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
 msgid "Column Width"
 msgstr "Largura da Coluna"
 
-#: ../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 procurar pelos Contactos..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3265,7 +3276,7 @@ msgstr ""
 "\n"
 "ou faça clique-duplo aqui para criar um novo Contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3279,7 +3290,7 @@ msgstr ""
 "\n"
 "Faça clique-duplo aqui para criar um novo Contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3289,7 +3300,7 @@ msgstr ""
 "\n"
 "Procure o Contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3299,40 +3310,41 @@ msgstr ""
 "\n"
 "Não existem itens a apresentar nesta vista."
 
-#: ../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 "Email Profissional"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Email Pessoal"
 
-#: ../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 "Outro Email"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Tem Cursor"
 
-#: ../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 "Abrir o Link no _Navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Copiar a Localização do Link"
 
-#: ../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 "_Enviar uma Nova Mensagem Para..."
 
@@ -3354,7 +3366,7 @@ msgid "map"
 msgstr "mapa"
 
 #: ../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 "Membros da Lista"
 
@@ -3375,15 +3387,15 @@ msgid "Video Chat"
 msgstr "Diálogo Vídeo"
 
 #: ../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:83
-#: ../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
@@ -3392,8 +3404,7 @@ msgstr "Calendário"
 
 #: ../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 "Livre/Ocupado"
 
@@ -3415,124 +3426,127 @@ msgid "Web Log"
 msgstr "Diário na Web"
 
 #: ../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 "Data de Nascimento"
 
 #: ../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 "Aniversário"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "Título do Cargo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Página pessoal"
 
-#: ../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 "Sucesso"
 
 #. 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 "Módulo de suporte ocupado"
 
 #. 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 "Repositório desligado"
 
 #. 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 "Livro de Endereços não existe"
 
 #. 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 "Nenhum Contacto Próprio definido"
 
 #. 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 "Autorização negada"
 
 #. 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 "Contacto não foi encontrado"
 
 #. 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 de contacto já existe"
 
 #. 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 "Protocolo não é suportado"
 
 #. 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:403 ../calendar/gui/print.c:2521
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "Cancelado"
 
 #. 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 "Incapaz de cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-#: ../calendar/gui/comp-editor-factory.c:422
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "Autenticação Falhou"
 
 #. 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 "Autenticação Requerida"
 
 #. 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 Indisponível"
 
 #. 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 "Origem inexistente"
 
 #. 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 "Indisponível em modo desligado"
 
 #. 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 "Versão do servidor inválida"
 
-#: ../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 "
@@ -3543,7 +3557,7 @@ msgstr ""
 "o seu download. Leia o livro de endereços uma vez quando ligado para "
 "efectuar o download do seu conteúdo"
 
-#: ../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 "
@@ -3552,7 +3566,7 @@ msgstr ""
 "Incapaz de abrir este livro de endereços.  Certifique-se de que o caminho %s "
 "existe e de que possui permissões para lhe aceder."
 
-#: ../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."
@@ -3560,7 +3574,7 @@ msgstr ""
 "Incapaz de abrir este livro de endereços.  Isto significa que ou introduziu "
 "um URI incorrecto ou o servir LDAP está inacessível."
 
-#: ../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 "
@@ -3570,7 +3584,7 @@ msgstr ""
 "deseja utilizar LDAP no Evolution terá de instalar um pacote do Evolution "
 "com o LDAP activo."
 
-#: ../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."
@@ -3578,7 +3592,7 @@ msgstr ""
 "Incapaz de abrir este livro de endereços.  Isto ou significa que introduziu "
 "um URI incorrecto, ou que o servidor está inacessível."
 
-#: ../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"
@@ -3590,7 +3604,7 @@ msgstr ""
 "forma mais específica ou aumente o limite de resultados nas preferências\n"
 "do servidor de directório para este livro de endereços."
 
-#: ../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"
@@ -3602,47 +3616,47 @@ msgstr ""
 "forma mais específica ou aumente o limite de tempo nas preferências do\n"
 "servidor de directório para este livro de endereços."
 
-#: ../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 ""
-"O suporte para este livro de endereços foi incapaz de parsear a consulta."
+"O suporte para este livro de endereços foi incapaz de processar a consulta."
 
-#: ../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 ""
 "O suporte para este livro de endereços recusou-se a efectuar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "This query did not complete successfully."
 msgstr "Esta consulta não terminou com sucesso."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:194
 msgid "Error adding list"
 msgstr "Erro ao adicionar a lista"
 
-#: ../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 "Erro ao adicionar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying list"
 msgstr "Erro ao alterar a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:205
 msgid "Error modifying contact"
 msgstr "Erro ao alterar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 msgid "Error removing list"
 msgstr "Erro ao remover a lista"
 
-#: ../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 "Erro ao remover o contacto"
 
-#: ../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"
@@ -3657,16 +3671,16 @@ msgstr[1] ""
 "Abrir %d contactos irá abrir %d novas janelas.\n"
 "Deseja mesmo visualizar todos estes contactos?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "_Don't Display"
 msgstr "_Não Apresentar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Display _All Contacts"
 msgstr "Apresentar _Todos os Contactos"
 
 #. 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"
@@ -3675,7 +3689,7 @@ msgstr ""
 "%s já existe\n"
 "Deseja sobrepo-lo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:338
 msgid "Overwrite"
 msgstr "Sobrepor"
 
@@ -3718,26 +3732,27 @@ msgstr "Mover contactos para"
 msgid "Copy contacts to"
 msgstr "Copiar contactos para"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:883
 msgid "Multiple vCards"
 msgstr "Múltiplos 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 de %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 "Informação de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:930
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informação de contacto para %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:301
 msgid "Querying Address Book..."
 msgstr "A Consultar o Livro de Endereços..."
 
@@ -3765,43 +3780,43 @@ msgstr "Gravar no livro de endereços"
 msgid "Card View"
 msgstr "Vista de Cartão"
 
-#: ../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 "A Importar..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:860
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importador de CSV e Tabs do Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:869
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importador de CSV e Tabs do Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:878
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab do Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador de CSV e Tabs do Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de Intercâmbio de Dados LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF do Evolution"
 
@@ -3854,11 +3869,11 @@ 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
-#: ../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 "Cabeçalho"
@@ -3961,7 +3976,7 @@ msgstr "Sombreado"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:981
+#: ../plugins/exchange-operations/exchange-account-setup.c:1069
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -3980,7 +3995,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:"
 
@@ -4090,13 +4105,22 @@ msgstr "Erro não manipulado"
 #. 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}' é uma origem de calendário apenas de leitura. Vá à Vista de "
-"Calendários e seleccione um calendário que aceite a marcação de compromissos."
+"'{0}' é um calendário apenas de leitura e não pode ser alterado. Seleccione "
+"outro calendário na barra lateral da vista de Calendário."
 
-#: ../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}' é um calendário apenas de leitura e não pode ser alterado. Seleccione "
+"outro calendário que aceite compromissos."
+
+#: ../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."
@@ -4104,7 +4128,7 @@ msgstr ""
 "Adicionar um resumo coerente ao seu compromisso dará aos seus receptores uma "
 "ideia sobre o teor do mesmo."
 
-#: ../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."
@@ -4112,16 +4136,16 @@ msgstr ""
 "Adicionar um resumo coerente à sua tarefa dará aos seus receptores uma ideia "
 "sobre o teor da mesma."
 
-#: ../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 ""
 "Toda a informação nestes memos será apagada e não poderá ser recuperada."
 
-#: ../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 "Toda a informação neste memo será apagada e não poderá ser recuperada."
 
-#: ../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."
@@ -4129,124 +4153,131 @@ msgstr ""
 "Toda a informação relativa a estes compromissos será apagada e não poderá "
 "ser reposta."
 
-#: ../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 ""
 "Toda a informação relativa a estas tarefas será apagada e não poderá ser "
 "reposta."
 
-#: ../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 ""
 "Toda a informação relativa a este compromisso será apagada e não poderá ser "
 "reposta."
 
-#: ../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 ""
 "Toda a informação relativa a esta reunião será apagada e não poderá ser "
 "reposta."
 
-#: ../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 "Toda a informação neste memo será apagada e não poderá ser recuperada."
 
-#: ../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 ""
 "Toda a informação relativa a esta tarefa será apagada e não poderá ser "
 "reposta."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Tem a certeza de que deseja apagar a tarefa '{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 "Tem a certeza de que deseja apagar o compromisso entitulado '{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 "Tem a certeza de que deseja apagar o memo '{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 "Tem a certeza de que deseja apagar estes {0} compromissos?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Tem a certeza de que deseja apagar estes {0} memos?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Tem a certeza de que deseja apagar estas {0} tarefas?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Tem a certeza de que deseja apagar este compromisso?"
 
-#: ../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 "Tem a certeza de que deseja apagar esta reunião?"
 
-#: ../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 "Tem a certeza de que deseja apagar este memo?"
 
-#: ../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 "Tem a certeza de que deseja apagar esta tarefa?"
 
-#: ../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 "Tem a certeza de que deseja gravar o memo sem um resumo?"
 
-#: ../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 "Tem a certeza de que deseja enviar o compromisso sem um resumo?"
 
-#: ../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 "Tem a certeza de que deseja enviar a tarefa sem um resumo?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "Incapaz de criar um novo evento"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "Incapaz de gravar o evento"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "Apagar o calendário '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "Apagar a lista de memos '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "Apagar a lista de tarefas '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "_Não Enviar"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Download em curso. Deseja gravar este compromisso?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Download em curso. Deseja gravar esta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "Incapaz de ler o editor."
 
-#: ../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."
@@ -4254,26 +4285,26 @@ msgstr ""
 "Serão enviados convites por email a todos os participantes e ser-lhes-á "
 "permitido aceitar esta tarefa."
 
-#: ../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 ""
 "Serão enviados convites a todos os participantes e ser-lhes-á possível "
 "responder."
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "Erro ao ler o calendário"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "Erro ao ler a lista de memos"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "Erro ao ler a lista de tarefas"
 
-#: ../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."
@@ -4281,7 +4312,7 @@ msgstr ""
 "Se não enviar uma notificação de cancelamento, os outros participantes "
 "poderão não tomar conhecimento de que a reunião foi cancelada."
 
-#: ../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."
@@ -4289,7 +4320,7 @@ msgstr ""
 "Se não enviar uma notificação de cancelamento, os outros participantes "
 "poderão não tomar conhecimento de que o memo foi apagado."
 
-#: ../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."
@@ -4297,7 +4328,7 @@ msgstr ""
 "Se não enviar uma notificação de cancelamento, os outros participantes "
 "poderão não tomar conhecimento de que a tarefa foi apagada."
 
-#: ../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."
@@ -4305,7 +4336,7 @@ msgstr ""
 "Enviar informação actualizada permite aos outros participantes manter os "
 "seus calendários actualizados."
 
-#: ../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."
@@ -4313,7 +4344,7 @@ msgstr ""
 "Enviar informação actualizada permite aos outros participantes manter as "
 "suas listas de tarefas actualizadas."
 
-#: ../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."
@@ -4321,7 +4352,7 @@ msgstr ""
 "Está a ser efectuado o download de alguns anexos. Gravar o compromisso irá "
 "resultar na perca destes anexos."
 
-#: ../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."
@@ -4329,86 +4360,86 @@ msgstr ""
 "Está a ser efectuado o download de alguns anexos. Gravar a tarefa irá "
 "resultar na perca destes anexos."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Algumas funcionalidades poderão não funcionar correctamente com o seu "
 "servidor actual."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "O calendário Evolution terminou inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "O memo Evolution terminou inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas Evolution terminaram inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "O calendário não está marcado para utilização quando desligado."
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "A lista de memos não está marcada para utilização quando desligado"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "A lista de memos não está marcada para utilização quando desligado."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "A lista de tarefas não está marcada para utilização quando desligado."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "Este calendário será definitivamente removido."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de memos será definitivamente removida."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas será definitivamente removida."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Deseja gravar as alterações efectuadas a este compromisso?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "Deseja gravar as alterações efectuadas a este memo?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "Deseja gravar as alterações efectuadas a esta tarefa?"
 
-#: ../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 "Deseja enviar uma notificação de cancelamento deste memo?"
 
-#: ../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 ""
 "Deseja enviar uma notificação de cancelamento a todos os participantes?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Deseja enviar aos convocados convites de participação?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "Deseja enviar esta tarefa a participantes?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Deseja enviar informação actualizada da reunião aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "Deseja enviar informação actualizada da tarefa aos participantes?"
 
-#: ../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 "
@@ -4418,117 +4449,110 @@ msgstr ""
 "problemas na utilização do Evolution. Para melhores resultados o servidor "
 "deverá ser actualizado para uma versão suportada."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Efectuou alterações a este compromisso, mas ainda não as gravou."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "Efectuou alterações a esta tarefa, mas ainda não as gravou."
 
-#: ../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 "Efectuou alterações a este memo, mas ainda não as gravou."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Os seus calendários não estarão disponíveis até que o Evolution seja "
 "reiniciado."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Os seus memos não estarão disponíveis até que o Evolution seja reiniciado."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "As suas tarefas não estarão disponíveis até que o Evolution seja reiniciado."
 
-#: ../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 "_Descartar as Alterações"
 
-#: ../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 "_Gravar"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "_Gravar as Alterações"
 
-#: ../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 "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "_Enviar Notificação"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:50
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "Introduza a senha"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Dividir Eventos Multi-Dias:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1515
-#: ../calendar/conduits/calendar/calendar-conduit.c:1516
-#: ../calendar/conduits/memo/memo-conduit.c:816
-#: ../calendar/conduits/memo/memo-conduit.c:817
-#: ../calendar/conduits/todo/todo-conduit.c:1014
-#: ../calendar/conduits/todo/todo-conduit.c:1015
+#: ../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 "Incapaz de iniciar o evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1623
-#: ../calendar/conduits/calendar/calendar-conduit.c:1626
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Incapaz de ler o bloco da aplicação de Calendário da pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:910
-#: ../calendar/conduits/memo/memo-conduit.c:913
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Incapaz de ler o bloco da aplicação de Memos da pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:957
-#: ../calendar/conduits/memo/memo-conduit.c:960
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Incapaz de escrever o bloco da aplicação de Memos da pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Prioridade por Omissão:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1098
-#: ../calendar/conduits/todo/todo-conduit.c:1101
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Incapaz de ler o bloco da aplicação de A Fazer da pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1143
-#: ../calendar/conduits/todo/todo-conduit.c:1146
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Incapaz de escrever o bloco da aplicação de A Fazer da pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Calendar and Tasks"
 msgstr "Calendário 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 "Calendários"
 
@@ -4569,25 +4593,25 @@ msgid "Memo_s"
 msgstr "Memo_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 "Memos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/e-tasks.c:1435
-#: ../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:83
-#: ../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 "Tarefas"
@@ -4605,25 +4629,25 @@ msgstr "_Tarefas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Serviço de alarme de notificação do Calendário 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] "minuto"
 msgstr[1] "minutos"
 
-#: ../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:716
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Hora de início"
 
@@ -4634,9 +4658,9 @@ msgstr "Compromissos"
 
 #. 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 "Localização:"
@@ -4646,17 +4670,15 @@ msgid "Snooze _time:"
 msgstr "_Tempo de adiamento:"
 
 #: ../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 "_Editar"
 
@@ -4668,32 +4690,32 @@ msgstr "_Adiar"
 msgid "location of appointment"
 msgstr "localização do compromisso"
 
-#: ../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 "Nenhum resumo disponível."
 
-#: ../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 "Nenhuma descrição disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1478
 msgid "No location information available."
 msgstr "Nenhuma informação de local disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "Possui %d alertas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1517
+#: ../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"
@@ -4705,7 +4727,7 @@ msgstr ""
 "configurado para enviar um email.  O Evolution\n"
 "irá apresentar um diálogo de lembrete 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 "
@@ -4722,15 +4744,15 @@ msgstr ""
 "\n"
 "Tem a certeza que deseja executar esta aplicação?"
 
-#: ../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 "Não perguntar novamente sobre esta aplicação."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "Incapaz de inicializar o 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..."
@@ -4743,7 +4765,7 @@ msgid "invalid time"
 msgstr "hora invá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"
@@ -4752,7 +4774,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"
@@ -4763,7 +4785,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"
@@ -4782,12 +4804,12 @@ msgstr "Pedir confirmação ao apagar itens"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr ""
-"Cor de fundo das tarefas cujo prazo termina hoje, no formato \"#rrggbb\"."
+"Cor de fundo das tarefas cuja data limite é hoje, no formato \"#rrggbb\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr ""
-"Cor de fundo das tarefas cujo prazo já terminou, no formato \"#rrggbb\"."
+"Cor de fundo das tarefas cuja data limite já passou, no formato \"#rrggbb\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
@@ -5018,12 +5040,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Apresentar o campo de estado no editor de eventos/tarefas/compromissos"
 
 #: ../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 "Apresentar o painel de \"Antevisão\""
 
 #: ../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 "Apresentar o painel de \"Antevisão\"."
 
@@ -5041,7 +5063,7 @@ msgstr "Apresentar os números das semanas no navegador de datas"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
-msgstr "Cor das tarefas cujo prazo termina hoje"
+msgstr "Cor das tarefas cuja data limite é hoje"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
@@ -5224,66 +5246,66 @@ msgstr "Minuto a que se inicia o expediente"
 msgid "daylight savings time"
 msgstr "horário de verão"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Summary contains"
 msgstr "Resumo contém"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Description contains"
 msgstr "Descrição contém"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Category is"
 msgstr "Categoria é"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Location contains"
 msgstr "Localização contém"
 
-#: ../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 "Sem equivalência"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:630
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos Próximos 7 Dias"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Active Tasks"
 msgstr "Tarefas Activas"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Overdue Tasks"
 msgstr "Tarefas Atrasadas"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:642
 msgid "Completed Tasks"
 msgstr "Tarefas Terminadas"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Tasks with Attachments"
 msgstr "Tarefas com Anexos"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:692
 msgid "Active Appointments"
 msgstr "Compromissos Activos"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Next 7 Days' Appointments"
 msgstr "Compromissos dos Próximos 7 Dias"
 
-#: ../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 "
@@ -5293,16 +5315,16 @@ msgstr ""
 "que o perído de tempo seleccionado. Se continuar, não lhe será possível "
 "recuperar estas tarefas."
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Expurgar eventos mais antigos do 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:717
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dias"
 
@@ -5310,103 +5332,79 @@ msgstr "dias"
 #. 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:511
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
-#: ../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:405
+#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Datas de Nascimento & Aniversários"
 
 #. 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 "O Tempo"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:616
 msgid "_New Calendar"
 msgstr "_Novo Calendário"
 
-#: ../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 "_Copiar..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1136
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3634 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Propriedades"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:950
 msgid "Failed upgrading calendars."
 msgstr "Falha ao actualizar os calendários."
 
-#: ../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 "Incapaz de abrir o calendário '%s' para criar eventos e reuniões"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1265
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Não existe nenhum calendário disponível para criar eventos e reuniões"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1378
 msgid "Calendar Source Selector"
 msgstr "Selector de Origem do Calendário"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: ../calendar/gui/calendar-component.c:1586
-msgid "_Appointment"
-msgstr "_Compromisso"
-
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nova reunião"
 
-#: ../calendar/gui/calendar-component.c:1594
-msgid "M_eeting"
-msgstr "R_eunião"
-
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Criar uma nova convocatória de reunião"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Novo compromisso de dia completo"
 
-#: ../calendar/gui/calendar-component.c:1602
-msgid "All Day A_ppointment"
-msgstr "Com_promisso de Dia Completo"
-
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso de dia completo"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Novo calendário"
 
-#: ../calendar/gui/calendar-component.c:1610
-msgid "Cale_ndar"
-msgstr "Cale_ndário"
-
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Criar um novo calendário"
 
@@ -5427,32 +5425,236 @@ msgid "Month View"
 msgstr "Vista de Mês"
 
 #: ../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 "Qualquer 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 "Profissional"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Categoria"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Classificação"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Competição"
+
+#: ../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 "Descrição"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Descrição Contém"
 
-#: ../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ão 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 "Presentes"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Metas/Objectivos"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Feriado"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Cartões Festivos"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Contactos Importantes"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Ideias"
+
+#: ../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 "Vários"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Próximos 7 dias"
+
+#: ../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 Telefónicas"
+
+#: ../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 "Recorrência"
+
+#: ../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 "Estratégias"
+
+#: ../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 "Resumo Contém"
 
-#: ../calendar/gui/comp-editor-factory.c:404
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Fornecedores"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Horas &amp; Despesas"
+
+#: ../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 "A Aguardar"
+
+#: ../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ém"
+
+#: ../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 "não contém"
+
+#: ../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 "não é"
+
+#: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir o calendário"
 
-#: ../calendar/gui/comp-editor-factory.c:410
+#: ../calendar/gui/comp-editor-factory.c:411
 msgid "Method not supported when opening the calendar"
 msgstr "Método não suportado ao abrir o calendário"
 
-#: ../calendar/gui/comp-editor-factory.c:416
+#: ../calendar/gui/comp-editor-factory.c:417
 msgid "Permission denied to open the calendar"
 msgstr "Autorização negada ao abrir o calendário"
 
-#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:602
 msgid "Edit Alarm"
 msgstr "Editar Alarme"
 
@@ -5485,17 +5687,17 @@ msgid "Mes_sage:"
 msgstr "Men_sagem:"
 
 #: ../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 "Reproduzir um som"
 
 #: ../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 "Apresentar um alerta em popup"
 
 #: ../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 uma aplicação"
 
@@ -5508,7 +5710,7 @@ msgid "Send To:"
 msgstr "Enviar Para:"
 
 #: ../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 uma mensagem"
 
@@ -5555,7 +5757,10 @@ msgstr "tempos extra 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)"
 
@@ -5563,7 +5768,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "início do compromisso"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
 msgid "Action/Trigger"
 msgstr "Acção/Despoletar"
 
@@ -5574,16 +5779,15 @@ msgstr "A_dicionar"
 #: ../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 "_Sugerir a apresentação automática do anexo"
 
-#: ../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)"
 
@@ -5653,8 +5857,8 @@ msgid "Display"
 msgstr "Apresentação"
 
 #: ../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 "Sexta-Feira"
 
@@ -5669,8 +5873,8 @@ msgstr ""
 "Dias"
 
 #: ../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 "Segunda-Feira"
 
@@ -5693,7 +5897,7 @@ msgstr ""
 "Domingo"
 
 #: ../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 "Seleccione uma cor"
 
@@ -5703,8 +5907,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"
 
@@ -5721,14 +5925,14 @@ msgid "Show week _numbers in date navigator"
 msgstr "Apresentar 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"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "T_asks due today:"
-msgstr "T_arefas cujo prazo termina hoje:"
+msgstr "T_arefas cuja data limite é hoje:"
 
 #. Thursday
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
@@ -5740,8 +5944,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 "Quinta-Feira"
 
@@ -5755,14 +5959,14 @@ msgid "Time format:"
 msgstr "Formato de 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 "Terça-Feira"
 
 #: ../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 "Quarta-Feira"
 
@@ -5841,311 +6045,462 @@ msgstr "_Qua"
 msgid "before every appointment"
 msgstr "antes de todos os compromissos"
 
-#: ../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 o conteúdo do calendário localmente para trabalhar em modo desligado"
 
-#: ../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 o conteúdo da lista de tarefas localmente para trabalhar em modo "
 "desligado"
 
-#: ../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 ""
 "Cop_iar o conteúdo da lista de memos localmente para trabalhar em modo "
 "desligado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "C_ores:"
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+msgid "Colo_r:"
+msgstr "Co_res:"
 
-#: ../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 Memos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "Calendar Properties"
 msgstr "Propriedades do Calendário"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:474
 msgid "New Calendar"
 msgstr "Novo Calendário"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:530
 msgid "Task List Properties"
 msgstr "Propriedades da Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:530
+msgid "New Task List"
+msgstr "Nova Lista de Tarefas"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
+msgid "Memo List Properties"
+msgstr "Propriedades da Lista de Memos"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:586
 msgid "New Memo List"
 msgstr "Nova Lista de Memos"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Este evento foi apagado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi apagada."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This memo has been deleted."
 msgstr "Este memo foi apagado."
 
-#: ../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  Efectuou alterações. Esquecer estas alterações e fechar 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  Não efectuou quaisquer alterações, fechar 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 alterado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Esta tarefa foi alterada."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This memo has been changed."
 msgstr "Este memo foi alterado."
 
-#: ../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  Efectuou alterações. Esquecer essas alterações 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  Não efectuou quaisquer alterações, actualizar o editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:443
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erro de validação: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2338
+#: ../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:2342
+#: ../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:2344
+#: ../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:2349
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
 msgid " (Due "
-msgstr " (Prazo "
+msgstr " (Limite "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
 msgid "Due "
-msgstr "Prazo "
+msgstr "Limite "
 
-#: ../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 "Mensagem anexa - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3040
+#: ../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] "Mensagem anexa"
 msgstr[1] "%d mensagens anexas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3104
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1191 ../mail/message-list.c:2063
+#: ../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:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3106
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2065
+#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Cancelar A_rrastar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:669
-#: ../calendar/gui/dialogs/comp-editor.c:2827 ../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 "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:831
+#: ../calendar/gui/dialogs/comp-editor.c:841
 msgid "Could not update object"
 msgstr "Incapaz de actualizar o objecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:981 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:929
+msgid "Edit Appointment"
+msgstr "Editar Compromisso"
+
+#: ../calendar/gui/dialogs/comp-editor.c:936
+#, c-format
+msgid "Meeting - %s"
+msgstr "Reunião - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:938
+#, c-format
+msgid "Appointment - %s"
+msgstr "Compromisso - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:944
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tarefa Atribuída - %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 "Memo - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:967
+msgid "No Summary"
+msgstr "Sem Resumo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Click here to close the current window"
+msgstr "Clique aqui para fechar a janela actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Copy selected text to the clipboard"
+msgstr "Copiar o texto seleccionado para a área de transferência"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1275
+msgid "Cut selected text to the clipboard"
+msgstr "Cortar o texto seleccionado para a área de transferência"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+msgid "Click here to view help available"
+msgstr "Clique aqui para consultar a ajuda disponível"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1289
+msgid "Paste text from the clipboard"
+msgstr "Colar o texto da área de transferência"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+msgid "Click here to save the current window"
+msgstr "Clique aqui para gravar a janela 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 "_Classificação"
+
+#: ../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 "_Ajuda"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1352
+msgid "_Insert"
+msgstr "_Inserir"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1359
+msgid "_Options"
+msgstr "_Opções"
+
+#: ../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 "Clique aqui para anexar um ficheiro"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1386
+msgid "_Categories"
+msgstr "_Categorias"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1388
+msgid "Toggles whether to display categories"
+msgstr "Alterna se apresentar ou não as categorias"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+msgid "Time _Zone"
+msgstr "Fuso-_Horário"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+msgid "Toggles whether the time zone is displayed"
+msgstr "Alterna se o fuso horário é ou não apresentado"
+
+#: ../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 "Classificar 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 "Classificar 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 "Classificar como confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1429
+msgid "R_ole Field"
+msgstr "Campo de _Papel"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1431
+msgid "Toggles whether the Role field is displayed"
+msgstr "Alterna se o campo de Papel é ou não apresentado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1437
+msgid "_RSVP"
+msgstr "_Responder SFF"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1439
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Alterna se o campo Responder SFF é ou não apresentado"
+
+#: ../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 se o campo de Estado é ou não apresentado"
+
+#: ../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 se o Tipo de Participante é ou não apresentado"
+
+#: ../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:1013
+#: ../calendar/gui/dialogs/comp-editor.c:1911
 msgid "Hide Attachment _Bar"
 msgstr "Esconder a _Barra de Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1016
-#: ../calendar/gui/dialogs/comp-editor.c:1564
+#: ../calendar/gui/dialogs/comp-editor.c:1914
+#: ../calendar/gui/dialogs/comp-editor.c:2222
 msgid "Show Attachment _Bar"
 msgstr "Apresentar a _Barra de Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3633
+#: ../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 "_Remover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
-#: ../composer/e-msg-composer.c:3636
+#: ../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 "_Adicionar um anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1588
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../mail/em-format-html-display.c:2194
 msgid "Show Attachments"
 msgstr "Apresentar os Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1589
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 msgid "Press space key to toggle attachment bar"
 msgstr "Prima a tecla de espaços para alternar a barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
-msgid "Edit Appointment"
-msgstr "Editar Compromisso"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#, c-format
-msgid "Meeting - %s"
-msgstr "Reunião - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
-#, c-format
-msgid "Appointment - %s"
-msgstr "Compromisso - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2207
-#: ../calendar/gui/dialogs/comp-editor.c:2250
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Tarefa Atribuída - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2209
-#: ../calendar/gui/dialogs/comp-editor.c:2252
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2212
-#: ../calendar/gui/dialogs/comp-editor.c:2255
-#, c-format
-msgid "Memo - %s"
-msgstr "Memo - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2223
-#: ../calendar/gui/dialogs/comp-editor.c:2265
-msgid "No summary"
-msgstr "Sem resumo"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2916
-#: ../calendar/gui/dialogs/comp-editor.c:2970
-#: ../calendar/gui/dialogs/comp-editor.c:2994
+#: ../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 ""
 "Alterações efectuadas a este item poderão ser descartadas se chegarem "
 "actualizações"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3023
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Incapaz de utilizar a versão actual!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "Incapaz de abrir a origem"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "Incapaz de 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 é apenas de leitura"
 
-#: ../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 ""
 "_Apagar este item da caixa de correio de todos os outros destinatários?"
 
-#: ../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 não pode ser apagado devido a um erro 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 não pode ser apagada devido a um erro 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 "O memo não pode ser apagado devido a um erro 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 item não pode ser apagado devido a um erro 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 não pode ser apagado pois a autorização foi negada"
 
-#: ../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 não pode ser apagada pois a autorização foi negada"
 
-#: ../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 "O memo não pode ser apagado pois a autorização foi negada"
 
-#: ../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 item não pode ser apagado pois a autorização foi negada"
 
-#: ../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 não pode ser apagado devido a um 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 não pode ser apagada devido a um 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 "O memo não pode ser apagado devido a um 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 item não pode ser apagado devido a um erro"
 
@@ -6154,7 +6509,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 A:"
 
@@ -6162,135 +6517,181 @@ msgstr "Delegar A:"
 msgid "Enter Delegate"
 msgstr "Introduzir Delegado"
 
-#: ../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 "Clique aqui para definir ou remover alarmes para este evento"
+
+#: ../calendar/gui/dialogs/event-editor.c:202
+msgid "_Recurrence"
+msgstr "_Recorrência"
+
+#: ../calendar/gui/dialogs/event-editor.c:204
+msgid "Make this a recurring event"
+msgstr "Tornar este evento como 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 "Opções de Envio"
+
+#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/task-editor.c:124
+msgid "Insert advanced send options"
+msgstr "Inserir opções avançadas de envio"
+
+#: ../calendar/gui/dialogs/event-editor.c:219
+msgid "All _Day Event"
+msgstr "Evento de _Dia Completo"
+
+#: ../calendar/gui/dialogs/event-editor.c:221
+msgid "Toggles whether to have All Day Event"
+msgstr "Alterna se ter ou não apresentado Eventos de Dia Completo"
+
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Apresentar Horas como _Ocupadas"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Alterna se apresentar ou não o tempo como ocupado"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
+msgid "_Free/Busy"
+msgstr "_Livre/Ocupado"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+msgid "Query free / busy information for the attendees"
+msgstr "Consultar a informação de livre/ocupado dos participantes"
+
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Appoint_ment"
 msgstr "Compro_misso"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "Recorrência"
-
-#: ../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 possui alertas"
 
-#: ../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 "Participa_ntes"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1027
 msgid "Event with no start date"
 msgstr "Evento sem data de início"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no end date"
 msgstr "Evento sem data de finalização"
 
-#: ../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 "Data de início incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1209
 msgid "End date is wrong"
 msgstr "Data de finalização incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1232
 msgid "Start time is wrong"
 msgstr "Hora de início incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1239
 msgid "End time is wrong"
 msgstr "Hora de finalização 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 já não possui uma 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 "É necessário um 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 "É necessário pelo menos um 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 "_Adicionar "
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Incapaz de abrir o calendário '%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á a agir em 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 dia antes do compromisso"
 msgstr[1] "%d dias antes do compromisso"
 
-#: ../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 do compromisso"
 msgstr[1] "%d horas antes do compromisso"
 
-#: ../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 do compromisso"
 msgstr[1] "%d minutos antes do compromisso"
 
-#: ../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: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:200
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2006
-#: ../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 "Nenhum(a)"
 
@@ -6362,28 +6763,24 @@ msgstr "Alterar o Organi_zador"
 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:2446
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Incapaz de abrir os memos em '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1539
-#: ../mail/em-format-html.c:1597 ../mail/em-format-html.c:1623
-#: ../mail/em-format-quote.c:207 ../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: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"
 msgstr "Para"
 
@@ -6401,54 +6798,58 @@ msgid "_Description:"
 msgstr "_Descrição:"
 
 #: ../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á a alterar um evento recorrente. O que deseja alterar?"
 
-#: ../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á a delegar um evento recorrente. O que deseja 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á a alterar uma tarefa recorrente. O que deseja alterar?"
 
-#: ../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á a alterar um memo recorrente. O que deseja alterar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "Apenas Esta Instância"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "Esta Instância e Anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "Esta Instância e Futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "Todas as Instâncias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Este compromisso contém recorrências que o Evolution não pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Data de recorrência é 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "a"
 
@@ -6456,7 +6857,7 @@ msgstr "a"
 #. * (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"
 
@@ -6465,7 +6866,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"
 
@@ -6473,7 +6874,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"
 
@@ -6481,7 +6882,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 "quarto"
 
@@ -6489,13 +6890,13 @@ msgstr "quarto"
 #. * (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"
 
@@ -6503,7 +6904,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 "1º ao 10º"
 
@@ -6511,7 +6912,7 @@ msgstr "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 "11º ao 20º"
 
@@ -6519,45 +6920,45 @@ msgstr "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 "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 "dia"
 
 #. 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 "ocorrências"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Adicionar excepção"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Incapaz de obter uma selecção para alterar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Alterar a excepção"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Incapaz de obter uma selecção para apagar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Data/Hora"
 
@@ -6608,12 +7009,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 "Data de finalização incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:478
 msgid "Web Page"
 msgstr "Página Web"
 
@@ -6628,48 +7029,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: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:402 ../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:2518 ../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 "Terminada"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:327 ../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:1065
 msgid "High"
 msgstr "Alta"
 
 #: ../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:748
-#: ../calendar/gui/e-calendar-table.c:401 ../calendar/gui/print.c:2515
+#: ../calendar/gui/e-cal-model-tasks.c:750
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "Em Curso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:329 ../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:1063
 msgid "Low"
 msgstr "Baixa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:965 ../calendar/gui/e-calendar-table.c:328
-#: ../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:1064
 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:400 ../calendar/gui/print.c:2512
+#: ../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 "Por Iniciar"
 
@@ -6682,7 +7090,7 @@ msgid "Stat_us:"
 msgstr "Esta_do:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:330
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -6691,7 +7099,7 @@ msgid "_Date completed:"
 msgstr "_Data de finalização:"
 
 #: ../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 "_Prioridade:"
 
@@ -6699,25 +7107,37 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "Página _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 "Detalhes de _Estado"
+
+#: ../calendar/gui/dialogs/task-editor.c:114
+msgid "Click to change or view the status details of the task"
+msgstr "Clique para alterar ou visualizar os detalhes de estado da tarefa"
+
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../composer/e-composer-actions.c:528
+msgid "_Send Options"
+msgstr "_Opções de Envio"
+
+#: ../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 "Detalhes 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 "Data de finalização incorrecta"
+msgstr "Data limite é inválida"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Incapaz de abrir as tarefas em '%s'."
@@ -6740,10 +7160,10 @@ msgstr "Fuso-horário:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:8
 msgid "_Due date:"
-msgstr "Data de _finalização:"
+msgstr "_Data limite:"
 
 #. 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"
@@ -6751,142 +7171,126 @@ msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
 #. 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 "Acção desconhecida a ser efectuada"
 
 #. 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 início do compromisso"
 
 #. 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 após o início do compromisso"
 
 #. 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 iniciar o compromisso"
 
 #. 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 o compromisso"
 
 #. 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 após finalizar o compromisso"
 
 #. 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 no final do compromisso"
 
 #. 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 em %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 um tipo despoletado desconhecido"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3327
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Clicar para abrir %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 "Sem título"
 
-#: ../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 "Data de Início:"
 
-#: ../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 "Descrição:"
 
-#: ../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 "Página 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 "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
-msgstr "Data de _Término:"
+msgstr "Data Limite:"
 
 #. 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 "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../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:317
-#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:305
-msgid "Public"
-msgstr "Público"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:326
-#: ../calendar/gui/e-calendar-table.c:306
-msgid "Private"
-msgstr "Privado"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:328
-#: ../calendar/gui/e-calendar-table.c:307
-msgid "Confidential"
-msgstr "Confidencial"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Data de Finalização"
@@ -6896,21 +7300,14 @@ msgstr "Data de Finalização"
 msgid "Start Date"
 msgstr "Data de Início"
 
-#: ../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 "Resumo"
-
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:379
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "Livre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:380
-#: ../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 "Ocupado"
 
@@ -6924,199 +7321,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1023 ../calendar/gui/e-cal-model.c:971
-#: ../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-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 "Sim"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1023 ../calendar/gui/e-cal-model.c:971
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../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 "Não"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:330 ../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:2031
-#: ../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 "Desconhecida"
 
-#: ../calendar/gui/e-cal-model.c:967
+#: ../calendar/gui/e-cal-model.c:968
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../calendar/gui/e-cal-model.c:969
+#: ../calendar/gui/e-cal-model.c:970
 msgid "Assigned"
 msgstr "Atribuída"
 
-#: ../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 "Gravar Como..."
 
-#: ../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:2028
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccionar a pasta onde gravar os anexos especificados..."
 
-#: ../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 "imagem_sem_titulo.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1329
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:923
-#: ../mail/em-folder-view.c:1341 ../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:1336 ../mail/em-popup.c:562 ../mail/em-popup.c:573
 msgid "_Save As..."
 msgstr "Gravar _Como..."
 
-#: ../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 "Definir como _Fundo"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "_Gravar as Seleccionadas"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:791
+#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
 
-#: ../calendar/gui/e-calendar-table.c:349
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* Sem 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 "Início: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "Limite: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:350
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:351
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:352
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:353
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:354
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:355
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:356
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:357
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:358
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:359
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:635
-#: ../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 "A apagar os objectos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:917
-#: ../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 "A actualizar os objectos"
 
-#: ../calendar/gui/e-calendar-table.c:1101
-#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:818
-#: ../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 "Gravar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1324
-#: ../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 "Nova _Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1328 ../calendar/gui/e-memo-table.c:922
+#: ../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:1330
-#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:924
+#: ../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:1334
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:928
+#: ../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:1336
-#: ../calendar/gui/e-calendar-view.c:1666
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:930
+#: ../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 "Co_lar"
 
-#: ../calendar/gui/e-calendar-table.c:1340 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Atribuir a Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1341 ../calendar/gui/e-memo-table.c:934
+#: ../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:1342
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "_Marcar como Terminada"
 
-#: ../calendar/gui/e-calendar-table.c:1343
+#: ../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:1344
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como Incompleta"
 
-#: ../calendar/gui/e-calendar-table.c:1345
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcar as Tarefas Seleccionadas como Incompletas"
 
-#: ../calendar/gui/e-calendar-table.c:1350
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "_Apagar as Tarefas Seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1587
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Clicar para adicionar uma tarefa"
@@ -7139,7 +7562,8 @@ msgid "Due date"
 msgstr "Data limite"
 
 #: ../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 "Prioridade"
 
@@ -7147,112 +7571,93 @@ msgstr "Prioridade"
 msgid "Start date"
 msgstr "Data de início"
 
-#: ../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 "Estado"
-
-#: ../calendar/gui/e-calendar-view.c:1346
+#: ../calendar/gui/e-calendar-view.c:1349
 msgid "Moving items"
 msgstr "A mover itens"
 
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1351
 msgid "Copying items"
 msgstr "A copiar itens"
 
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
-#: ../calendar/gui/e-calendar-view.c:1658
+#: ../calendar/gui/e-calendar-view.c:1661
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Dia Completo"
 
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1662
 msgid "New _Meeting"
 msgstr "Nova _Reunião"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Current View"
 msgstr "Vista A_ctual"
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1675
 msgid "Select T_oday"
 msgstr "Seleccionar H_oje"
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Select Date..."
 msgstr "_Seleccionar a Data..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Pri_nt..."
 msgstr "I_mprimir..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar para o Calendário..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para o Calendário..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Delegate Meeting..."
 msgstr "_Delegar Reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "_Schedule Meeting..."
 msgstr "A_gendar Reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "_Forward as iCalendar..."
 msgstr "_Reenviar como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1335
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1330
+#: ../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:1700
+#: ../calendar/gui/e-calendar-view.c:1703
 msgid "Make this Occurrence _Movable"
 msgstr "Tornar esta Ocorrência _Móvel"
 
-#: ../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 "Apagar esta _Ocorrência"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1705
 msgid "Delete _All Occurrences"
 msgstr "_Apagar Todas as Ocorrências"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2202
-#, 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:2206
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizador: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2475
+#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "Localização: %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 "Hora: %s %s"
@@ -7280,7 +7685,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 divisões de minuto"
@@ -7291,46 +7696,34 @@ msgstr "%02i divisões 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:1354
-#: ../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 "am"
 
 #. 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 "pm"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sim. (Recorrência 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] "Todos os dias"
 msgstr[1] "Todos os %d dias"
 
-#. 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"
@@ -7338,9 +7731,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Todas as semanas"
 msgstr[1] "Todas as %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 "
@@ -7348,51 +7739,35 @@ msgstr[0] "Todas as semanas à "
 msgstr[1] "Todas as %d semanas à "
 
 #. 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 dia 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] "todos os meses"
 msgstr[1] "todos os %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] "Todos os anos"
 msgstr[1] "Todos os %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"
@@ -7400,47 +7775,47 @@ msgstr[0] " um total de %d vez"
 msgstr[1] " um total de %d vezes"
 
 #. 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 ", a terminar em "
 
 #. 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 "Inicia-se"
 
 #. 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 "Termina"
 
-#: ../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 "Limite"
 
-#: ../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 "Informação 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 "Uma pessoa desconhecida"
 
 #. 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."
@@ -7448,294 +7823,294 @@ msgstr ""
 "<br> Reveja a informação seguinte e depois seleccione uma acção do menu "
 "abaixo."
 
-#: ../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:2019
+#: ../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 "Aceite"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2022
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Tentatively Accepted"
 msgstr "Aceite Tentativamente"
 
-#: ../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:2025
+#: ../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 "Recusada"
 
-#: ../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ão foi cancelada, no entanto não foi encontrada nos seus calendários"
 
-#: ../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 foi cancelada, no entanto não foi encontrada nas suas 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 informação de reunião."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Informação de Reunião"
 
-#: ../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> pede a presença de %s na reunião."
 
-#: ../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> pede a sua presença na reunião."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Proposta de Reunião"
 
 #. 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> deseja ser adicionado a uma reunião existente."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Actualização de Reunião"
 
-#: ../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> deseja receber a mais recente informação de reunião."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Pedido de Actualização de Reunião"
 
-#: ../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 um pedido de reunião."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Resposta de Reunião"
 
-#: ../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 uma reunião."
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Cancelamento de Reunião"
 
-#: ../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 uma mensagem imperceptível."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Mensagem de Reunião Inválida"
 
-#: ../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 informação de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Informação de 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> requer que %s execute uma 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> requer que uma tarefa seja executada por si."
 
-#: ../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> deseja ser adicionado a uma tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Actualização 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> deseja receber a mais recente informação de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Pedido de Actualização 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 uma atribuição de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Resposta a 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 uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Cancelamento de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Mensagem de Tarefa Inválida"
 
-#: ../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 informação de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Informação de Livre/Ocupado"
 
-#: ../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> pede a sua informação de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Pedido de Livre/Ocupado"
 
-#: ../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 um pedido de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Resposta de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de Livre/Ocupado Inválida"
 
-#: ../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 mensagem não parece estar correctamente criada"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem apenas contém pedidos não suportados."
 
-#: ../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 não contém uma mensagem de calendário 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 não contém itens de calendário visíveis"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Actualização terminada\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 "Objecto é inválido e não pode ser actualizado\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 ""
 "Esta resposta não é de um participante actual.  Adicionar como participante?"
 
-#: ../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 ""
 "Estado de participante não pode ser actualizado devido a um estado "
 "inválido!\n"
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Estado de participante actualizado\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 ""
 "Estado de participante não pode ser actualizado pois o item já não existe"
 
-#: ../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 "Item enviado!\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 "O item não pode ser enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Seleccione uma acção:"
 
-#: ../calendar/gui/e-itip-control.c:2301
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2355
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../calendar/gui/e-itip-control.c:2330
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Aceitar tentativamente"
 
-#: ../calendar/gui/e-itip-control.c:2331
+#: ../calendar/gui/e-itip-control.c:2357
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Recusar"
 
-#: ../calendar/gui/e-itip-control.c:2360
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Enviar Informação de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:2388
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Actualizar o estado das respostas"
 
-#: ../calendar/gui/e-itip-control.c:2416
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Enviar a Mais Recente Informação"
 
-#: ../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 "Cancelar"
@@ -7764,112 +8139,112 @@ msgstr "A ler o calendário..."
 msgid "Server Message:"
 msgstr "Mensagem do Servidor:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Coordenadores"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Participantes Requeridos"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../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 "Individual"
 
-#: ../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 "Grupo"
 
-#: ../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 "Recurso"
 
-#: ../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 "Sala"
 
-#: ../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 "Coordenador"
 
-#: ../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 "Participante Requerido"
 
-#: ../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 "Participante Opcional"
 
-#: ../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 "Não-Participante"
 
-#: ../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 "Requer Acção"
 
-#: ../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 "Tentativa"
 
-#: ../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:2028
+#: ../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 "Delegada"
 
 #. 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 "Participante                      "
 
 #. 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 "Responder SFF"
 
-#: ../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 "Em Curso"
 
 #. 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"
 
@@ -7877,85 +8252,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 "Fora do Escritório"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "Nenhuma Informação"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "Par_ticipantes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "O_pções"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "Apenas apresentar as h_oras úteis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "Apresentar com _zoom reduzido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "Act_ualizar livre/ocupado"
 
-#: ../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 "_Autoselecção"
 
-#: ../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 "Tod_as as pessoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "Todas as _pessoas e um recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "Pessoas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "Pessoas requeridas e _um recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "Hora de _início:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "_Hora de finalização:"
 
-#: ../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 "Clique aqui para adicionar um participante"
@@ -7980,16 +8351,16 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Membro"
 
-#: ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "_Apagar os Memos Seleccionados"
 
-#: ../calendar/gui/e-memo-table.c:1090 ../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 "Clicar para adicionar um memo"
 
-#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
-#: ../calendar/gui/gnome-cal.c:2867
+#: ../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"
@@ -7998,85 +8369,84 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:839
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "A ler os memos"
 
-#: ../calendar/gui/e-memos.c:920
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "A abrir os memos em %s"
 
-#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1327
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "A apagar os objectos seleccionados..."
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "A ler as tarefas"
 
-#: ../calendar/gui/e-tasks.c:1059
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "A abrir tarefas em %s"
 
-#: ../calendar/gui/e-tasks.c:1304
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "A terminar as tarefas..."
 
-#: ../calendar/gui/e-tasks.c:1354
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "A expurgar"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:130
 msgid "Select Timezone"
 msgstr "Seleccione o Fuso Horário"
 
 #. 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 "A actualizar a consulta"
 
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2501
 msgid "_Custom View"
 msgstr "Vista _Personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2502
 msgid "_Save Custom View"
 msgstr "_Gravar a Vista Personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2507
 msgid "_Define Views..."
 msgstr "_Definir as Vistas..."
 
-#: ../calendar/gui/gnome-cal.c:2691
+#: ../calendar/gui/gnome-cal.c:2688
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "A ler os compromisso em %s"
 
-#: ../calendar/gui/gnome-cal.c:2710
+#: ../calendar/gui/gnome-cal.c:2707
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "A ler as tarefas em %s"
 
-#: ../calendar/gui/gnome-cal.c:2719
+#: ../calendar/gui/gnome-cal.c:2716
 #, c-format
 msgid "Loading memos at %s"
 msgstr "A ler os memos em %s"
 
-#: ../calendar/gui/gnome-cal.c:2826
+#: ../calendar/gui/gnome-cal.c:2823
 #, c-format
 msgid "Opening %s"
 msgstr "A abrir %s"
 
-#: ../calendar/gui/gnome-cal.c:3783
+#: ../calendar/gui/gnome-cal.c:3779
 msgid "Purging"
 msgstr "A expurgar"
 
@@ -8136,136 +8506,128 @@ msgstr "Setembro"
 msgid "_Select Today"
 msgstr "_Seleccionar Hoje"
 
-#: ../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 "Tem de ser definido um organizador."
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "É necessário pelo menos um participante"
 
-#: ../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 "Informação do evento"
 
-#: ../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 "Informação da tarefa"
 
-#: ../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 "Informação do memo"
 
-#: ../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 "Informação de livre/ocupado"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Informação de calendário"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Actualizado"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Contra-proposta"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação de livre/ocupado (%s para %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "Informação de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1008
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Tem de ser um participante do evento."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:465
 msgid "_New Memo List"
 msgstr "_Nova Lista de Memos"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:545
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memo"
 msgstr[1] "%d memos"
 
-#: ../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 seleccionadas"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:594
 msgid "Failed upgrading memos."
 msgstr "Falha ao actualizar os memos."
 
-#: ../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 "Incapaz de abrir a lista de memos '%s' para criar eventos e reuniões"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:967
 msgid "There is no calendar available for creating memos"
 msgstr "Não existe nenhum calendário disponível para criar memos"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1077
 msgid "Memo Source Selector"
 msgstr "Selector de Origem da Memos"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Novo memo"
 
-#: ../calendar/gui/memos-component.c:1260
-msgid "Mem_o"
-msgstr "Mem_o"
-
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Criar um novo memo"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Novo memo partilhado"
 
-#: ../calendar/gui/memos-component.c:1268
-msgid "_Shared memo"
-msgstr "Memo partil_hado"
-
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Criar um novo memo partilhado"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nova lista de memos"
 
-#: ../calendar/gui/memos-component.c:1276
-msgid "Memo li_st"
-msgstr "Li_sta de memos"
-
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Criar uma nova lista de memos"
 
-#: ../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 Memos"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Próximos 7 Dias"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8277,7 +8639,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: ../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"
@@ -8290,26 +8652,27 @@ msgstr ""
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
 #. 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 "Incapaz de migrar as configurações antigas de 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 "Incapaz de migrar o calendário `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Incapaz de migrar as tarefas `%s'"
 
-#: ../calendar/gui/migration.c:1226
-#: ../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 "Notas"
 
@@ -8466,118 +8829,110 @@ msgstr "Sx"
 msgid "Sa"
 msgstr "Sá"
 
-#: ../calendar/gui/print.c:2442
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2466
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2488
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2528
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2545
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2557
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentagem Terminada: %i"
 
-#: ../calendar/gui/print.c:2569
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2582
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: ../calendar/gui/print.c:2593
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "Contactos: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2695
+#: ../calendar/gui/print.c:2762
 msgid "Upcoming Appointments"
 msgstr "Próximos Compromisso"
 
-#: ../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 "Falha 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 "Incapaz de abrir a lista de tarefas '%s' para criar eventos e reuniões"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:955
 msgid "There is no calendar available for creating tasks"
 msgstr "Não existe nenhum calendário disponível para criar tarefas"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1066
 msgid "Task Source Selector"
 msgstr "Selector de Origem da Tarefa"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nova tarefa atribuída"
 
-#: ../calendar/gui/tasks-component.c:1330
-msgid "Assigne_d Task"
-msgstr "Tarefa Atribuí_da"
-
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Criar uma nova tarefa atribuída"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1338
-msgid "Tas_k list"
-msgstr "L_ista de tarefas"
-
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Criar uma nova lista de tarefas"
 
-#: ../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"
@@ -8589,49 +8944,70 @@ msgstr ""
 "\n"
 "Apagar mesmo estas tarefas?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1131
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Não perguntar novamente."
 
-#: ../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 as Tarefas"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% Terminada"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "Em curso"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "é maior do que"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "é menor do que"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Compromissos e Reuniões"
 
-#: ../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 "A abrir o calendário"
 
-#: ../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 Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Lembrete!"
 
-#: ../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 Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Eventos do Calendário"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente de Calendário Evolution"
 
@@ -10165,56 +10541,213 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "Clique aqui para o livro de endereços"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "Incapaz de abrir o ficheiro de gravação automática"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "Destino da afixagem"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Incapaz de recuperar a mensagem do editor"
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "Seleccione as pastas onde anexar a mensagem."
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Inserir Anexo"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "Clique aqui para seleccionar as pastas onde afixar"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "Ane_xar"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "A_ssinatura:"
+#: ../composer/e-composer-actions.c:143
+msgid "Untitled Message"
+msgstr "Mensagem sem Título"
 
-#: ../composer/e-msg-composer-hdrs.c:326
-msgid "Fr_om:"
-msgstr "_De:"
+#: ../composer/e-composer-actions.c:474
+msgid "Attach a file"
+msgstr "Anexar um ficheiro"
 
-#: ../composer/e-msg-composer-hdrs.c:332
-msgid "_Reply-To:"
-msgstr "_Responder-A:"
+#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "_Fechar"
 
-#: ../composer/e-msg-composer-hdrs.c:335
-msgid "_To:"
-msgstr "_Para:"
+#: ../composer/e-composer-actions.c:481
+msgid "Close the current file"
+msgstr "Fechar o ficheiro actual"
+
+#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "Im_primir..."
+
+#: ../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 "Ante_ver a Impressão"
+
+#: ../composer/e-composer-actions.c:502
+msgid "Save the current file"
+msgstr "Gravar o ficheiro actual"
+
+#: ../composer/e-composer-actions.c:507
+msgid "Save _As..."
+msgstr "Gravar _Como..."
+
+#: ../composer/e-composer-actions.c:509
+msgid "Save the current file with a different name"
+msgstr "Gravar o ficheiro actual com outro nome"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save _Draft"
+msgstr "Gravar o _Rascunho"
+
+#: ../composer/e-composer-actions.c:516
+msgid "Save as draft"
+msgstr "Gravar como rascunho"
+
+#: ../composer/e-composer-actions.c:521
+msgid "S_end"
+msgstr "_Enviar"
+
+#: ../composer/e-composer-actions.c:523
+msgid "Send this message"
+msgstr "Enviar esta mensagem"
+
+#: ../composer/e-composer-actions.c:530
+msgid "Insert Send options"
+msgstr "Inserir opções de Envio"
+
+#: ../composer/e-composer-actions.c:535
+msgid "New _Message"
+msgstr "Nova _Mensagem"
+
+#: ../composer/e-composer-actions.c:537
+msgid "Open New Message window"
+msgstr "Abrir a janela de Nova Mensagem"
+
+#: ../composer/e-composer-actions.c:544
+msgid "Character _Encoding"
+msgstr "Codificação de Caract_eres"
+
+#: ../composer/e-composer-actions.c:551
+msgid "_Security"
+msgstr "_Segurança"
+
+#: ../composer/e-composer-actions.c:561
+msgid "PGP _Encrypt"
+msgstr "_Encriptação PGP"
+
+#: ../composer/e-composer-actions.c:563
+msgid "Encrypt this message with PGP"
+msgstr "Encriptar esta mensagem com PGP"
+
+#: ../composer/e-composer-actions.c:569
+msgid "PGP _Sign"
+msgstr "A_ssinatura PGP"
+
+#: ../composer/e-composer-actions.c:571
+msgid "Sign this message with your PGP key"
+msgstr "Assinar esta mensagem com a sua chave PGP"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-composer-actions.c:577
+msgid "_Prioritize Message"
+msgstr "_Prioritizar a Mensagem"
+
+#: ../composer/e-composer-actions.c:579
+msgid "Set the message priority to high"
+msgstr "Definir a prioridade da mensagem como elevada"
+
+#: ../composer/e-composer-actions.c:585
+msgid "Re_quest Read Receipt"
+msgstr "P_edir Recibo de Leitura"
+
+#: ../composer/e-composer-actions.c:587
+msgid "Get delivery notification when your message is read"
+msgstr "Obter notificação de entrega quando a mensagem for lida"
+
+#: ../composer/e-composer-actions.c:593
+msgid "S/MIME En_crypt"
+msgstr "En_cripação S/MIME"
+
+#: ../composer/e-composer-actions.c:595
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Encriptar esta mensagem com o seu Certificado de Encriptação S/MIME"
+
+#: ../composer/e-composer-actions.c:601
+msgid "S/MIME Sig_n"
+msgstr "Assi_natura S/MIME"
+
+#: ../composer/e-composer-actions.c:603
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Assinar esta mensagem com o seu Certificado de Assinatura S/MIME"
+
+#: ../composer/e-composer-actions.c:609
+msgid "_Bcc Field"
+msgstr "Campo _Bcc"
+
+#: ../composer/e-composer-actions.c:611
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Alterna se o campo BCC é ou não apresentado"
+
+#: ../composer/e-composer-actions.c:617
+msgid "_Cc Field"
+msgstr "Campo _Cc"
+
+#: ../composer/e-composer-actions.c:619
+msgid "Toggles whether the CC field is displayed"
+msgstr "Alterna se o campo CC é ou não apresentado"
+
+#: ../composer/e-composer-actions.c:625
+msgid "_From Field"
+msgstr "Campo _De"
+
+#: ../composer/e-composer-actions.c:627
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Alterna se o selector De é ou não apresentado"
+
+#: ../composer/e-composer-actions.c:633
+msgid "_Post-To Field"
+msgstr "Campo _Afixar-Em"
+
+#: ../composer/e-composer-actions.c:635
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Alterna se o campo Afixar-Em é ou não apresentado"
+
+#: ../composer/e-composer-actions.c:641
+msgid "_Reply-To Field"
+msgstr "Campo _Responder-A"
+
+#: ../composer/e-composer-actions.c:643
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Alterna se o campo Responder-A é ou não apresentado"
+
+#: ../composer/e-composer-actions.c:649
+msgid "_Subject Field"
+msgstr "Campo _Assunto"
+
+#: ../composer/e-composer-actions.c:651
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Alterna se o campo de Assunto é ou não apresentado"
+
+#: ../composer/e-composer-actions.c:657
+msgid "_To Field"
+msgstr "Campo _Para"
+
+#: ../composer/e-composer-actions.c:659
+msgid "Toggles whether the To field is displayed"
+msgstr "Alterna se o campo Para é ou não apresentado"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatários da mensagem"
 
-#: ../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 "Introduza os endereços que irão receber uma cópia da mensagem"
 
-#: ../composer/e-msg-composer-hdrs.c:346
-msgid "_Bcc:"
-msgstr "_Bcc:"
-
-#: ../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"
@@ -10222,30 +10755,70 @@ msgstr ""
 "Introduza os endereços que irão receber uma cópia da mensagem sem que sejam "
 "visíveis na lista de destinatários da mensagem"
 
-#: ../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 "_Responder-A:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "_Para:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "_Bcc:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "Afi_xar Em:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "Ass_unto:"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "Ane_xar"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "A_ssinatura:"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "Inserir Anexo"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr "Clique aqui para o livro de endereços"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
+msgstr "Destino da afixagem"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
+msgstr "Seleccione as pastas onde anexar a mensagem."
+
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr "Clique aqui para seleccionar as pastas onde afixar"
+
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr "_Documentos Recentes"
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+msgid "Show _Attachment Bar"
+msgstr "Apresentar a Barra de _Anexos"
+
+#: ../composer/e-msg-composer.c:873
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Incapaz de assinar a mensagem a enviar: Nenhum certificado de assinatura "
 "para esta conta"
 
-#: ../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 +10826,23 @@ msgstr ""
 "Incapaz de encriptar a mensagem a enviar: Nenhum certificado de encriptação "
 "para esta conta"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../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"
+msgstr[0] "Anexo"
+msgstr[1] "Anexos"
+
+#: ../composer/e-msg-composer.c:1557
 msgid "Hide _Attachment Bar"
 msgstr "Esconder a Barra de _Anexos"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3881
-msgid "Show _Attachment Bar"
-msgstr "Apresentar a Barra de _Anexos"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "Razão desconhecida"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "Incapaz de abrir o ficheiro"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "Incapaz de recuperar a mensagem do editor"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "Mensagem sem Título"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "Abrir o Ficheiro"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3761
-#: ../composer/e-msg-composer.c:3764
+#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
 msgid "Compose Message"
 msgstr "Escrever uma Mensagem"
 
-#: ../composer/e-msg-composer.c:5034
+#: ../composer/e-msg-composer.c:4056
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10322,8 +10876,7 @@ msgstr ""
 "Devido a &quot;{0}&quot;, poderá ter de seleccionar diferentes opções de "
 "mensagem."
 
-#: ../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 "Devido a &quot;{1}&quot;."
 
@@ -10439,23 +10992,27 @@ msgstr "Não é possível anexar o ficheiro `{0}' a esta mensagem."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Tem de configurar uma conta antes de poder compor uma mensagem."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Prosseguir a Edição"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Não Recuperar"
 
-#: ../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 "_Recuperar"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Gravar a Mensagem"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Gravar Rascunho"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Email e Calendário Evolution"
 
-#: ../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 "Groupwise Suite"
 
@@ -10471,58 +11028,81 @@ msgstr "cartão de visita"
 msgid "calendar information"
 msgstr "informação de calendário"
 
-#: ../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 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 Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Informação Evolution"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Questão 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 "Erro interno, pedido o erro desconhecido '%s'"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:154
+msgid "Component"
+msgstr "Componente"
+
+#: ../e-util/e-logger.c:155
+msgid "Name of the component being logged"
+msgstr "Nome do componente que irá escrever no registo"
+
+#: ../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 "Activo"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Se o plugin está ou não activo"
+
+#: ../e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "Ocorreu um 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 impressão reportou os seguintes detalhes 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 ""
 "O sistema de impressão não relatou quaisquer detalhes adicionais sobre o "
 "erro."
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "Devido a \"{1}\"."
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "Incapaz de abrir o ficheiro &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
+msgstr "Incapaz de abrir o ficheiro \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "Incapaz de gravar o ficheiro &quot;{0}&quot;."
+msgid "Cannot save file \"{0}\"."
+msgstr "Incapaz de gravar o ficheiro \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "Deseja sobrepo-lo?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "Ficheiro &quot;{0}&quot; existe."
+msgid "File exists \"{0}\"."
+msgstr "Já existe o ficheiro \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10532,49 +11112,61 @@ msgstr "Sobrepor o ficheiro?"
 msgid "_Overwrite"
 msgstr "_Sobrepor"
 
-#: ../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 "_Emprego"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Pessoal"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "A _Fazer"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "Mais _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:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Editar a Etiqueta"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Adicionar Etiqueta"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "O nome da etiqueta não pode ser vazio."
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
-msgstr "Já existe uma etiqueta com o mesmo nome. Renomeie-a."
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr ""
+"Já existe no servidor uma etiqueta com o mesmo nome. Renomeie a etiqueta."
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "Erro GConf: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "Todos os demais erros apresentados apenas numa consola."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10692,65 +11284,65 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Seleccione uma data com a qual comparar"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Seleccione um ficheiro"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Teste"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Nome da re_gra:"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Procurar itens que cumpram os seguintes critérios"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "A_dicionar Critérios ao Filtro"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Se todos os critérios se verificarem"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Se qualquer um dos critérios se verificar"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Procurar itens:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Todas as relacionadas"
 
-#: ../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 "Nenhuma resposta ou pai"
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "I_ncluir árvores"
 
-#: ../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 "Recebidas"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Caixa de Saída"
 
@@ -10774,7 +11366,7 @@ msgstr "Data inexistente."
 msgid "Missing file name."
 msgstr "Nome de ficheiro inexistente."
 
-#: ../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 "Nome inexistente."
 
@@ -10850,7 +11442,7 @@ msgstr "no futuro"
 msgid "months"
 msgstr "meses"
 
-#: ../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 "segundos"
 
@@ -10862,9 +11454,9 @@ msgstr "a data actual"
 msgid "the time you specify"
 msgstr "a data 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"
 
@@ -10880,7 +11472,7 @@ msgstr "Adicionar a Regra"
 msgid "Edit Rule"
 msgstr "Editar a Regra"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Nome da regra"
 
@@ -10906,57 +11498,69 @@ msgid "Configure your email accounts here"
 msgstr "Configure aqui as suas contas de correio"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "Configure aqui as suas definições de ligação de rede"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Email 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 "Controlo de configuração de contas de Email Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Componente de Email Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Compositor de Mensagem 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 "Controlo de configuração de compositor de Mensagem 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 "Controlo de preferências de Email 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:572 ../mail/mail-component.c:573
-#: ../mail/mail-component.c:737
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "Controlo de configuração de Rede Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../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 "Email"
 
-#: ../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 "Contas de Email"
 
-#: ../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 "Preferências do Email"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "Preferências de Rede"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "E_mail"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de Licença de %s"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10969,115 +11573,109 @@ msgstr ""
 "para %s apresentado abaixo\n"
 "e marque a caixa de selecção para a aceitar\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 Pasta"
 
-#: ../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 "Gerada automaticamente"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "Perguntar para cada mensagem"
 
-#: ../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 "Identidade"
 
-#: ../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 "A Receber Mensagens"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "Verificar se existem _novas mensagens a cada"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../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 "A Enviar Mensagens"
 
-#: ../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 "Omissões"
 
 #. 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 "Segurança"
 
 #. 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 "Opções de Recepção"
 
-#: ../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 "A Verificar a Existência de Novas Mensagens"
 
-#: ../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 "Editor de Contas"
 
-#: ../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 "Assistente de Contas Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Por Omissão]"
 
-#: ../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 "Activo"
-
-#: ../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: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 "Sem nome"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Adicionar script de assinatura"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
-#: ../mail/em-composer-utils.c:897 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "------ Mensagem Reencaminhada ------"
 
-#: ../mail/em-composer-utils.c:1702
+#: ../mail/em-composer-utils.c:1960
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. 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:1749
+#: ../mail/em-composer-utils.c:2007
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11085,11 +11683,11 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} às ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escreveu:"
 
-#: ../mail/em-composer-utils.c:1890
+#: ../mail/em-composer-utils.c:2150
 msgid "-----Original Message-----"
 msgstr "----- Mensagem Original-----"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "Regras de _Filtro"
 
@@ -11106,10 +11704,6 @@ msgstr "Atribuir uma Cor"
 msgid "Assign Score"
 msgstr "Atribuir uma Pontuação"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Anexos"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "BCC"
@@ -11126,10 +11720,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Terminada A"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "contém"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar para a Pasta"
@@ -11143,7 +11733,7 @@ msgid "Date sent"
 msgstr "Data de envio"
 
 #: ../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
@@ -11154,10 +11744,6 @@ msgstr "Apagar"
 msgid "Deleted"
 msgstr "Apagada"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "não contém"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "não termina em"
@@ -11178,10 +11764,6 @@ msgstr "não se assemelha a"
 msgid "does not start with"
 msgstr "não começa por"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Não Existe"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Rascunho"
@@ -11190,10 +11772,6 @@ msgstr "Rascunho"
 msgid "ends with"
 msgstr "termina em"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existe"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existe"
@@ -11206,14 +11784,10 @@ msgstr "Expressão"
 msgid "Follow Up"
 msgstr "Seguimento"
 
-#: ../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 "Importante"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "é"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "é posterior a"
@@ -11226,18 +11800,6 @@ msgstr "é anterior a"
 msgid "is Flagged"
 msgstr "está Marcada"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "é maior do que"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "é menor do que"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "não é"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "não está Marcada"
@@ -11250,7 +11812,7 @@ msgstr "não está definida"
 msgid "is set"
 msgstr "está definida"
 
-#: ../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 "Não Solicitado"
@@ -11259,7 +11821,7 @@ msgstr "Não Solicitado"
 msgid "Junk Test"
 msgstr "Teste de Não Solicitado"
 
-#: ../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"
 
@@ -11301,7 +11863,7 @@ msgstr "Reproduzir o Som"
 
 #. 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"
 
@@ -11373,10 +11935,9 @@ msgstr "começa por"
 msgid "Stop Processing"
 msgstr "Parar o Processamento"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1696
-#: ../mail/em-format-quote.c:320 ../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"
@@ -11387,11 +11948,11 @@ msgid "Unset Status"
 msgstr "Retirar o Estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Depois"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Adicio_nar Acção"
 
@@ -11435,16 +11996,16 @@ msgstr "Mensagens Importantes"
 msgid "Messages Not Junk"
 msgstr "Mensagens que não são \"Não Solicitadas\""
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1153
 msgid "Account Search"
 msgstr "Procurar Conta"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1206
 msgid "All Account Search"
 msgstr "Procura em 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:149
+#: ../mail/em-folder-properties.c:173
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensagens por ler:"
@@ -11452,31 +12013,45 @@ msgstr[1] "Mensagens por ler:"
 
 #. 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 de mensagens:"
 msgstr[1] "Total de mensagens:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
+msgid "Quota usage"
+msgstr "Utilização de quota"
+
+#. 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:386
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propriedades da Pasta"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para seleccionar uma pasta>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "C_riar"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
+#. 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 "Pastas de Procura"
 
@@ -11485,126 +12060,90 @@ msgstr "Pastas de Procura"
 msgid "UNMATCHED"
 msgstr "SEMEQUIVALÊNCIA"
 
-#: ../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 "Rascunhos"
 
-#. 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:83
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Caixa de Entrada"
-
-#: ../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 "Caixa de Saída"
 
-#: ../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 "Enviadas"
 
-#: ../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 "A Ler..."
 
-#. 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:372
-#, 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 "Árvore de Pastas de Mensagens"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "A mover a pasta %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "A copiar a pasta %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1971
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "A mover as mensagens para a pasta %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1973
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "A copiar as mensagens para a pasta %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Incapaz de largar a(s) mensagem(ns) para o nível de topo do armazenamento"
 
-#: ../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:104
 msgid "_Copy to Folder"
 msgstr "_Copiar para a Pasta"
 
-#: ../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:117
 msgid "_Move to Folder"
 msgstr "_Mover para a Pasta"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1055
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "A analisar as pastas em \"%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 "_Ver"
-
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Abrir numa _Nova Janela"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Nova Pasta..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ../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 "_Renomear..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "Act_ualizar"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Esva_ziar a Caixa de Saída"
 
-#: ../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 "_Esvaziar o Lixo"
 
@@ -11613,13 +12152,13 @@ msgstr "_Esvaziar o Lixo"
 msgid "Copying `%s' to `%s'"
 msgstr "A copiar `%s' para `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1191
-#: ../mail/em-folder-view.c:1206
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "Seleccionar a pasta"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1206
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "C_opiar"
 
@@ -11630,218 +12169,215 @@ msgid "Creating folder `%s'"
 msgstr "A criar a pasta `%s'"
 
 #: ../mail/em-folder-utils.c:745
-#: ../plugins/groupwise-features/install-shared.c:164
+#: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Criar uma pasta"
 
 #: ../mail/em-folder-utils.c:745
-#: ../plugins/groupwise-features/install-shared.c:164
+#: ../plugins/groupwise-features/install-shared.c:168
 #: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
-#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Falha ao Apagar Correio"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Não possui permissões suficientes para apagar este correio."
 
-#: ../mail/em-folder-view.c:1334 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Responder ao Remetente"
 
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:578 ../mail/em-popup.c:589
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "R_eencaminhar"
 
 #. 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:1335 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Editar como uma Nova Mensagem..."
 
-#: ../mail/em-folder-view.c:1342
-#: ../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 "Im_primir..."
-
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "R_ecuperar"
 
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Mover para a Pasta..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Copiar para a Pasta..."
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "_Marcar como Lida"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Marcar _Por Ler"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Remover Marcação de _Importante"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Marcar como _Não Solicitada"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _Solicitada"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para Dar Se_guimento..."
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1354
 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:1360 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Nenhuma"
 
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Nova Etiqueta"
 
-#: ../mail/em-folder-view.c:1367
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Marcar como _Terminada"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "L_impar a Marca"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Criar Regra a Par_tir da Mensagem"
 
 #. 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:1368
 msgid "Search Folder based on _Subject"
 msgstr "Pasta de Procura baseada no A_ssunto"
 
-#: ../mail/em-folder-view.c:1374
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Pasta de Procura baseada no Remete_nte"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Pasta de Procura baseada nos Destinatá_rios"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Pasta de Procura baseada numa _Lista de Distribuição"
 
 #. 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:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filtrar pelo Ass_unto"
 
-#: ../mail/em-folder-view.c:1382
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filtrar pelo _Remetente"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filtrar pelo _Destinatário"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filtrar pela _Lista de Distribuição"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2266 ../mail/em-folder-view.c:2310
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../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 "Por Omissão"
 
-#: ../mail/em-folder-view.c:2528
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Incapaz de obter a mensagem"
 
-#: ../mail/em-folder-view.c:2547
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "A Obter a Mensagem..."
 
-#: ../mail/em-folder-view.c:2806
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "Ch_amada Para..."
 
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Criar uma Pasta de _Procura"
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Deste Endereço"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_Para este Endereço"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clicar para enviar mensagem a %s"
 
-#: ../mail/em-folder-view.c:3320
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Clicar para realizar uma chamada para %s"
 
-#: ../mail/em-folder-view.c:3325
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Clicar para esconder/apresentar os endereços"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:470
 #, c-format
 msgid "Matches: %d"
 msgstr "Equivalências: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:614
 msgid "Fin_d:"
 msgstr "Proc_urar:"
 
 #. 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:638
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:643
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:648
 msgid "M_atch case"
 msgstr "Coincidir a Capitali_zação"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:635
+#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:649
 msgid "Unsigned"
 msgstr "Não assinada"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:947
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11849,11 +12385,11 @@ msgstr ""
 "Esta mensagem não está assinada. Não existe nenhuma garantia de que seja "
 "autêntica."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:636
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Valid signature"
 msgstr "Assinatura válida"
 
-#: ../mail/em-format-html-display.c:993
+#: ../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."
@@ -11861,11 +12397,11 @@ msgstr ""
 "Esta mensagem está assinada e é válida o que significa que muito "
 "provavelmente é autêntica."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:637
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Invalid signature"
 msgstr "Assinatura inválida"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11873,11 +12409,11 @@ msgstr ""
 "A assinatura nesta mensagem não pode ser verificada, o que significa que "
 "pode ter sido alterada durante o percurso."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:638
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Valid signature, but cannot verify sender"
 msgstr "Assinatura válida, mas incapaz de verificar o remetente"
 
-#: ../mail/em-format-html-display.c:995
+#: ../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."
@@ -11885,11 +12421,11 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura válida mas não é possível "
 "verificar o remetente da mesma."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:639
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Signature exists, but need public key"
 msgstr "Assinatura existe, mas é necessária a chave pública"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11897,11 +12433,11 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura, mas não existe uma chave "
 "pública correspondente."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:659
 msgid "Unencrypted"
 msgstr "Sem encriptação"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:958
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11909,11 +12445,11 @@ msgstr ""
 "Esta mensagem não está encriptada. O seu conteúdo pode ser visualizado "
 "durante o seu percurso pela Internet."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:646
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Encrypted, weak"
 msgstr "Encriptada com cifra fraca"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../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 "
@@ -11923,11 +12459,11 @@ msgstr ""
 "Seria difícil, mas não impossível, que um terceiro conseguisse visualizar o "
 "conteúdo da mensagem dentro de um período de tempo útil."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted"
 msgstr "Encriptada"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../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."
@@ -11935,11 +12471,11 @@ msgstr ""
 "Esta mensagem está encriptada.  Seria difícil que um terceiro conseguisse "
 "visualizar o seu conteúdo."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted, strong"
 msgstr "Encriptada com cifra forte"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../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 "
@@ -11949,98 +12485,93 @@ msgstr ""
 "muito difícil que um terceiro conseguisse visualizar o seu conteúdo dentro "
 "de um período de tempo útil."
 
-#: ../mail/em-format-html-display.c:1107 ../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 "_Visualizar o Certificado"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1077
 msgid "This certificate is not viewable"
 msgstr "Este certificado não é visualizável"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1370
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminada a %B %d, %Y, %l:%M %P"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1378
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1381
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "por %B %d, %Y, %l:%M %P"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1459
 msgid "_View Inline"
 msgstr "_Ver Embutido"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1460
 msgid "_Hide"
 msgstr "_Esconder"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1461
 msgid "_Fit to Width"
 msgstr "_Caber à Largura"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1462
 msgid "Show _Original Size"
 msgstr "Apresentar no Tamanho _Original"
 
-#: ../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 "Anexo"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1982
 msgid "Save attachment as"
 msgstr "Gravar o anexo como"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1986
 msgid "Select folder to save all attachments"
 msgstr "Seleccionar a pasta onde gravar todos os anexos"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2037
 msgid "_Save Selected..."
 msgstr "_Gravar Seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2104
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d a_nexo"
 msgstr[1] "%d a_nexos"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2111 ../mail/em-format-html-display.c:2200
 msgid "S_ave"
 msgstr "Gr_avar"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2122
 msgid "S_ave All"
 msgstr "Gr_avar Todos"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2196
 msgid "No Attachment"
 msgstr "Nenhum Anexo"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2337 ../mail/em-format-html-display.c:2375
 msgid "View _Unformatted"
 msgstr "Ver Sem _Formatação"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2339
 msgid "Hide _Unformatted"
 msgstr "Esconder Sem _Formatação"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2394
 msgid "O_pen With"
 msgstr "A_brir Com"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../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 ""
 "Evolution é incapaz de apresentar este email pois é demasiado grande para "
-"ser manipulado. Poderá vê-lo sem formatação ou através de um editor de texto "
+"ser processado. Poderá vê-lo sem formatação ou através de um editor de texto "
 "externo."
 
 #: ../mail/em-format-html-print.c:156
@@ -12048,278 +12579,293 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: ../mail/em-format-html.c:489 ../mail/em-format-html.c:498
+#: ../mail/em-format-html.c:503 ../mail/em-format-html.c:512
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "A obter `%s'"
 
-#: ../mail/em-format-html.c:910
+#: ../mail/em-format-html.c:924
 msgid "Unknown external-body part."
 msgstr "Parte do corpo-externo desconhecida."
 
-#: ../mail/em-format-html.c:918
+#: ../mail/em-format-html.c:932
 msgid "Malformed external-body part."
 msgstr "Parte do corpo-externo mal formada."
 
-#: ../mail/em-format-html.c:948
+#: ../mail/em-format-html.c:962
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ponteiro para o servidor FTP (%s)"
 
-#: ../mail/em-format-html.c:959
+#: ../mail/em-format-html.c:973
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Ponteiro para o ficheiro local (%s) válido no servidor \"%s\""
 
-#: ../mail/em-format-html.c:961
+#: ../mail/em-format-html.c:975
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ponteiro para o ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:982
+#: ../mail/em-format-html.c:996
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ponteiro para dados remotos (%s)"
 
-#: ../mail/em-format-html.c:993
+#: ../mail/em-format-html.c:1007
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
 
-#: ../mail/em-format-html.c:1221
+#: ../mail/em-format-html.c:1235
 msgid "Formatting message"
 msgstr "A formatar a mensagem"
 
-#: ../mail/em-format-html.c:1388
+#: ../mail/em-format-html.c:1409
 msgid "Formatting Message..."
 msgstr "A Formatar a Mensagem..."
 
-#: ../mail/em-format-html.c:1540 ../mail/em-format-html.c:1604
-#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:889 ../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:1541 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1629 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:890 ../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 "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1700 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1743 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "Aplicação de Email"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1727
+#: ../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:1732
+#: ../mail/em-format-html.c:1775
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:336
-#: ../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 "Data"
-
-#: ../mail/em-format-html.c:1767 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "Grupo de notícias"
-
 #. 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:1860
+#: ../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 mensagem foi enviada por <b>%s</b> em nome de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:207 ../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:207 ../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 "Responder-A"
 
+#: ../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:82
+msgid "Newsgroups"
+msgstr "Grupo de notícias"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Incapaz de parsear a mensagem S/MIME: Erro desconhecido"
+msgstr "Incapaz de processar a mensagem S/MIME: Erro desconhecido"
 
-#: ../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 "Incapaz de parsear a mensagem MIME. A apresentar como código."
+msgstr "Incapaz de processar a mensagem MIME. A apresentar como código."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de encriptação não suportada para multipartes/encriptada"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
-msgstr "Incapaz de parsear a mensagem PGP/MIME"
+msgstr "Incapaz de processar a mensagem PGP/MIME"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Incapaz de parsear a mensagem PGP/MIME: Erro desconhecido"
+msgstr "Incapaz de processar a mensagem PGP/MIME: Erro desconhecido"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "Formato de assinatura não suportado"
 
-#: ../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 "Erro ao verificar a assinatura"
 
-#: ../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 "Erro desconhecido ao verificar a assinatura"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
-msgstr "Incapaz de parsear a mensagem PGP."
+msgstr "Incapaz de processar a mensagem PGP."
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
-msgstr "Incapaz de parsear a mensagem PGP: Erro desconhecido"
+msgstr "Incapaz de processar a mensagem PGP: Erro desconhecido"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "Sempre"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "Uma vez por dia"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "Uma vez por semana"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "Uma vez por mês"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "Adicionar Cabeçalho Personalizado de Não Solicitado"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "Nome do Cabeçalho:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "Valor do Cabeçalho Contém:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "Contém o Valor"
 
-#: ../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: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 "O plugin %s encontra-se disponível e o binário está instalado."
 
 #. 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 ""
 "O plugin %s não se encontra disponível. Verifique se o pacote está instalado."
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "Nenhum plugin de Não Solicitado disponível."
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "A Fazer"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Mais Tarde"
 
-#: ../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 ""
-"A localização e hierarquia das pastas de email Evolution foram alteradas "
-"desde o Evolution 1.x.\n"
-"\n"
-"Aguarde enquanto o Evolution migra as suas pastas..."
+#: ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "A migrar '%s':"
 
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Incapaz de criar a nova pasta `%s': %s"
 
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Incapaz de copiar a pasta `%s' para `%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 "Incapaz de analisar caixas de correio existentes em `%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 ""
+"A localização e hierarquia das pastas de email Evolution foram alteradas "
+"desde o Evolution 1.x.\n"
+"\n"
+"Aguarde enquanto o Evolution migra as suas pastas..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Incapaz de abir dados antigos POP manter-no-servidor `%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 ""
 "Incapaz de criar o directório de dados POP3 manter-no-servidor `%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 "Incapaz de copiar os dados POP3 manter-no-servidor `%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 "Falha ao criar o armazenamento local de mensagens `%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 ""
+"O formato do resumo das pastas de correio do Evolution foi movido para "
+"sqlite a partir do Evolution 2.24.\n"
+"\n"
+"Aguarde enquanto o Evolution migra as suas pastas..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Incapaz de criar as pastas locais de mensagens em `%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."
@@ -12327,62 +12873,65 @@ msgstr ""
 "Incapaz de ler as definições da instalação anterior do Evolution, `evolution/"
 "config.xmldb' não existe ou está corrompido."
 
-#: ../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 "_Responder ao remetente"
 
-#: ../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 "Responder para a _Lista"
 
-#: ../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 "_Adicionar ao Livro de Endereços"
 
-#: ../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 "Este armazenamento não suporta subscrições ou estas não estão activas."
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Pasta"
 
 #. 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 "Seleccione um servidor."
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "Não seleccionou nenhum servidor"
 
-#: ../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 "_Não apresentar esta mensagem novamente."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Filtros de Mensagens"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "mensagem"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Gravar a Mensagem..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Adicionar o endereço"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
@@ -12396,56 +12945,68 @@ msgid "Search Folder source"
 msgstr "Origem das Pastas de Procura"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Altura da janela \"Enviar e Receber Mensagens\""
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "Estado de maximização da janela \"Enviar e Receber Mensagens\""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Largura da janela \"Enviar e Receber Mensagens\""
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr "Permite ao evolution apresentar parte de tamanho limitado do texto"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Pedir sempre um recibo de leitura"
 
-#: ../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 ""
 "Quantidade de tempo, em segundos, que o erro deverá ser visível na barra de "
 "estados."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
-msgstr "Reconhecimento automatico de risonhos"
+msgstr "Reconhecimento automático de risonhos"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
-msgstr "Reconhecimento automatico de links"
+msgstr "Reconhecimento automático de links"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Verificar se mensagens recebidas são não solicitadas"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Cor de realce de citação"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Cor de realce de citação."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Altura por omissão da Janela de Composição"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Largura por omissão da Janela de Composição"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Directório de onde o compositor deverá ler/anexar"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Comprimir a apresentação dos endereços em Para/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."
@@ -12453,64 +13014,94 @@ msgstr ""
 "Comprimir a apresentação dos endereços em Para/Cc/Bcc até ao número "
 "especificado em 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 ""
+"Controla quão frequentemente as alterações locais são sincronizadas com o "
+"servidor de correio. O intervalo tem de ser pelo menos de 30 segundos."
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+"Cabeçalhos personalizados a utilizar ao verificar por correio não solicitado."
+
+#: ../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 ""
+"Cabeçalhos personalizados a utilizar ao verificar por correio não "
+"solicitado. Os elementos da lista são expressões no formato "
+"\"nomedecabeçalho=valor\"."
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres por omissão com que compor as mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres por omissão com que compor as mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres por omissão em que apresentar as mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres por omissão em que apresentar as mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Estilo de reencaminhamento por omissão"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Altura por omissão da Janela de Composição."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Altura por omissão da janela de mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Altura por omissão do diálogo de subscrição."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Estilo por omissão de resposta"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Valor por omissão para o estado de expansão de árvores"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Largura por omissão da Janela de Composição."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Largura por omissão da janela de mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Largura por omissão do diálogo de subscrição."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr ""
+"Determina se procurar ou não apenas no livro de endereços local por "
+"endereços, ao filtrar por correio não solicitado"
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr ""
 "Determina se procurar ou não no livro de endereços o email do remetente"
 
-#: ../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 "
@@ -12523,13 +13114,13 @@ msgstr ""
 "marcados livros de endereços remotos (como ldap) para completar "
 "automaticamente."
 
-#: ../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 ""
 "Determina se utilizar ou não cabeçalhos personalizados para procurar por "
 "correio não solicitado"
 
-#: ../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 "
@@ -12540,7 +13131,7 @@ msgstr ""
 "mencionados, irá melhorar a velocidade de verificação por correio não "
 "solicitado."
 
-#: ../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."
@@ -12548,59 +13139,64 @@ msgstr ""
 "Determina se utilizar ou não as mesmas fontes para ambas as linhas \"De\" e "
 "\"Assunto\" na coluna \"Mensagens\" na vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directório de onde ler/anexar ficheiros no compositor."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Directório onde gravar ficheiros componentes do email."
 
-#: ../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 ""
+"Desactivar ou activar a eliptização dos nomes das pastas na árvore de pastas"
+
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Desenhar indicador de mensagens ortograficamente incorrectas enquanto "
 "escreve."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Esvaziar as pastas de Não Solicitado ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Esvaziar as pastas de Lixo ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Esvaziar todas as pasta de Não Solicitado ao sair do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Esvaziar todas as pasta de Lixo ao sair do Evolution."
 
-#: ../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 ""
 "Activar o modo de cursor para que visualize um cursor ao ler as mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Activar ou desactivar a barra de espaços mágica"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr ""
 "Activar ou desactivar a funcionalidade de procura à medida que se escreve"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Activar as pastas de procura"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Activar as pastas de procura ao iniciar."
 
-#: ../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 "
@@ -12612,7 +13208,7 @@ msgstr ""
 "poderá facilmente encontrar uma pasta nessa barra lateral bastando para tal "
 "escrever o nome da pasta e a selecção saltará imediatamente para a mesma."
 
-#: ../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."
@@ -12620,28 +13216,28 @@ msgstr ""
 "Activar esta opção para utilizar a barra de Espaços para rolar na antevisão "
 "de mensagem, lista de mensagens e pastas."
 
-#: ../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 ""
 "Activar para apresentar uma parte com tamanho limitado do texto da mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo de cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Altura do painel de lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Altura do painel de lista de mensagens."
 
-#: ../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 "Esconde a antevisão por-pasta e remove a selecção"
 
-#: ../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."
@@ -12649,7 +13245,7 @@ msgstr ""
 "Se um utilizador tentar abrir 10 ou mais mensagens de uma vez, perguntar se "
 "ele o deseja mesmo fazer."
 
-#: ../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."
@@ -12657,7 +13253,7 @@ msgstr ""
 "Se o painel de \"Antevisão\" estiver activo, apresentá-lo ao lado em vez de "
 "verticalmente."
 
-#: ../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 "
@@ -12668,11 +13264,41 @@ msgstr ""
 "visualizador de componente-bonobo na base de dados de tipos mime do GNOME "
 "pode ser utilizado para apresentar o conteúdo."
 
-#: ../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 ""
+"A altura inicial da janela de \"Enviar e Receber Mensagens\". O valor é "
+"actualizado quando o utilizador redimensiona verticalmente a janela."
+
+#: ../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 ""
+"O estado inicial de maximização da janela \"Enviar e Receber Mensagens\". O "
+"valor é actualizado quando o utilizador maximiza ou restaura a janela. Note, "
+"este valor específico não é utilizado pelo Evolution uma vez que a janela "
+"\"Enviar e Receber Mensagens\" não pode ser maximizada. Esta chave existe "
+"apenas como um detalhe de implementação."
+
+#: ../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 ""
+"A largura inicial da janela de \"Enviar e Receber Mensagens\". O valor é "
+"actualizado quando o utilizador redimensiona horizontalmente a janela."
+
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Activa/desactiva a questão ao marcar multiplas mensagens."
 
-#: ../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."
@@ -12680,7 +13306,7 @@ msgstr ""
 "Desactiva/activa a funcionalidade onde perguntas consecutivas inquirem se é "
 "necessária a sincronização para desligado antes de desligar."
 
-#: ../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 "
@@ -12690,31 +13316,31 @@ msgstr ""
 "de procura as apaga permanentemente, não as remove apenas dos resultados da "
 "procura."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "A última vez em que foi esvaziada a pasta de correio Não Solicitado"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "A última vez em que foi esvaziado o lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Nível a partir do qual a mensagem deverá ser registada."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Lista de Etiquetas e as suas cores associadas"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Lista de licenças aceites"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../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."
@@ -12723,11 +13349,17 @@ msgstr ""
 "contém expressões que denominam subdirectórios relativos a /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 "Lista de cabeçalhos personalizados e se estes estão activos."
 
-#: ../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 ""
+"Lista de códigos de dicionários de idiomas utilizados para a verificação "
+"ortográfica."
+
+#: ../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."
@@ -12736,132 +13368,132 @@ msgstr ""
 "lista contém expressões do tipo nome:cor em que cor utiliza a codificação "
 "hexadecimal 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 ""
 "Lista de tipos mime para os quais procurar visualizadores de componente "
 "bonobo"
 
-#: ../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 "Lista de nomes de protocolos cuja licença foi aceite."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Ler imagens de mensagens HTML através de http"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../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 ""
-"Ler imagens de mensagens HTML através de http(s). Valores possíveis são: 0 - "
-"Nunca ler imagens da net. 1 - Ler as imagens de mensagens enviadas por "
-"contactos. 2 - Ler sempre as imagens da net."
+"Ler imagens de mensagens HTML através de http(s). Valores possíveis são: \"0"
+"\" - Nunca ler imagens da net. \"1\" - Ler as imagens de mensagens enviadas "
+"por contactos. \"2\" - Ler sempre as imagens da net."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Registar as acções do filtro"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Registar as acções do filtro no ficheiro de registo especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de registo onde registar as acções do filtro"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de registo onde registar as acções do filtro."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como Lida após um período de tempo especifico"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como Lida após um período de tempo especifico."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar as citações na \"Antevisão\" de mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar as citações na \"Antevisão\" de mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Altura por omissão da Janela de Mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Largura por omissão da Janela de Mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de apresentação de mensagem (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Número mínimo de dias antes de esvaziar o Não Solicitado ao sair"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Número mínimo de dias antes de esvaziar o lixo ao sair"
 
-#: ../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 "Tempo mínimo entre esvaziar o Não Solicitado ao sair, em dias."
 
-#: ../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 "Tempo mínimo entre esvaziar o lixo ao sair, em dias."
 
-#: ../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 "Número de endereços a apresentar em Para/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Questionar quando o assunto for vazio"
 
-#: ../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 "Questionar o utilizador quando este tentar expurgar uma pasta."
 
-#: ../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 ""
 "Questionar o utilizador quando este tentar enviar uma mensagem sem Assunto."
 
-#: ../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 ""
 "Perguntar ao utilizador se deseja entrar imediatamente em modo desligado"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Avisar ao apagar mensagens na pasta de procura"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Questionar quando o utilizador expurgar"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Questionar quando o utilizador apenas preencher o Bcc"
 
-#: ../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 ""
 "Questionar quando o utilizador tentar abrir 10 ou mais mensagens de uma vez"
 
-#: ../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."
@@ -12869,146 +13501,145 @@ msgstr ""
 "Questionar o utilizador quando este tentar enviar mensagens em HTML para "
 "destinatários que poderão não desejar receber mensagens em 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 ""
 "Questionar o utilizador quando este tentar enviar uma mensagem sem indicar "
 "destinatários em Para ou Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Questionar o utilizador quando este tentar enviar HTML indesejado"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Questionar ao marcar múltiplas mensagens"
 
-#: ../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 "Reconhecer risonhos no texto e substituí-los por imagens."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Reconhecer links no texto e substituí-los."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Executar teste de não solicitado sobre as mensagens recebidas."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Gravar o directório"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Procurar a foto do remetente no livro de endereços local"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Por omissão, enviar as mensagens em HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Por omissão, enviar as mensagens em 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 "Coluna de email do remetente na lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Intervalo de sincronização com o servidor"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Apresentar as Animações"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Apresentar as imagens animadas como animações."
 
-#: ../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 "Apresentar as mensagens apagadas (riscadas) na lista de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Apresentar as mensagens apagadas na lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Apresentar a foto do remetente"
 
-#: ../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 ""
-"Apresentar o email do remetente numa coluna separada na lista de "
-"mensagens."
+"Apresentar o email do remetente numa coluna separada na lista de mensagens."
 
-#: ../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 "Apresentar a foto do remetente no painel de leitura da mensagem."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "Especifica o cabeçalho onde verificar se é correio não solicitado."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"Especifica o cabeçalho onde verificar se é correio não solicitado. O formato "
-"é nomecabeçalho=valor no gconf."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Verificação ortográfica instantânea"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "Cor da verificação ortográfica"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "Idiomas da verificação ortográfica"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Altura por omissão do diálogo de subscrição"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Largura por omissão do diálogo de subscrição"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Fonte de consola"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Limite da parte de texto da mensagem"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "O plugin por omissão para a ligação ao Não Solicitado"
 
-#: ../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 ""
 "A última vez em que o Não Solicitado foi esvaziado, em dias desde a epoch."
 
-#: ../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 "A última vez em que o lixo foi esvaziado, em dias desde a epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "A fonte de largura fixa para apresentação de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "A fonte de largura variável para apresentação de mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../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 ""
-"Esta opção pode ter três valores distintos. 0 para erros. 1 para avisos. 2 "
-"para mensagens de depuração."
+"Esta opção pode ter três valores distintos. \"0\" para erros. \"1\" para "
+"avisos. \"2\" para mensagens de depuração."
 
-#: ../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."
@@ -13016,7 +13647,7 @@ msgstr ""
 "Decide o tamanho máximo da parte de texto que poder ser formatada no "
 "evolution. Por omissão são 4MB / 4096 KB e é especificado em termos de 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 "
@@ -13026,15 +13657,15 @@ msgstr ""
 "vários plugins. Se o plugin listado por omissão estiver desactivado, não irá "
 "recorrer aos outros plugins disponíveis."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../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 é lida apenas uma vez e reposta a \"false\" após ser lida. Remove "
 "a selecção do email da lista e remove a antevisão dessa pasta."
 
-#: ../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;"
@@ -13046,11 +13677,22 @@ msgstr ""
 "estrutura XML é &lt;header enabled&gt; - definir \"enabled\" para que os "
 "cabeçalhos sejam apresentados na vista de mensagem."
 
-#: ../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 ""
+"Esta opção é relacionada com a chave lookup_addressbook e é utilizada para "
+"determinar se a procura de endereços para excluir mensagens enviadas por "
+"contactos conhecidos da filtragem por correio não solicitado deverá ou não "
+"ser feita apenas no livro de endereços local."
+
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opção tornaria mais rápida a obtenção de correio."
 
-#: ../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."
@@ -13058,7 +13700,7 @@ msgstr ""
 "Esta opção define o número de endereços a apresentar na vista de lista de "
 "mensagens por omissão, para lá do qual é apresentado '...'."
 
-#: ../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."
@@ -13067,7 +13709,7 @@ msgstr ""
 "expandido ou recolhido. O Evolution necessita de ser reiniciado após "
 "alteração."
 
-#: ../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 "
@@ -13077,112 +13719,124 @@ msgstr ""
 "última mensagem em cada árvore, em vez de por data da mensagem. O Evolution "
 "necessita de ser reiniciado após alteração."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Apresentar a lista de mensagens em árvore."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Apresentar a lista de mensagens em árvore"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Apresentar a lista de mensagens em árvore por Assunto"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Tempo de espera para marcar a mensagem como lida"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Tempo de espera para marcar a mensagem como lida."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "Expressão UID da conta por omissão."
 
-#: ../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 ""
+"Cor para sublinhar palavras incorrectas ao utilizar verificação ortográfica "
+"automática."
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "Utilizar o daemon e cliente do SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Utilizar o daemon e cliente do SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Utilizar fontes personalizadas"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Utilizar fontes personalizadas para apresentar as mensagens."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr ""
 "Utilizar apenas os testes locais de detecção de mensagens não solicitadas."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 "Utilizar apenas os testes locais de detecção de mensagens não solicitadas "
 "(sem DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Utilizar lado-a-lado ou disposição alargada"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Fonte de largura variável"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "Item de menu Ver/Bcc está marcado"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "Item de menu Ver/Bcc está marcado."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "Item de menu Ver/Cc está marcado"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "Item de menu Ver/Cc está marcado."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "Item de menu Ver/De está marcado"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "Item de menu Ver/De está marcado."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "Item de menu Ver/AfixarEm está marcado"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "Item de menu Ver/AfixarEm está marcado."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "Item de menu Ver/ResponderA está marcado"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "Item de menu Ver/ResponderA está marcado."
 
-#: ../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 ""
 "Se é ou não adicionado por omissão a cada mensagem um pedido de recibo de "
 "leitura."
 
-#: ../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 ""
+"Se desactivar ou não a funcionalidade de eliptizar os nomes das pastas na "
+"árvore de pastas."
+
+#: ../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."
@@ -13190,43 +13844,43 @@ msgstr ""
 "Se recorrer ou não a árvores por assunto quando as mensagens não contêm "
 "cabeçalhos Em-Resposta-A ou Referências."
 
-#: ../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 "Se ordenar ou não as árvores com base na última mensagem nessa árvore"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Largura do painel de lista de mensagens"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Largura do painel de lista de mensagens."
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "A Importar os dados do Elm"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Importador de Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Importar correio do Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "Pasta de destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "Seleccionar a pasta para onde importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de Correio Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Pastas do importador do formato Caixa de Correio Berkeley"
 
@@ -13234,7 +13888,7 @@ msgstr "Pastas do importador do formato Caixa de Correio Berkeley"
 msgid "Importing mailbox"
 msgstr "A Importar caixa de correio"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
 #, c-format
 msgid "Importing `%s'"
 msgstr "A Importar `%s'"
@@ -13244,15 +13898,15 @@ msgstr "A Importar `%s'"
 msgid "Scanning %s"
 msgstr "A analizar %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "A Importar os dados do Pine"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Importador de Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Importar correio do Pine."
 
@@ -13280,139 +13934,144 @@ msgstr "lista de distribuição %s"
 msgid "Add Filter Rule"
 msgstr "Adicionar Regra de Filtro"
 
-#: ../mail/mail-component.c:533
+#: ../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 seleccionada, "
 msgstr[1] "%d seleccionadas, "
 
-#: ../mail/mail-component.c:537
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d apagada"
 msgstr[1] "%d apagadas"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d não solicitado"
 msgstr[1] "%d não solicitados"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d rascunho"
 msgstr[1] "%d rascunhos"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviada"
 msgstr[1] "%d enviadas"
 
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:566
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d por enviar"
 msgstr[1] "%d por enviar"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:572
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d por ler, "
 msgstr[1] "%d por ler, "
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d no total"
 msgstr[1] "%d no total"
 
-#: ../mail/mail-component.c:890
+#: ../mail/mail-component.c:916
 msgid "New Mail Message"
 msgstr "Nova Mensagem de Email"
 
-#: ../mail/mail-component.c:891
-msgid "_Mail Message"
-msgstr "_Mensagem de Email"
-
-#: ../mail/mail-component.c:892
+#: ../mail/mail-component.c:918
 msgid "Compose a new mail message"
 msgstr "Compor uma nova mensagem de email"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:924
 msgid "New Mail Folder"
 msgstr "Nova Pasta de Mensagens"
 
-#: ../mail/mail-component.c:899
-msgid "Mail _Folder"
-msgstr "_Pasta de Mensagens"
-
-#: ../mail/mail-component.c:900
+#: ../mail/mail-component.c:926
 msgid "Create a new mail folder"
 msgstr "Criar uma nova pasta de mensagens"
 
-#: ../mail/mail-component.c:1047
+#: ../mail/mail-component.c:1073
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falha ao actualizar as definições ou pastas de Mensagens."
 
-#: ../mail/mail-component.c:1516
+#: ../mail/mail-component.c:1586
 msgid "Error"
 msgstr "Erro"
 
-#: ../mail/mail-component.c:1516
+#: ../mail/mail-component.c:1586
 msgid "Errors"
 msgstr "Erros"
 
-#: ../mail/mail-component.c:1517
+#: ../mail/mail-component.c:1587
 msgid "Warnings and Errors"
 msgstr "Avisos e Erros"
 
-#: ../mail/mail-component.c:1518
+#: ../mail/mail-component.c:1588
 msgid "Debug"
 msgstr "Depuração"
 
-#: ../mail/mail-component.c:1518
+#: ../mail/mail-component.c:1588
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensagens de Erro, Avisos e Depuração"
 
-#: ../mail/mail-component.c:1628
+#: ../mail/mail-component.c:1715
 msgid "Debug Logs"
 msgstr "Registos de Depuração"
 
-#: ../mail/mail-component.c:1632
+#: ../mail/mail-component.c:1729
 msgid "Show _errors in the status bar for"
 msgstr "Apresentar _erros na barra de estados durante"
 
-#: ../mail/mail-component.c:1639
-msgid "seconds."
-msgstr "segundos."
+#. 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 "segundo(s)."
 
-#: ../mail/mail-component.c:1649
+#: ../mail/mail-component.c:1751
 msgid "Log Messages:"
 msgstr "Mensagens de Registo:"
 
-#: ../mail/mail-component.c:1701
+#: ../mail/mail-component.c:1792
 msgid "Log Level"
 msgstr "Nível de Registo"
 
-#: ../mail/mail-component.c:1708 ../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:1715 ../mail/message-list.c:2403
+#: ../mail/mail-component.c:1811 ../mail/message-list.c:2435
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensagens"
 
+#: ../mail/mail-component.c:1820 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Fechar esta janela"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " Verifi_car os Tipos Suportados "
@@ -13426,7 +14085,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL não é suportado nesta compilação do Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>Fotografia do Remetente</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13507,73 +14166,73 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Fontes Impressas</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">Definições de Proxy</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Informação Requerida</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 Seguro (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\">Segurança</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\">Mensagens Enviadas e Rascunhos</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuração do Servidor</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tipo de _Autenticação</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Gestão de Contas"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "A_dicionar uma Nova Assinatura..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Adicionar um _Script"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Assinar sempre as mensagens enviadas ao utilizar esta conta"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Encriptar também para o próprio ao enviar mensagens encriptadas"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar _sempre cópia (cc) para:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre cópia _escondida (bcc) para:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confiar sempre nas chaves do meu chaveiro ao encrip_tar"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Encriptar se_mpre para o próprio ao enviar mensagens encriptadas"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "Pedir sempre um reci_bo de leitura"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "Anexar a mensagem original"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "Inserir automaticamente imagens de ri_sonhos"
@@ -13591,13 +14250,13 @@ msgid "C_haracter set:"
 msgstr "Con_junto de caracteres:"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "Verificar nos cabeçal_hos personalizados se é não solicitada"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "Verifi_car Tipos Suportados "
 
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr "Verificar nos cabeçal_hos personalizados se é não solicitada"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "Verificar nas _mensagens recebidas por não solicitadas"
@@ -13659,19 +14318,18 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Assinar digitalmente as mensagens _enviadas (por omissão)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr ""
-"_Não marcar as mensagens como não solicitadas se o remetente constar do meu "
-"livro de endereços"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr "Não formatar mensagens se o taman_ho do texto exceder"
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
 msgstr ""
-"Não formatar conteúdos de texto em emails se o taman_ho do texto exceder"
+"Não _marcar as mensagens como não solicitadas se o remetente constar do meu "
+"livro de endereços"
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "Não citar a mensagem original"
+msgid "Do not quote"
+msgstr "Não citar"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13734,72 +14392,90 @@ msgid "HTML Messages"
 msgstr "Mensagens HTML"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "Proxy H_TTP:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "Cabeçalhos"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "_Realçar as citações com"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "Embutido"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
-msgstr "Embutir a mensagem original (estilo Outlook)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr "Embutida (estilo 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 "Etiquetas"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "Tabela de Idiomas"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "Configuração de Email"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "Tabela de Cabeçalhos de Mensagens"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "Localização da caixa de correio"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "Compositor de Mensagens"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr "Nenhuma _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 caracter \"_\" no nome da etiqueta é utilizado como o identificador "
 "de tecla de atalho no 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"
 msgstr ""
 "Nota: não lhe será pedida nenhuma senha até que se ligue pela primeira vez"
 
-#: ../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 ""
+"Esta opção será ignorada se for encontrada uma equivalência para cabeçalhos "
+"de mensagens não solicitadas."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganização:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de C_have PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "Sen_ha:"
+
+#: ../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."
@@ -13807,7 +14483,7 @@ msgstr ""
 "Introduza um nome descritivo para esta conta no espaço abaixo.\n"
 "Este nome será utilizado apenas para apresentação."
 
-#: ../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."
@@ -13816,7 +14492,7 @@ msgstr ""
 "certeza, pergunte ao seu administrador de sistemas ou Fornecedor de Serviço "
 "de Internet."
 
-#: ../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 "
@@ -13826,108 +14502,116 @@ msgstr ""
 "abaixo não têm de ser preenchidos, excepto se desejar incluir essa "
 "informação nas mensagens que enviar."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Seleccione de entre as seguintes opções"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Port:"
+msgstr "Porto:"
+
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar _quando enviar mensagens apenas com destinatários em Bcc"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "Citar a mensagem original"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Citada"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "Recordar a sen_ha"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Res_ponder-A:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Recordar a sen_ha"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "Servidor S_OCKS:"
+
+#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr ""
 "Procurar p_ela fotografia do remetente apenas no livro de endereços local"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "S_eleccionar..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "_Enviar recibos de mensagem:"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "Fonte _Base:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Seleccionar a fonte HTML de largura fixa"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccionar a fonte HTML de largura fixa para impressão"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Seleccionar a fonte HTML de largura variável"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccionar a fonte HTML de largura variável para impressão"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "A Enviar Mensagens"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Pasta de _Mensagens Enviadas:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vidor requer autenticação"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Tipo de Servidor: "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "Certificado de assi_natura:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "Assinat_ura:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Assinaturas"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Tabela de Assinaturas"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
-msgstr "Verificar a _Ortografia"
+msgstr "Verificar a Ortografia"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr "Começar a escrever no _fundo ao responder"
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "T_ipo: "
 
-#: ../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."
@@ -13935,7 +14619,7 @@ msgstr ""
 "Esta listagem de idiomas reflecte apenas aqueles para os quais possui um "
 "dicionário instalado."
 
-#: ../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"
@@ -13945,14 +14629,7 @@ msgstr ""
 "sua assinatura. O nome que especificar será utilizado\n"
 "apenas para visualização. "
 
-#: ../mail/mail-config.glade.h:146
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Esta opção será ignorada se for encontrada uma equivalência para cabeçalhos "
-"de mensagens não solicitadas."
-
-#: ../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\""
@@ -13960,16 +14637,25 @@ msgstr ""
 "Indique o nome pelo qual deseja referir-se a esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: ../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 "Utili_zador:"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "Utilizar Aute_nticação"
+
+#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../plugins/google-account-setup/google-source.c:678
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "_Nome de utilizador:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "Largura v_ariável:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13979,101 +14665,125 @@ msgstr ""
 "\n"
 "Prima \"Avançar\" para começar. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "_Adicionar Assinatura"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "_Ler sempre as imagens da Internet"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "URL de configuração _automática de proxy:"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "Plugin de correio _não solicitado por omissão:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "Ligação _directa à Internet"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "_Não assinar os pedidos de reunião (para compatibilidade com o Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Estilo de reencaminhamento:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Manter a Assinatura acima da mensagem original nas respostas"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Ler imagens em mensagens de contactos"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local addressbook only"
+msgstr "_Procurar apenas no livro de endereços local"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Tornar esta na minha conta por omissão"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "Configuração _manual de proxy:"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Marcar as mensagens como lidas após"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Nunca ler as imagens da Internet"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Caminho"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "_Avisar ao enviar mensagens HTML para contactos que as não desejam"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Questionar ao enviar mensagens HTML para contactos que não as desejam"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Avisar ao enviar mensagens sem linha de assunto definida"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "Estilo de _resposta:"
 
-#: ../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 "Proxy HTTP _Seguro"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "_Seleccionar..."
 
 #. 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 "Apresentar as animações de image_s"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Apresentar a fotografia do remetente na antevisão da mensagem"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Encurtar os cabeçalhos Para / Cc / Bcc para "
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "_Utilizar uma Ligação Segura:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "_Utilizar omissões do sistema"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Utilizar a mesma fonte que as outras aplicações"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "endereços"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "descrição"
 
@@ -14113,43 +14823,43 @@ msgstr "_Sensível à capitalização"
 msgid "Co_mpleted"
 msgstr "Ter_minada"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Procurar:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Procurar na Mensagem"
 
-#: ../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 Dar Seguimento"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Subscrições de Pasta"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Acordo de Licença"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Nenhuma Seleccionada"
 
-#: ../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 "Informação de Segurança"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Pastas 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."
@@ -14157,23 +14867,23 @@ msgstr ""
 "As mensagens que seleccionou para dar seguimento estão listadas abaixo.\n"
 "Seleccione uma acção de dar seguimento no menu \"Marcar\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Aceitar a Licença"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
-msgstr "_Expira A:"
+msgstr "_Data Limite A:"
 
-#: ../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 aqui para aceitar a licença de utilização"
 
-#: ../mail/mail-folder-cache.c:823
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "A pingar %s"
@@ -14220,11 +14930,11 @@ msgstr "A enviar a mensagem %d de %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Falha ao enviar %d de %d mensagens."
 
-#: ../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 "Cancelado."
 
-#: ../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 "Terminado."
 
@@ -14242,77 +14952,82 @@ msgstr "A mover as mensagens para %s"
 msgid "Copying messages to %s"
 msgstr "A copiar as mensagens para %s"
 
-#: ../mail/mail-ops.c:1161
+#: ../mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Mensagens reencaminhadas"
 
-#: ../mail/mail-ops.c:1202
+#: ../mail/mail-ops.c:1205
 #, c-format
 msgid "Opening folder %s"
 msgstr "A abrir a pasta %s"
 
-#: ../mail/mail-ops.c:1267
+#: ../mail/mail-ops.c:1270
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "A obter a informação de quota da pasta %s"
+
+#: ../mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "A abrir o armazenamento %s"
 
-#: ../mail/mail-ops.c:1338
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr "A remover a pasta %s"
 
-#: ../mail/mail-ops.c:1427
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "A armazenar a pasta '%s'"
 
-#: ../mail/mail-ops.c:1490
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "A expurgar e armazenar a conta '%s'"
 
-#: ../mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr "A armazenar a conta '%s'"
 
-#: ../mail/mail-ops.c:1545
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr "A actualizar a pasta"
 
-#: ../mail/mail-ops.c:1582 ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
 msgid "Expunging folder"
 msgstr "A expurgar a pasta"
 
-#: ../mail/mail-ops.c:1629
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "A esvaziar o lixo em '%s'"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1705
 msgid "Local Folders"
 msgstr "Pastas Locais"
 
-#: ../mail/mail-ops.c:1711
+#: ../mail/mail-ops.c:1786
 #, c-format
 msgid "Retrieving message %s"
 msgstr "A obter a mensagem %s"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1893
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "A obter %d mensagem"
 msgstr[1] "A obter %d mensagens"
 
-#: ../mail/mail-ops.c:1903
+#: ../mail/mail-ops.c:1978
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "A gravar %d mensagem"
 msgstr[1] "A gravar %d mensagens"
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14321,11 +15036,11 @@ msgstr ""
 "Erro ao gravar as mensagens em: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2045
+#: ../mail/mail-ops.c:2128
 msgid "Saving attachment"
 msgstr "A gravar o anexo"
 
-#: ../mail/mail-ops.c:2057 ../mail/mail-ops.c:2063
+#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14334,51 +15049,52 @@ msgstr ""
 "Incapaz de criar o ficheiro de resultado: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2073
+#: ../mail/mail-ops.c:2169
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Incapaz de escrever dados: %s"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "A desligar-se de %s"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "A estabelecer nova ligação a %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "A preparar a conta '%s' para o modo desligado"
 
-#: ../mail/mail-ops.c:2401
+#: ../mail/mail-ops.c:2497
 msgid "Checking Service"
 msgstr "A Verificar o Serviço"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:182
 msgid "Canceling..."
 msgstr "A Cancelar..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:385
 msgid "Send & Receive Mail"
 msgstr "Enviar & Receber Mensagens"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:396
 msgid "Cancel _All"
 msgstr "Cancelar _Tudo"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:505
 msgid "Updating..."
 msgstr "A Actualizar..."
 
-#: ../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 "A Aguardar..."
 
-#: ../mail/mail-send-recv.c:792
+#: ../mail/mail-send-recv.c:806
+#, c-format
 msgid "Checking for new mail"
 msgstr "A verificar a existência de novas mensagens"
 
@@ -14405,17 +15121,17 @@ msgstr "Introduza a Senha"
 msgid "User canceled operation."
 msgstr "Utilizador cancelou a operação."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Editar assinatura"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "_Gravar e Fechar"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Introduza um nome para esta assinatura."
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "Editar a Assinatura"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "Nome:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "Nome da _Assinatura:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14456,52 +15172,47 @@ msgstr "A actualizar as Pastas de Procura para '%s:%s'"
 msgid "Updating Search Folders for '%s'"
 msgstr "A actualizar as Pastas de Procura para '%s'"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Editar a Pasta de Procura"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Nova Pasta de Procura"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr ""
-"Já existe uma pasta denominada &quot;{0}&quot;. Utilize um nome diferente."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "Já existe uma pasta denominada \"{0}\". Utilize um nome diferente."
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr ""
-"Já existe uma pasta denominada &quot;{1}&quot;. Utilize um nome diferente."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Já existe uma pasta denominada \"{1}\". Utilize um nome diferente."
 
 #: ../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 ""
-"Já existe uma pasta não-vazia em &quot;{1}&quot;.\n"
+"Já existe uma pasta não-vazia em \"{1}\".\n"
 "\n"
 "Pode ignorar esta pasta, sobrepo-la ou acrescentar ao seu conteúdo, ou sair."
 
 #: ../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 ""
-"Foi pedido um recibo de notificação de leitura para &quot;{1}&quot;. Enviar "
-"o recibo de notificação para {0}?"
+"Foi pedido um recibo de notificação de leitura para \"{1}\". Enviar o recibo "
+"de notificação para {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 ""
-"Já existe uma assinatura denominada &quot;{0}&quot;. Utilize um nome "
-"diferente."
+"Já existe uma assinatura denominada \"{0}\". Utilize um nome diferente."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14541,10 +15252,10 @@ 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 ""
 "Deseja mesmo remover definitivamente todas as mensagens apagadas na pasta "
-"&quot;{0}&quot;?"
+"\"{0}\"?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14559,101 +15270,103 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Deseja mesmo enviar uma mensagem sem assunto?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "Devido a &quot;{0}&quot;."
+msgid "Because \"{0}\"."
+msgstr "Devido a \"{0}\"."
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "Devido a &quot;{2}&quot;."
+msgid "Because \"{2}\"."
+msgstr "Devido a \"{2}\"."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Assinatura em Branco"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Incapaz de adicionar a Pasta de Procura &quot;{0}&quot;."
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Incapaz de adicionar a Pasta de Procura \"{0}\"."
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Incapaz de copiar a pasta &quot;{0}&quot; para &quot;{1}&quot;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Incapaz de copiar a pasta \"{0}\" para \"{1}\"."
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Incapaz de criar a pasta &quot;{0}&quot;."
+msgid "Cannot create folder \"{0}\"."
+msgstr "Incapaz de criar a pasta \"{0}\"."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Incapaz de criar o directório temporário de gravação."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "Incapaz de criar o directório de gravação devido a &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Incapaz de criar o directório de gravação devido a \"{1}\""
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "Incapaz de apagar a pasta &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Incapaz de apagar a pasta \"{0}\"."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "Incapaz de apagar a pasta de sistema &quot;{0}&quot;."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Incapaz de apagar a pasta de sistema \"{0}\"."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr ""
-"Incapaz de editar a Pasta de Procura &quot;{0}&quot; pois esta não existe."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Incapaz de editar a Pasta de Procura \"{0}\" pois esta não existe."
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Incapaz de mover a pasta &quot;{0}&quot; para &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Incapaz de mover a pasta \"{0}\" para \"{1}\"."
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "Incapaz de abrir a origem &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
+msgstr "Incapaz de abrir a origem \"{1}\""
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "Incapaz de abrir a origem &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
+msgstr "Incapaz de abrir a origem \"{2}\"."
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "Incapaz de abrir o destino &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
+msgstr "Incapaz de abrir o destino \"{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 ""
-"Incapaz de ler o ficheiro de licença &quot;{0}&quot;, devido a um problema "
-"na instalação. Não será possível utilizar este fornecedor até que possa "
-"aceitar a sua licença."
+"Incapaz de ler o ficheiro de licença \"{0}\", devido a um problema na "
+"instalação. Não será possível utilizar este fornecedor até que possa aceitar "
+"a sua licença."
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Incapaz de renomear &quot;{0}&quot; para &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Incapaz de renomear \"{0}\" para \"{1}\"."
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "Incapaz de renomear ou mover a pasta de sistema &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Incapaz de renomear ou mover a pasta de sistema \"{0}\"."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Incapaz de gravar as alterações à conta."
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "Incapaz de gravar no directório &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Incapaz de gravar no directório \"{0}\"."
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "Incapaz de gravar para o ficheiro &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
+msgstr "Incapaz de gravar para o ficheiro \"{0}\"."
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "Incapaz de definir o script de assinatura &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Incapaz de definir o script de assinatura \"{0}\"."
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "Falha na Verificação por Correio Não Solicitado"
+
+#: ../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."
@@ -14662,46 +15375,42 @@ msgstr ""
 "que muitas senhas são sensíveis à capitalização; o caps lock poderá estar "
 "activo."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Incapaz de gravar o ficheiro de assinatura."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "Apagar &quot;{0}&quot;?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "Apagar a conta?"
+msgid "Delete \"{0}\"?"
+msgstr "Apagar \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "Apagar as mensagens na Pasta de Procura &quot;{0}&quot;?"
+msgid "Delete account?"
+msgstr "Apagar a conta?"
 
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Apagar as mensagens na Pasta de Procura \"{0}\"?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "Apagar as mensagens na Pasta de Procura?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Descartar as alterações?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Não _apagar"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Não apagar"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Não desactivar"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Deseja que a operação também seja realizada nas subpastas?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -14807,35 +15516,27 @@ msgid "Mark all messages as read"
 msgstr "Marcar todas as mensagens como lidas"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Marcar todas as mensagens nesta pasta e suas subpastas como lidas?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Pasta inexistente."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Nenhuma origem seleccionada."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "Apenas na Pasta _Actual"
-
-#: ../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 ""
 "Abrir demasiadas mensagens simultaneamente poderá demorar bastante tempo."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Verifique as definições da sua conta e tente novamente."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Active a conta ou envie utilizando outra conta."
 
-#: ../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."
@@ -14843,7 +15544,7 @@ msgstr ""
 "Introduza um endereço de email válido no campo Para:. Pode procurar "
 "endereços de email premindo o botão Para: junto à caixa de introdução."
 
-#: ../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"
@@ -14853,35 +15554,43 @@ msgstr ""
 "receber mensagens em 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 "Introduza um nome único para identificar esta assinatura."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Aguarde por favor."
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "Problemas ao migrar a pasta de mensagens antiga &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Problemas ao migrar a pasta de mensagens antiga \"{0}\"."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "A consultar o servidor"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "A consultar o servidor para obter a lista de mecanismos de autenticação "
 "suportados."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Foi pedido um recibo de leitura."
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Realmente apagar a pasta \"{0}\" e todas as suas subpastas?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "Falha no Relato de Correio Não Solicitado"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "Apagar mesmo a pasta &quot;{0}&quot; e todas as suas subpastas?"
+msgid "Report Not Junk Failed"
+msgstr "Falha no Relato da Inexistência de Correio Não Solicitado"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -14933,13 +15642,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 ""
 "A(s) seguinte(s) Pasta(s) de Procura:\n"
 "{0}\n"
 "Utilizavam a pasta agora removida:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "E foram actualizadas."
 
 #: ../mail/mail.error.xml.h:106
@@ -14947,13 +15656,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 ""
 "A(s) seguinte(s) regra(s) de filtro:\n"
 "{0}\n"
 "Utilizavam a pasta agora removida:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "E foram actualizadas."
 
 #: ../mail/mail.error.xml.h:111
@@ -15067,10 +15776,8 @@ msgstr ""
 "locais, todas as remotas ou ambas."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"O seu início de sessão no servidor &quot;{0}&quot; como &quot;{0}&quot; "
-"falhou."
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Falha ao iniciar sessão no servidor \"{0}\" como \"{0}\"."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -15092,22 +15799,22 @@ msgstr "_Expurgar"
 msgid "_Open Messages"
 msgstr "_Abrir as Mensagens"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "na Pasta Actual e Suas _Subpastas"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Por Ler"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Respondida"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "Reencaminhada"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Múltiplas Mensagens Por Ler"
@@ -15132,40 +15839,53 @@ msgstr "Alto"
 msgid "Highest"
 msgstr "Mais Alto"
 
-#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1618 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:204
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoje %l:%M %p"
 
-#: ../mail/message-list.c:1627 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %l:%M %p"
 
-#: ../mail/message-list.c:1639 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1647 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1649 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3846
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3897 ../mail/message-list.c:4354
 msgid "Generating message list"
 msgstr "A gerar a lista de mensagens"
 
+#: ../mail/message-list.c:4204
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"Nenhuma mensagem satisfaz os seus critérios de pesquisa. Limpe a procura no "
+"item de menu Procurar->Limpar ou altere-a."
+
+#: ../mail/message-list.c:4206
+msgid "There are no messages in this folder."
+msgstr "Não existem mensagens nesta pasta."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
-msgstr "Expira A"
+msgstr "Data Limite A"
 
 #: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
@@ -15192,39 +15912,39 @@ msgstr "Mensagens Enviadas"
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../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 "Não Reencaminhar"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Dar Seguimento"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Para Sua Informação"
 
-#: ../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 "Reencaminhar"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Nenhuma Resposta Necessária"
 
-#: ../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 "Rever"
 
@@ -15249,6 +15969,10 @@ msgid "Subject contains"
 msgstr "Assunto contém"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Assunto ou Destinatários contém"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Assunto ou Remetente contém"
 
@@ -15261,14 +15985,6 @@ msgid "Provides core functionality for local address books."
 msgstr "Disponibiliza funcionalidades base para os livros de endereços locais."
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr "Activar o plugin de lembrete de anexo"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr "Activar o plugin de lembrete de anexo."
-
-#: ../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"
@@ -15276,7 +15992,7 @@ msgstr ""
 "Lista de pistas para o plugin de lembrete de anexos procurar no corpo da "
 "mensagem"
 
-#: ../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."
@@ -15284,14 +16000,11 @@ msgstr ""
 "Lista de pistas para o plugin de lembrete de anexos procurar no corpo da "
 "mensagem."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "Palavras Chave"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr "Lembrar de anexos em _falta"
-
 #: ../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"
@@ -15317,9 +16030,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "A Mensagem não tem anexos"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "_Prosseguir a Edição"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "_Editar a Mensagem"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -15333,28 +16046,28 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Plugin de áudio embutido"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:107
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione o nome do ficheiro de cópia de segurança do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:136
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution após a cópia de segurança"
 
-#: ../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 ""
 "Seleccione o nome do ficheiro de cópia de segurança do Evolution a repôr"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution após repôr o arquivo"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "Restore from backup"
 msgstr "Recuperar da cópia de segurança"
 
-#: ../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"
@@ -15364,97 +16077,123 @@ msgstr ""
 "recuperar todo o Correio, Calendários, Tarefas, Memos e Contactos.\n"
 "Também recupera todas as suas definições pessoais, filtros de correio, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restore Evolution from the backup file"
 msgstr "_Recuperar o Evolution a partir de um ficheiro de cópia de segurança"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:271
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione um ficheiro de Cópia de Segurança do Evolution a recuperar:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:274
 msgid "Choose a file to restore"
 msgstr "Seleccione um ficheiro a recuperar"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:46
 msgid "Backup Evolution directory"
 msgstr "Directório de cópia de segurança do Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:48
 msgid "Restore Evolution directory"
 msgstr "Repôr o directório do Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:50
 msgid "Check Evolution Backup"
 msgstr "Verificar o Ficheiro de Cópia de Segurança 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 "Com o Interface Gráfico de Utilizador"
 
-#: ../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 "A desligar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:112
 msgid "Backing Evolution accounts and settings"
 msgstr "A realizar a cópia de segurança das contas e definições do Evolution"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:116
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "A realizar a cópia de segurança dos dados do Evolution (Correio, Contactos, "
 "Calendários, Tarefas, Memos)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:127
 msgid "Backup complete"
 msgstr "Cópia de segurança terminada"
 
-#: ../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 "A Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:242
 msgid "Backup current Evolution data"
 msgstr "Realizar de cópia de segurança dos dados actuais do Evolution"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:247
 msgid "Extracting files from backup"
 msgstr "A extrair ficheiros da cópia de segurança"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:254
 msgid "Loading Evolution settings"
 msgstr "A ler as definições do Evolution"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:258
 msgid "Removing temporary backup files"
 msgstr "A remover os ficheiros temporários de cópia de segurança"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:265
+msgid "Ensuring local sources"
+msgstr "A garantir recursos locais"
+
+#: ../plugins/backup-restore/backup.c:435
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "A criar cópia de segurança na pasta %s"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:440
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "A recuperar da pasta %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 "Cópia de Segurança do Evolution"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:459
 msgid "Evolution Restore"
 msgstr "Recuperação do Evolution"
 
+#: ../plugins/backup-restore/backup.c:494
+msgid "Backing up Evolution Data"
+msgstr "A Realizar de Cópia de Segurança dos Dados do Evolution"
+
+#: ../plugins/backup-restore/backup.c:495
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+"Aguarde enquanto o Evolution realiza uma cópia de segurança dos seus dados."
+
+#: ../plugins/backup-restore/backup.c:497
+msgid "Restoring Evolution Data"
+msgstr "Recuperar Dados do Evolution"
+
+#: ../plugins/backup-restore/backup.c:498
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Aguarde enquanto o Evolution recupera os seus dados."
+
+#: ../plugins/backup-restore/backup.c:516
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+"Esta operação poderá demorar dependendo da quantidade de dados na sua 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 ""
@@ -15490,14 +16229,22 @@ msgstr ""
 "após terminada a cópia de segurança, active o botão de alternância."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "Permissões Insuficientes"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "Ficheiro de cópia de segurança do Evolution inválido"
 
-#: ../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 "Seleccione uma cópia de segurança válida a restaurar."
 
-#: ../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 "A pasta seleccionada não permite a escrita."
+
+#: ../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 "
@@ -15524,42 +16271,39 @@ msgstr "R_ecuperar as Definições..."
 msgid "_Backup Settings..."
 msgstr "_Realizar Cópia de Segurança das Definições..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos Automáticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create addressbook entries when replying to messages"
 msgstr ""
 "Criar _automaticamente entradas no livro de endereços ao responder a "
 "mensagens"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccionar o livro de Endereços para os Contactos Automáticos"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de Mensagens Instantâneas"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronizar periodicamente a informação e imagens de contactos com a lista "
-"de contactos do Pidgin"
+"Sincronizar a informação e imagens de contactos com a lista de contactos do "
+"Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccionar o livro de Endereços para a lista de contactos Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar com a lista de _amigos agora"
 
@@ -15577,7 +16321,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 "Ocorreu um erro ao lançar %s: %s."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "Processo filho bogofilter não responde, a matá-lo..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "Interrompida a espera pelo processo filho bogofilter, a terminar..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "Falha na ligação com o bogofilter, código de erro: %d."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "Converter o texto da mensagem para _Unicode"
 
@@ -15599,20 +16364,24 @@ msgid "Bogofilter Options"
 msgstr "Opções do Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Plugin de não solicitados bogofilter"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtra as mensagens não solicitadas utilizando o Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/caldav/caldav-source.c:249
+#: ../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/caldav/caldav-source.c:271
+#: ../plugins/google-account-setup/google-source.c:671
 msgid "Use _SSL"
 msgstr "Utilizar _SSL"
 
@@ -15632,17 +16401,17 @@ msgstr "Calendários Locais"
 msgid "Provides core functionality for local calendars."
 msgstr "Disponibiliza funcionalidades base para calendários 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
-msgid "_Refresh:"
-msgstr "Actual_izar:"
+#: ../plugins/google-account-setup/google-source.c:695
+msgid "Re_fresh:"
+msgstr "Act_ualizar:"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "Ligação _segura"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "Utili_zador:"
 
@@ -15717,7 +16486,7 @@ msgstr ""
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
-msgstr "Ferramenta de copia"
+msgstr "Ferramenta de cópia"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -15744,14 +16513,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Deseja tornar o Evolution no seu cliente de email por omissão?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../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 "Marcar como pasta por _omissão"
+msgid "Mark as _default address book"
+msgstr "Marcar como livro de endereços por _omissão"
+
+#: ../plugins/default-source/default-source.c:102
+msgid "Mark as _default calendar"
+msgstr "Marcar como calendário por _omissão"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default task list"
+msgstr "Marcar como lista de tarefas por _omissão"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default memo list"
+msgstr "Marcar como lista de memos por _omissão"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15765,6 +16545,57 @@ msgstr ""
 "Disponibiliza funcionalidades para marcar um calendário ou livro de "
 "endereços como o por omissão."
 
+#: ../plugins/email-custom-header/email-custom-header.c:562
+msgid "_Custom Header"
+msgstr "_Cabeçalho Personalizado"
+
+#: ../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"
+
+#. 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 de uma chave de Cabeçalho Personalizado "
+"é:\n"
+"Nome dos valores de chaves de Cabeçalhos Personalizados separados por \";\"."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "Cabeçalho Personalizado de Mensagem"
+
+#. 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 "Adiciona um cabeçalho personalizado às mensagens enviadas."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Cabeçalho Personalizado"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Lista de Cabeçalhos Personalizados"
+
+#: ../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 ""
+"A chave especifica a lista de cabeçalhos personalizados que pode adicionar a "
+"uma mensagem enviada. O formato para especificar um Cabeçalho e um valor de "
+"Cabeçalho é: Nome do cabeçalho personalizado seguido de \"=\" e os valores "
+"separados por \";\""
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Abrir a Pasta de Outro Utilizador"
@@ -15782,12 +16613,12 @@ msgid "_User:"
 msgstr "_Utilizador:"
 
 #. 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 "Senha Segura"
 
 #. 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."
@@ -15795,11 +16626,11 @@ msgstr ""
 "Esta opção irá estabelecer uma ligação ao servidor utilizando autenticação "
 "de senha segura (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Senha de Texto Simples"
 
-#: ../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."
@@ -15807,11 +16638,11 @@ msgstr ""
 "Esta opção irá estabelecer uma ligação a um servidor Exchange utilizando "
 "autenticação com senha em texto simples."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Fora do Escritório"
 
-#: ../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."
@@ -15819,78 +16650,83 @@ msgstr ""
 "A mensagem abaixo especificada será automaticamente enviada para todas \n"
 "as pessoas lhe enviarem uma mensagem enquanto estiver ausente do escritório."
 
-#: ../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 "Estou ausente do escritório"
 
-#: ../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 "Encontro-me no escritório"
 
 #. 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 "Alterar a senha para conats 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 "Alterar a Senha"
 
 #. 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 "Gerir as definições de delegação para contas Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Assistente de Delegação"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Vários"
 
 #. 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 "Visualizar o tamanho de todas as pastas Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Tamanho das Pastas"
 
-#: ../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 "Definições de Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_utenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "_Caixa de Correio:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Tipo de _Autenticação"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_Consultar por Tipos Suportados"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:974
+#: ../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:976
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
@@ -15907,7 +16743,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"
@@ -15915,7 +16751,7 @@ msgstr ""
 "A senha actual não coincide com a senha existente para a sua conta. "
 "Introduza a senha correcta"
 
-#: ../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 "As duas senhas não coincidem. Reintroduza as senhas."
 
@@ -15940,33 +16776,33 @@ msgstr "A sua senha actual expirou. Altere a sua senha agora."
 msgid "Your password will expire in the next %d days"
 msgstr "A sua senha irá expirar nos próximos %d dias"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:159
-#: ../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:189
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Editor (ler, criar, editar)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (ler, criar)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:197
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Revisor (apenas-leitura)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:247
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Permissões do Delegado"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:258
-#: ../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 "Permissões para %s"
@@ -15974,7 +16810,7 @@ msgstr "Permissões 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:348
+#: ../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."
@@ -15984,66 +16820,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "Foram-lhe concedidas as seguintes permissões sobre as minhas pastas:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr "É-lhe também permitido ver os meus itens 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:378
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr "No entanto não lhe é permitido ver os meus itens."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:410
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Foi designado como delegado de %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:415
 msgid "Delegate To"
 msgstr "Delegar A"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:580
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Remover a delegação %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Incapaz de aceder 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 "Incapaz de encontrar o próprio 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 "Incapaz de encontrar 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 "Incapaz de remover a delegação %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Incapaz de actualizar a lista de delegações."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Incapaz de adicionar 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."
 
@@ -16091,20 +16927,25 @@ msgstr "_Resumir as permissões"
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../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 "Permissões..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
 msgid "Folder Name"
 msgstr "Nome da Pasta"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
 msgid "Folder Size"
 msgstr "Tamanho da Pasta"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+msgid "User"
+msgstr "Utilizador"
+
+#: ../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 "Subscrever a Pasta de Outro Utilizador"
@@ -16113,20 +16954,20 @@ msgstr "Subscrever a Pasta de Outro Utilizador"
 msgid "Exchange Folder Tree"
 msgstr "Árvore de Pastas 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 "Remover Subscrição de Pasta..."
 
-#: ../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 "Remover mesmo a subscrição da pasta \"%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 "Remover a subscrição de \"%s\""
@@ -16191,15 +17032,18 @@ msgstr "A sua senha irá expirar dentro de 7 dias..."
 msgid "_Change Password"
 msgstr "Alterar a _Senha"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Permissão negada.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
 msgid "Add User:"
 msgstr "Adicionar Utilizador:"
 
-#: ../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 "Adicionar Utilizador"
 
@@ -16321,11 +17165,11 @@ msgstr "_Utilizador"
 msgid "button-user"
 msgstr "botão-utilizador"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "Seleccionar Utilizador"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "Livro de Endereços..."
 
@@ -16339,7 +17183,7 @@ msgstr "Subscrever o Calendário de Outro Utilizador"
 
 #: ../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 ""
 "Um plugin que gere um conjunto de operações e funcionalidades específicas de "
@@ -16432,10 +17276,16 @@ msgid "Could not update out-of-office state"
 msgstr "Incapaz de actualizar o estado de fora-do-escritório"
 
 #: ../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 tem de ser reiniciado para ler a caixa de correio do utilizador "
+"subscrito"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Conta Exchange está em modo desligado."
 
-#: ../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"
@@ -16463,32 +17313,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 "Falha ao actualizar os 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 "A pasta já 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 "A pasta não 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 "Pasta desligada"
 
-#: ../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 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 "Servidor de Catálogo Global não se encontra acessível"
 
-#: ../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."
@@ -16496,76 +17346,76 @@ msgstr ""
 "Se o OWA está em execução num caminho diferente, tem de o especificar no "
 "diálogo de configuração 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 Correio {0} não se enconra 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 "Certifique-se de que o URL está correcto e tente novamente."
 
-#: ../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 ""
 "Certifique-se de que o nome do servidor está correcto e tente novamente."
 
-#: ../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 ""
 "Certifique-se de que o utilizador e senha estão correctos e tente novamente."
 
-#: ../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 "Nenhum 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 "Nenhuma caixa de correio para o utilizador {0} em {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 "Utilizador {0} inexistente"
 
-#: ../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 "Senha alterada com sucesso."
 
-#: ../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 o ID de um Delegado ou remova a selecção da opção Enviar como um "
 "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 ""
 "Certifique-se de que o nome do Servidor Global de Catálogo está 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 as alterações tenham efeito"
 
-#: ../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 outro utilizador."
 
-#: ../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 rejeitou a senha por ser demasiado simples."
 
-#: ../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 Exchange será desactivada quando sair 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 Exchange será removida quando sair 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 não é compatível com o Conector 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."
@@ -16573,7 +17423,7 @@ msgstr ""
 "O servidor está a executar Exchange 5.5. O Conector Exhange \n"
 "apenas suporta 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"
@@ -16587,41 +17437,42 @@ msgstr ""
 "\n"
 "Ou então poderá ter introduzido a senha incorrectamente."
 
-#: ../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 "Tente novamente com outra senha."
 
-#: ../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 "Incapaz de adicionar o utilizador à lista de controlo de acessos:"
 
-#: ../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 "Incapaz de 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 desconhecido ao procurar {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 desconhecido."
 
-#: ../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 desconhecido"
 
-#: ../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 "Operação não suportada"
 
-#: ../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á prestes a atingir a sua quota disponível para armazenar email 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."
@@ -16629,19 +17480,19 @@ msgstr ""
 "É-lhe permitido enviar uma mensagem em nome de apenas um delegador 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 "Não pode delegar em si prórpio"
 
-#: ../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 sua quota para armazenar email 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 "Apenas pode configurar uma única conta 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."
@@ -16649,7 +17500,7 @@ msgstr ""
 "A sua utilização actual é: {0} KB. Tente libertar algum espaço apagando "
 "algumas mensagens."
 
-#: ../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."
@@ -16657,7 +17508,7 @@ msgstr ""
 "A sua utilização actual é: {0} KB. Não lhe será agora possível enviar nem "
 "receber mensagens."
 
-#: ../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."
@@ -16665,19 +17516,19 @@ msgstr ""
 "A sua utilização actual é: {0} KB. Não lhe será possível enviar mensagens "
 "até que liberte algum espaço apagando algumas mensagens."
 
-#: ../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 "A sua senha expirou."
 
-#: ../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 "Incapaz de adicionar {0} à lista de controlo de acessos"
 
-#: ../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} já é um 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} já se encontra na lista"
 
@@ -16689,6 +17540,14 @@ msgstr "Subscrever as Tarefas de Outro Utilizador"
 msgid "Check folder permissions"
 msgstr "Verificar as permissões da pasta"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "Editor Externo por Omissão"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "O comando por omissão que deve ser utilizado como o 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 "
@@ -16702,23 +17561,59 @@ msgstr ""
 msgid "External Editor"
 msgstr "Editor Externo"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "Incapaz de criar um Ficheiro Temporário"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr "Incapaz de iniciar 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 ""
+"O Evolution é incapaz de criar um ficheiro temporário para gravar a sua "
+"mensagem. Tente novamente mais 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 ""
+"Incapaz de iniciar o editor externo definido nas preferências do plugin. "
+"Tente definir outro editor."
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Compor num Editor Externo"
+msgid "Compose in _External Editor"
+msgstr "Compor num Editor _Externo"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Compor as mensagens utilizando um editor externo"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr "Comando a ser executado para iniciar o editor: "
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"Para o Emacs utilize \"xemacs\"\n"
+"Para o VI utilize \"gvim\""
+
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Seleccione um png (48*48) de tamanho < 700bytes"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "Ficheiros PNG"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "_Face"
 
@@ -16756,20 +17651,66 @@ msgstr "Remover Subscrição de Pastas"
 msgid "_Unsubscribe"
 msgstr "_Remover a Subscrição"
 
-#: ../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 "Introduza primeiro o nome de utilizador."
+
+#: ../plugins/google-account-setup/google-source.c:497
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Introduza a senha do utilizador %s para aceder à lista de calendários "
+"subscritos."
+
+#: ../plugins/google-account-setup/google-source.c:597
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Incapaz de ler dados do servidor Google.\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:747
+msgid "Cal_endar:"
+msgstr "Cal_endário:"
+
+#: ../plugins/google-account-setup/google-source.c:782
+msgid "Retrieve _list"
+msgstr "Obter a _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 "Utilizador:"
+
+#. 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 a cada"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "Um plugin para configurar o calendário do Google."
+msgid "A plugin to setup google calendar and contacts."
+msgstr "Um plugin para configurar o calendário e contactos do Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Fontes Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "Lista de Verificação"
 
@@ -16781,7 +17722,7 @@ msgstr "Um plugin para configurar origens de calendário e contactos groupwise."
 msgid "Groupwise Account Setup"
 msgstr "Configuração de Conta Groupwise"
 
-#: ../plugins/groupwise-features/install-shared.c:215
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16806,11 +17747,11 @@ msgstr ""
 "Prima 'Avançar' para instalar a pasta partilhada\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "Instalar a pasta partilhada"
 
-#: ../plugins/groupwise-features/install-shared.c:222
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "Instalação de Pasta Partilhada"
 
@@ -16849,10 +17790,22 @@ msgid "_Junk List"
 msgstr "_Lista de Não Solicitado"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr "Anular Mensagem Enviada"
+
+#: ../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 ""
+"Ao anular uma mensagem enviada poderá removê-la da caixa de correio do "
+"destinatário. Tem a certeza de que o deseja fazer ?"
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "Mensagem anulada com sucesso"
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "Anular Mensagem"
 
@@ -16860,12 +17813,6 @@ msgstr "Anular Mensagem"
 msgid "Add Send Options to groupwise messages"
 msgstr "Adicionar Opções de Envio às mensagens 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 "Opções de Envio"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Um plugin para as funcionalidades em contas Groupwise."
@@ -16874,6 +17821,77 @@ msgstr "Um plugin para as funcionalidades em contas Groupwise."
 msgid "Groupwise Features"
 msgstr "Funcionalidades Groupwise"
 
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr "Falha ao anular mensagem"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr "O servidor não permitiu anular a mensagem seleccionada."
+
+#: ../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 "Utilizador inválido"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr ""
+"Não é possível conceder acesso de delegação ao utilizador &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 "Especifique o Utilizador"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr "Já concedeu permissões de delegação a este utilizador."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+"Tem de especificar um utilizador válido para conceder direitos de delegação."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+"Já existe uma conta denominada &quot;{0}&quot;. Verifique a sua árvore de "
+"pastas."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr "Já Existe a Conta"
+
+#: ../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 ""
+"Falha ao iniciar sessão como delegado de &quot;{0}&quot;. Verifique o seu "
+"endereço de email e tente novamente."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "Esta é uma reunião recorrente"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "Deseja aceitá-la?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "Deseja recusá-la?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Não é possível partilhar a pasta com o utilizador &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 "Tem de especificar o utilizador que deseja adicionar à lista"
+
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "Aceitar Tentativamente"
@@ -16972,9 +17990,9 @@ msgstr "<b>Nome da Conta</b>"
 msgid "Proxy Login"
 msgstr "Início de Sessão na 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)"
@@ -16983,22 +18001,22 @@ msgstr "%sIntroduza a senha para %s (utilizador %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 "Início de Sessão na _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 ""
 "O separador de Proxy apenas estará disponível quando a conta estiver ligada."
 
-#: ../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 ""
 "O separador de Proxy apenas estará disponível quando a conta estiver activa."
 
 #: ../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 "Utilizadores"
 
@@ -17014,11 +18032,15 @@ msgstr "Nova Pasta _Partilhada..."
 msgid "Sharing"
 msgstr "Partilhar"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "Notificação Personalizada"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "Adicionar   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "Alterar"
 
@@ -17083,11 +18105,11 @@ msgstr "Um plugin para configurar origens de calendário hula."
 msgid "Hula Account Setup"
 msgstr "Configuração de Conta Hula"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Cabeçalhos personalizados"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "Cabeçalhos IMAP"
 
@@ -17141,28 +18163,28 @@ msgstr "Um plugin para as funcionalidades nas contas IMAP."
 msgid "IMAP Features"
 msgstr "Funcionalidades IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "_Importar para o Calendário"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "_Importar para as Tarefas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "Importar ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "Seleccionar a Lista de Tarefas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "Seleccionar o Calendário"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:262
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr "_Importar"
 
@@ -17200,8 +18222,8 @@ msgstr ""
 "O Evolution foi incapaz de encontrar um iPod com o qual sincronizar. Ou o "
 "iPod não está ligado ao computador ou não está ligado."
 
-#: ../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 "Formato iCalendar (.ics)"
 
@@ -17218,129 +18240,129 @@ msgstr "Sincronizar com o iPod"
 msgid "iPod Synchronization"
 msgstr "Sincronização com 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 "Falha ao ler o calendário '%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 "Um compromisso no calendário '%s' entra em conflicto com esta reunião"
 
-#: ../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 "Encontrado o compromisso no calendário '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:691
 msgid "Unable to find any calendars"
 msgstr "Incapaz de encontrar qualquer calendário"
 
-#: ../plugins/itip-formatter/itip-formatter.c:693
+#: ../plugins/itip-formatter/itip-formatter.c:698
 msgid "Unable to find this meeting in any calendar"
 msgstr "Incapaz de encontrar esta reunião em qualquer calendário"
 
-#: ../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 "Incapaz de encontrar esta tarefa em qualquer lista de tarefas"
 
-#: ../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 "Incapaz de encontrar este memo em qualquer lista de memos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Searching for an existing version of this appointment"
 msgstr "A procurar por uma versão existente deste compromisso"
 
-#: ../plugins/itip-formatter/itip-formatter.c:935
+#: ../plugins/itip-formatter/itip-formatter.c:946
 msgid "Unable to parse item"
-msgstr "Incapaz de parsear o item"
+msgstr "Incapaz de processar o item"
 
-#: ../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 "Incapaz de enviar o item para o calendário '%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 "Enviar para o calendário '%s' como aceite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviar para o calendário '%s' como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1014
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviar para o calendário '%s' como recusada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1030
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviada para o calendário '%s' como cancelada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1113
+#: ../plugins/itip-formatter/itip-formatter.c:1124
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizador removeu o delegado %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviada uma notificação de cancelamento ao delegado"
 
-#: ../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 "Incapaz de enviar uma notificação de cancelamento ao delegado"
 
-#: ../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 ""
 "Incapaz de actualizar o estado de participante pois o estado é inválido!"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1246
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Incapaz de actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1250
 msgid "Attendee status updated"
 msgstr "Estado de participante actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 msgid "Meeting information sent"
 msgstr "Enviada a informação de reunião"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid "Task information sent"
 msgstr "Enviada a informação da tarefa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1282
 msgid "Memo information sent"
 msgstr "Enviada a informação do memo"
 
-#: ../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 "Incapaz de enviar a informação de reunião, a reunião não existe"
 
-#: ../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 "Incapaz de enviar a informação de tarefa, a tarefa não existe"
 
-#: ../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 "Incapaz de enviar a informação de memo, o memo não existe"
 
-#: ../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 "O calendário anexo é inválido"
 
-#: ../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."
@@ -17348,15 +18370,15 @@ msgstr ""
 "A mensagem indica conter um calendário, mas este não é um calendário "
 "iCalendar válido."
 
-#: ../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 "O item no calendário é inválido"
 
-#: ../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"
@@ -17364,11 +18386,11 @@ msgstr ""
 "A mensagem contém um calendário mas este não contém quaisquer eventos, "
 "tarefas ou informação de livre/ocupado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1440
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "The calendar attached contains multiple items"
 msgstr "O calendário anexo contém múltiplos itens"
 
-#: ../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"
@@ -17376,227 +18398,227 @@ msgstr ""
 "Para processar todos estes itens, o ficheiro deverá ser gravado e o "
 "calendário importado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2133
+#: ../plugins/itip-formatter/itip-formatter.c:2149
 msgid "This meeting recurs"
 msgstr "Esta reunião é recorrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2136
+#: ../plugins/itip-formatter/itip-formatter.c:2152
 msgid "This task recurs"
 msgstr "Esta tarefa é recorrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2139
+#: ../plugins/itip-formatter/itip-formatter.c:2155
 msgid "This memo recurs"
 msgstr "Este memo é recorrente"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2354
+#: ../plugins/itip-formatter/itip-formatter.c:2384
 msgid "_Delete message after acting"
 msgstr "_Apagar as mensagens depois de agir"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2364
-#: ../plugins/itip-formatter/itip-formatter.c:2396
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2426
 msgid "Conflict Search"
 msgstr "Procura de Conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2379
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendários onde procurar por conflitos entre reuniões"
 
 #. 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 "Hoje"
 
 #. 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 "Hoje %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 "Hoje %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 "Hoje %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 "Amanhã"
 
 #. 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 "Amanhã %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 "Amanhã %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 "Amanhã %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 "Amanhã %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 "Responda em 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 "Recebida em 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> através de %s publicou a seguinte informação de reunião:"
 
-#: ../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 informação de reunião:"
 
-#: ../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> delegou-lhe a seguinte reunião:"
 
-#: ../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> através de %s pede a sua presença na seguinte reunião:"
 
-#: ../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> pede a sua presença na seguinte reunião:"
 
-#: ../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> através de %s deseja adicionar a uma reunião existente:"
 
-#: ../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> deseja adicionar a uma reunião existente:"
 
-#: ../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 "
@@ -17605,89 +18627,89 @@ msgstr ""
 "<b>%s</b> através de %s deseja receber a mais recente informação sobre a "
 "seguinte reunião:"
 
-#: ../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> deseja receber a mais recente informação sobre a seguinte reunião:"
 
-#: ../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> através de %s enviou de volta a seguinte resposta à reunião:"
 
-#: ../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> enviou de volta a seguinte resposta à reunião:"
 
-#: ../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> através de %s cancelou a seguinte reunião:"
 
-#: ../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 seguinte reunião."
 
-#: ../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> através de %s propôs as seguintes alterações à reunião."
 
-#: ../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> propôs as seguintes alterações à reunião:"
 
-#: ../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> através de %s recusou as seguintes alterações à reunião:"
 
-#: ../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> recusou as seguintes alterações à reunião:"
 
-#: ../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> através de %s publicou a seguinte tarefa:"
 
-#: ../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 seguinte tarefa:"
 
-#: ../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> pede que seja atribuída a %s 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> através de %s atribuiu-lhe uma 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> atribuiu-lhe uma 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> através de %s deseja adicionar a uma 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> deseja adicionar a uma tarefa existente:"
 
-#: ../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 "
@@ -17696,7 +18718,7 @@ msgstr ""
 "<b>%s</b> através de %s deseja receber a mais recente informação sobre a "
 "seguinte tarefa atribuída:"
 
-#: ../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 "
@@ -17705,7 +18727,7 @@ msgstr ""
 "<b>%s</b> deseja receber a mais recente informação sobre a seguinte tarefa "
 "atribuída:"
 
-#: ../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:"
@@ -17713,22 +18735,22 @@ msgstr ""
 "<b>%s</b> através de %s enviou de volta a seguinte resposta à tarefa "
 "atribuída:"
 
-#: ../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> enviou de volta a seguinte resposta à tarefa atribuída:"
 
-#: ../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> através de %s cancelou a seguinte tarefa atribuída:"
 
-#: ../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 atribuída:"
 
-#: ../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:"
@@ -17736,102 +18758,102 @@ msgstr ""
 "<b>%s</b> através de %s propôs as seguintes alterações à atribuição da "
 "tarefa:"
 
-#: ../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> propôs as seguintes alterações à atribuição da tarefa:"
 
-#: ../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> através de %s recusou a seguinte tarefa atribuída:"
 
-#: ../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> recusou a atribuição da seguinte tarefa:"
 
-#: ../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> através de %s publicou o seguinte memo:"
 
-#: ../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 o seguinte memo:"
 
-#: ../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> através de %s deseja adicionar a um memo existente:"
 
-#: ../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> deseja adicionar a um memo 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> através de %s cancelou o seguinte memo partilhado:"
 
-#: ../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 o seguinte memo partilhado:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:819
 msgid "_Open Calendar"
 msgstr "_Abrir o Calendário"
 
-#: ../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 "_Recusar"
 
-#: ../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 "_Aceitar"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Decline all"
 msgstr "_Recusar tudo"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Tentative all"
 msgstr "Todas _tentativas"
 
-#: ../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 "_Tentativa"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Accept all"
 msgstr "_Aceitar todas"
 
 #. 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 Informação"
 
 #. 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 dos Presentes"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:849
 msgid "_Update"
 msgstr "_Actualizar"
 
@@ -17936,10 +18958,11 @@ msgstr "Gera uma notificação D-BUS ao receber uma nova mensagem."
 
 #: ../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 ""
-"Se verdadeiro, emitir \"beep\", caso contrário reproduzir um ficheiro de som "
-"ao receber mensagens novas."
+"Se \"true\", emitir um \"beep\", caso contrário reproduzir um ficheiro de "
+"som ao receber mensagens novas."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -17985,12 +19008,20 @@ msgstr "Se o ícone deverá ou não piscar."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Se notificar apenas sobre mensagens na Caixa de Entrada ou todas."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Gerar uma mensagem _D-Bus"
 
+#: ../plugins/mail-notification/mail-notification.c:378
+msgid "Evolution's Mail Notification"
+msgstr "Notificação de Nova Mensagem do Evolution"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+msgid "Mail Notification Properties"
+msgstr "Propriedades da Notificação de Nova Mensagem"
+
 #. 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"
@@ -18005,55 +19036,55 @@ msgstr[1] ""
 "Recebeu %d mensagens novas\n"
 "em %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] "Recebeu %d mensagem nova."
 msgstr[1] "Recebeu %d mensagens 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 "Nova mensagem"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:542
 msgid "Show icon in _notification area"
 msgstr "Apresentar o ícone na área de _notificação"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:545
 msgid "B_link icon in notification area"
 msgstr "P_iscar o ícone na área de notificação"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "Popup _message together with the icon"
 msgstr "Apresentar a _mensagem em popup junto ao ícone"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:728
 msgid "_Play sound when new messages arrive"
 msgstr "_Reproduzir um som ao chegarem novas mensagens"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _sound file"
 msgstr "Reproduzir um ficheiro de _som"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Specify _filename:"
 msgstr "Especificar um nome de _ficheiro:"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Select sound file"
 msgstr "Seleccione um ficheiro de som"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Pl_ay"
 msgstr "Reprodu_zir"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:805
 msgid "Notify new messages for _Inbox only"
 msgstr "Apenas notificar sobre mensagens novas na Caixa de _Entrada"
 
@@ -18206,7 +19237,7 @@ msgstr "Enviar uma mensagem para a listade distribuição?"
 #: ../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 ""
@@ -18292,6 +19323,26 @@ msgstr "_Subscrever a Lista"
 msgid "_Unsubscribe from List"
 msgstr "_Remover a Subscrição da Lista"
 
+#: ../plugins/mark-all-read/mark-all-read.c:37
+msgid "Also mark messages in subfolders?"
+msgstr "Marcar também as mensagens nas subpastas?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+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 ""
+"Deseja marcar como lidas apenas as mensagens na pasta actual ou nesta bem "
+"como em todas as suas subpastas?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:162
+msgid "Current Folder and _Subfolders"
+msgstr "Pasta Actual e Suas _Subpastas"
+
+#: ../plugins/mark-all-read/mark-all-read.c:174
+msgid "Current _Folder Only"
+msgstr "Apenas _Pasta Actual"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Marcar Todas como Lidas"
@@ -18335,7 +19386,7 @@ msgstr "Um plugin para gerir que plugins estão activos ou inactivos."
 
 #. 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 "Gestor do Plugin"
 
@@ -18347,33 +19398,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 "Descrição"
+#: ../plugins/plugin-manager/plugin-manager.c:130
+msgid "Configuration"
+msgstr "Configuração"
 
-#: ../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: Algumas alterações não terão efeito até que reinicie"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:275
 msgid "Overview"
 msgstr "Resumo"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "Configuração"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "Não existe opção de configuração para este plugin."
-
-#: ../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 "Plugin"
 
@@ -18398,41 +19440,22 @@ msgstr "Modo de Texto Simples"
 msgid "Prefer plain-text"
 msgstr "Preferir texto simples"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:174
 msgid "Show HTML if present"
 msgstr "Apresentar HTML se existente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:175
 msgid "Prefer PLAIN"
 msgstr "Preferir SIMPLES"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:176
 msgid "Only ever show PLAIN"
-msgstr "Apenas mostrar SIMPLES"
+msgstr "Apenas apresentar SIMPLES"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:219
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "Permite imprimir a mensagem a partir do compositor."
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Imprimir a Mensagem"
-
-#: ../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 "Ante_ver a Impressão"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Imprime a mensagem"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Depurador do Evolution"
@@ -18457,13 +19480,7 @@ msgstr "Localizações"
 msgid "_Publish Calendar Information"
 msgstr "_Publicar Informação de Calendários"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Introduza a senha para `%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 "Tem a certeza que deseja apagar este URL?"
 
@@ -18551,15 +19568,75 @@ msgstr ""
 "iCal\n"
 "Livre/Ocupado"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Olá Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Testes do Leitor de Plugins Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Plugin de Teste Python"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Plugin de Teste para o leitor de EPlugins Python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr "Um plugin que lê outros plugins desenvolvidos em python."
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Leitor Python"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (incorporado)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
-msgstr "Isto tornará o SpamAssassin mais preciso mas mais lento"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "Incapaz de encontrar o SpamAssassin, código: %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 "Falha ao criar um canal: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "Erro após o fork: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "Processo filho SpamAssassin não responde, a matá-lo..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr "Espera pelo processo filho SpamAssassin interrompida, a terminar..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "Falha no canal com o SpamAssassin, código de erro: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "O SpamAssassin está indisponível."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr "Isto tornará o SpamAssassin mais preciso, mas mais lento"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "I_ncluir testes remotos"
 
@@ -18587,7 +19664,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 "Gravar anexos"
 
@@ -18599,16 +19676,15 @@ msgstr "Gravar Anexos..."
 msgid "Save all attachments"
 msgstr "Gravar todos os anexos"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr "Seleccionar nome base de gravação"
 
-#: ../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 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "Gravar"
 
@@ -18616,79 +19692,79 @@ msgstr "Gravar"
 #. * 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 "Lista de Descrição"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "Lista de Categorias"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "Lista de Comentários"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "Criada"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "Lista de Contactos"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "Início"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "Fim"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "percentagem Realizada"
 
-#: ../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 "Lista de Participantes"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "Alterada"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "Opções avançadas para o formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "Prefixar um cabeçalho"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "Delimitador de valor:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "Delimitador de registo:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "Encapsular os valores com:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por vírgula (.csv)"
 
@@ -18709,15 +19785,15 @@ msgstr "_Gravar em 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: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 "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "Seleccionar o ficheiro de destino"
 
@@ -18742,12 +19818,12 @@ msgid "Show _only this Task List"
 msgstr "_Apresentar apenas 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 "Um plugin que gere o Assistente Inicial."
+msgid "Guides you through your initial account setup."
+msgstr "Guia-o através da configuração inicial de conta."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Assistente Inicial"
+msgid "Setup Assistant"
+msgstr "Assistente de Configuração"
 
 #: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
@@ -18774,23 +19850,24 @@ msgid "Importing files"
 msgstr "A importar ficheiros"
 
 #: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:143
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a informação que deseja importar:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../shell/e-shell-importer.c:396
 #, 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:507
+#, c-format
 msgid "Importing data."
 msgstr "A importar os dados."
 
 #: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../shell/e-shell-importer.c:521
 msgid "Please wait"
 msgstr "Aguarde por favor"
 
@@ -18812,6 +19889,30 @@ msgstr "Organizar as mensagens em árvore por assunto"
 msgid "F_all back to threading messages by subject"
 msgstr "Recorrer a organizar as mensagens em ár_vore por assunto"
 
+#: ../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 chave/valor para o plugin de modelos substituir no corpo de "
+"uma mensagem."
+
+#: ../plugins/templates/templates.c:614
+msgid "No title"
+msgstr "Sem título"
+
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "Gravar como _Modelo"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "Gravar como Modelo"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Plugin de modelos baseados em rascunhos"
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Um plugin simples que utiliza o ytnef para descodificar anexos tnef."
@@ -18820,6 +19921,28 @@ msgstr "Um plugin simples que utiliza o ytnef para descodificar anexos tnef."
 msgid "TNEF Attachment decoder"
 msgstr "Descodificador de Anexos TNEF"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Um plugin para configurar contactos WevDAV."
+
+#: ../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 (necessário no apache < 2.2.8)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Consola do Evolution"
@@ -18837,70 +19960,148 @@ msgid "Evolution Test component"
 msgstr "Componente de Teste do Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "Uma descrição textual da configuração actual de impressora."
+msgid "Authenticate proxy server connections"
+msgstr "Autenticar as ligações ao servidor de proxy"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr "URL de configuração automática de proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Versão da configuração"
 
-#: ../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 ""
 "Decide se a detecção de terminação em erro deverá ser executada ou não."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
 msgstr "Largura por omissão da barra lateral"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window height"
 msgstr "Altura por omissão da janela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window state"
 msgstr "Estado por omissão da janela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window width"
 msgstr "Largura por omissão da janela"
 
-#: ../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 ""
+"Activa as definições de proxy ao aceder por HTTP/HTTP Seguro à Internet."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy host name"
+msgstr "Nome do servidor de proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy password"
+msgstr "Senha da proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy port"
+msgstr "Porto da proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy username"
+msgstr "Utilizador da proxy 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 alcunha do componente a ser apresentado por omissão ao iniciar."
 
-#: ../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 ""
+"Se \"true\", as ligações ao servidor de proxy requerem autenticação. O "
+"utilizador é obtido na chave GConf \"/apps/evolution/shell/network_config/"
+"authentication_user\", e a senha é obtida ou do gnome-keyring ou do ficheiro "
+"de senhas ~/.gnome2_private/Evolution."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "Last upgraded configuration version"
 msgstr "Versão da última configuração actualizada"
 
-#: ../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 ""
 "Lista de caminhos para as pastas a serem sincronizadas para o disco para "
 "serem acedidas em modo desligado"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Non-proxy hosts"
+msgstr "Servidores sem proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "Senha a indicar como autenticação ao aceder pela proxy HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Proxy configuration mode"
+msgstr "Modo de configuração da proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy host name"
+msgstr "Nome do servidor de proxy SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "SOCKS proxy port"
+msgstr "Porto da proxy SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy host name"
+msgstr "Nome do servidor de proxy de HTTP Seguro"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Secure HTTP proxy port"
+msgstr "Porto da proxy de HTTP Seguro"
+
+#: ../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 ""
+"Seleccione o modo de configuração da proxy. Valores suportados são 0, 1, 2, "
+"e 3 que representam \"utilizar definições do sistema\", \"sem proxy\", "
+"\"utilizar configuração manual de proxy\" e \"utilizar a configuração de "
+"proxy disponibilizada pelo URL de configuração\" respectivamente."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Sidebar is visible"
 msgstr "Barra lateral está visível"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Skip development warning dialog"
 msgstr "Saltar o diálogo de aviso de versão de desenvolvimento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip recovery warning dialog"
 msgstr "Saltar o diálogo de aviso de recuperação"
 
-#: ../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 "Iniciar em modo desligado"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "Barra de estados está visível"
 
-#: ../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\")."
@@ -18908,19 +20109,19 @@ msgstr ""
 "A versão da configuração do Evolution, com o nível principal/menor/"
 "configuração (por exemplo \"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 "A altura por omissão da janela principal, em 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 "A largura por omissão da janela principal, em 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 "A largura por omissão da barra lateral, em 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\")."
@@ -18928,7 +20129,43 @@ msgstr ""
 "A última versão actualizada da configuração do Evolution, com o nível "
 "principal/menor/configuração (por exemplo \"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 "O nome da máquina a utilizar como proxy HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The machine name to proxy secure HTTP through."
+msgstr "O nome da máquina a utilizar como proxy HTTP Seguro."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy socks through."
+msgstr "O nome da máquina a utilizar como proxy 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 ""
+"O porto da máquina definida por \"/apps/evolution/shell/network_config/"
+"http_host\" que é utilizada como proxy."
+
+#: ../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 é utilizada como proxy."
+
+#: ../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 é utilizada como proxy."
+
+#: ../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 "
@@ -18938,55 +20175,80 @@ msgstr ""
 "\"toolbar\". Se estiver definido \"toolbar\", o estilo dos botões é "
 "determinado pela definição da barra de ferramentas GNOME."
 
-#: ../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 ""
+"Esta chave contém a lista de máquinas às quais se acede directamente, em vez "
+"de por proxy (caso esteja activa). Os valores podem ser nomes de máquinas, "
+"domínios (utilizando um caracter global tal como *.foo.com), endereços IP "
+"(tanto IPv4 como IPv6) e endereços de rede com uma máscara (algo do tipo "
+"192.168.0.0/24)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Toolbar is visible"
 msgstr "Barra de ferramentas está visível"
 
-#: ../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 que disponibiliza valores de configuração de proxy."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Use HTTP proxy"
+msgstr "Utilizar proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr "Utilizador a indicar como autenticação ao utilizar a proxy HTTP."
+
+#: ../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 irá iniciar em modo desligado ou ligado."
 
-#: ../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 "Se a detecção de terminação em erro deverá ou não ser realizada."
 
-#: ../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 "Se a janela deverá ou não estar maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the sidebar should be visible."
 msgstr "Se a barra lateral deverá ou não estar visível."
 
-#: ../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 "Se a barra de estados deverá ou não estar visível."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the toolbar should be visible."
 msgstr "Se a barra de ferramentas deverá ou não estar visível."
 
-#: ../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 ""
 "Se o diálogo de aviso de versão Evolution de desenvolvimento é ou não "
 "apresentado."
 
-#: ../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 ""
 "Se o diálogo de aviso de recuperação do Evolution é ou não apresentado."
 
-#: ../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 "Se os botões de janela deverão ser ou não visíveis."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Estilo dos botões da janela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Botões da janela são visíveis"
 
@@ -19002,11 +20264,11 @@ msgstr "Ligações Activas"
 msgid "Click OK to close these connections and go offline"
 msgstr "Clique OK para fechar estas ligações e ficar desligado"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Seleccione o tipo de importador a executar:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:134
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -19020,11 +20282,11 @@ msgstr ""
 "Se não souber pode seleccionar \"Automático\" e o Evolution tentará "
 "descobrir."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:140
 msgid "Choose the destination for this import"
 msgstr "Seleccione o destino desta importação"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:146
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -19036,150 +20298,135 @@ msgstr ""
 "encontradas nenhumas passíveis de serem importadas. Se desejar\n"
 "tentar novamente, prima o botão \"Retroceder\".\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:284
 msgid "F_ilename:"
 msgstr "Nome do f_icheiro:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:289
 msgid "Select a file"
 msgstr "Seleccione um ficheiro"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:298
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:334
 msgid "Import data and settings from _older programs"
 msgstr "Importar dados e configurações de aplicações _antigas"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:337
 msgid "Import a _single file"
 msgstr "Importar _um único ficheiro"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-settings-dialog.c:314
 msgid "Evolution Preferences"
 msgstr "Preferências do Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Nenhum nome de pasta especificado."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Nome de pasta não pode conter o caracter Enter."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Nome de pasta não pode conter o caracter \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Nome de pasta não pode conter o caracter \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' e '..' são nomes de pastas 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: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 ""
 "Parece que as ferramentas GNOME Pilot não estão instaladas neste sistema."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bub buddy não está instalado."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Incapaz de executar o Bub 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 "Duarte Loreto <happyguy_pt@hotmail.com>"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Página Web do Evolution"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "Erro ao abrir a página web de Perguntas Frequentes."
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "Trabalhar _Ligado"
 
-#: ../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 "Trabalhar _Desligado"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "Trabalhar Desligado"
 
-#: ../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 de momento está ligado. Clique neste botão para trabalhar "
-"desligado."
+"Evolution de momento está ligado.\n"
+"Clique neste botão para trabalhar desligado."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está no processo de se desligar."
 
-#: ../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 de momento está desligado. Prima este botão para trabalhar ligado."
+"Evolution de momento está desligado.\n"
+"Prima este botão para trabalhar ligado."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:782
 #, c-format
 msgid "Switch to %s"
 msgstr "Alternar para %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:638
 msgid "Unknown system error."
 msgstr "Erro de sistema desconhecido."
 
-#: ../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 "Argumentos inválidos"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1282
 msgid "Cannot register on OAF"
 msgstr "Incapaz de se registar no OAF"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1284
 msgid "Configuration Database not found"
 msgstr "Base de Dados de Configuração não foi encontrada"
 
-#: ../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"
 
@@ -19187,10 +20434,6 @@ msgstr "Novo"
 msgid "New Test"
 msgstr "Novo Teste"
 
-#: ../shell/test/evolution-test-component.c:108
-msgid "_Test"
-msgstr "_Teste"
-
 #: ../shell/test/evolution-test-component.c:109
 msgid "Create a new test item"
 msgstr "Criar um novo item de teste"
@@ -19235,7 +20478,7 @@ msgstr ""
 "importação de ficheiros externos para o Evolution."
 
 #. 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"
@@ -19271,7 +20514,7 @@ msgstr ""
 "Esperamos que lhe agrade o resultado do nosso trabalho e aguardamos\n"
 "as suas contribuições!\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19279,19 +20522,19 @@ msgstr ""
 "Obrigado\n"
 "A Equipa do Evolution\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:253
 msgid "Do not tell me again"
 msgstr "Não apresentar esta mensagem novamente"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:303
 msgid "Evolution Crash Detection"
 msgstr "Detecção de Terminação em Erro do Evolution"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:305
 msgid "Ig_nore"
 msgstr "Ig_norar"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:320
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19302,45 +20545,45 @@ msgstr ""
 "foi utilizado. Como precaução, todos os paineis de antevisão serão\n"
 "escondidas. Pode repô-los a partir do menu Ver.\n"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:331
 msgid "_Do not show this message again"
 msgstr "_Não apresentar esta mensagem novamente"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:563
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution activando o componente especificado"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:567
 msgid "Start in online mode"
 msgstr "Iniciar em modo ligado"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:570
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forçar todos os componentes do Evolution a terminar"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:574
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 "Forçar uma nova actualização de ficheiros de configuração do Evolution 1.4"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:577
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Enviar o resultado de depuração de todos os componentes para um ficheiro."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:579
 msgid "Disable loading of any plugins."
 msgstr "Desactivar o carregamento de quaisquer plugins."
 
-#: ../shell/main.c:587
+#: ../shell/main.c:581
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o painel de antevisão de Correio, Contactos e Tarefas."
 
-#: ../shell/main.c:617
+#: ../shell/main.c:666
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O Cliente de Email e Gestor Pessoal Evolution"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19486,7 +20729,7 @@ msgstr ""
 "Se decidir prosseguir, poderá não ter acesso a alguns dos seus dados "
 "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"
@@ -19497,7 +20740,7 @@ msgstr ""
 "\n"
 "Editar definições de credibilidade:"
 
-#: ../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 "
@@ -19507,7 +20750,7 @@ msgstr ""
 "sendo credível, então considera credível a autenticidade deste certificado "
 "excepto se aqui especificado"
 
-#: ../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 "
@@ -19565,11 +20808,16 @@ msgstr "Endereço de Email"
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros de certificado de AC"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:339
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de Certificado: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Introduza a senha para `%s'"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19580,7 +20828,7 @@ msgid "Enter new password"
 msgstr "Introduza a nova senha"
 
 #. 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"
@@ -19589,7 +20837,7 @@ msgstr ""
 "Emitido a:\n"
 "  Assunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19598,7 +20846,7 @@ msgstr ""
 "Emitido por:\n"
 "  Assunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:168
 msgid "Select certificate"
 msgstr "Seleccionar certificado"
 
@@ -19786,7 +21034,7 @@ msgid "_Edit CA Trust"
 msgstr "_Editar Credibilidade da AC"
 
 #. 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 "Certificado já existe"
 
@@ -19994,8 +21242,7 @@ msgstr "Co_piar Todos os Contactos Para..."
 msgid "Contact _Preview"
 msgstr "_Antevisão de Contacto"
 
-#: ../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 "Copiar"
@@ -20020,8 +21267,7 @@ msgstr "Copiar para a Pasta..."
 msgid "Create a new addressbook folder"
 msgstr "Criar uma nova pasta de livro de endereços"
 
-#: ../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 "Cortar"
@@ -20062,8 +21308,7 @@ msgstr "Mover os contactos da pasta seleccionada para outra pasta"
 msgid "Move to Folder..."
 msgstr "Mover para a Pasta..."
 
-#: ../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 "Colar"
@@ -20100,13 +21345,11 @@ msgstr "Gravar os contactos seleccionados como VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Gravar os contactos da pasta seleccionada como 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 "Seleccionar Todos"
 
 #: ../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 "Seleccion_ar Tudo"
 
@@ -20175,7 +21418,7 @@ msgstr "_Mover o Contacto para..."
 msgid "_Move Folder Contacts To"
 msgstr "_Mover Contactos da Pasta Para..."
 
-#: ../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"
 
@@ -20236,7 +21479,7 @@ msgid "Month"
 msgstr "Mês"
 
 #: ../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"
 
@@ -20245,7 +21488,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Antevê o calendário a ser impresso"
 
 #: ../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"
 
@@ -20313,232 +21556,6 @@ msgstr "Semana de Trabalho"
 msgid "_Open Appointment"
 msgstr "_Abrir o Compromisso"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Copiar o texto seleccionado para a área de transferência"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "Copiar a selecção para a área de transferência"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Cortar o texto seleccionado para a área de transferência"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "Cortar a selecção para a área de transferência"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "Colar da área de transferência"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Colar o texto da área de transferência"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Seleccionar todo o texto"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Anexar"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "Clique aqui para anexar um ficheiro"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "Clique aqui para fechar a janela actual"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "Clique aqui para gravar a janela actual"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "Clique aqui para consultar a ajuda disponível"
-
-#.
-#. <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 "Fechar"
-
-#: ../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_nserir"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Anexo..."
-
-#: ../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 "_Fechar"
-
-#: ../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 "_Ficheiro"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "_Ajuda"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "_Opções"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "Evento de Dia Completo"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "Evento de _Dia 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 "Classificar 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 "Classificar 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 "Classificar como público"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr "Clique aqui para definir ou remover alarmes para este evento"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "Inserir opções avançadas de envio"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr "Tornar este evento como 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 a informação de livre/ocupado dos participantes"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr "Campo de _Papel"
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "_Opções de Envio"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "Apresentar horas como _ocupadas"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "Fuso-_Horário"
-
-#: ../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 se o campo de Tipo de Participante é ou não apresentado"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Alterna se o campo Responder SFF é ou não apresentado"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr "Alterna se o campo de Papel é ou não apresentado"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "Alterna se o campo de Estado é ou não apresentado"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "Alterna se o fuso horário é ou não apresentado"
-
-#: ../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 se apresentar ou não as categorias"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr "Alterna se ter ou não apresentado Eventos de Dia Completo"
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr "Alterna se apresentar ou não o tempo como ocupado"
-
-#: ../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 "_Categorias"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "_Classificação"
-
-#: ../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 "_Livre/Ocupado"
-
-#: ../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 "_Responder SFF"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "_Recorrência"
-
-#: ../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 operação de email actual"
@@ -20568,7 +21585,6 @@ msgid "Empty _Trash"
 msgstr "Esvaziar o Li_xo"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "P_asta"
 
@@ -20787,7 +21803,7 @@ msgstr "Lista de Mensagem em Árvore"
 msgid "_Group By Threads"
 msgstr "Agrupar Por Ár_vores"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Mensagem"
@@ -21124,129 +22140,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Apresentar um cursor intermitente no corpo da mensagem apresentada"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Apresentar as mensagens em estilo normal"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Apresentar as mensagens com todos os cabeçalhos de email"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Apresentar o código fonte da mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensagens apagadas seleccionadas"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "_Não Importante"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "_Afastar Zoom"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Anexado"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "Modo de _Cursor"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "L_impar a Marca"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Apagar a Mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Procurar na Mensagem..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Marcar como _Terminada"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Ir Para"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Embutida"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "Não _Solicitada"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "_Ler as Imagens"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "_Código Fonte da Mensagem"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "Mensagem Segui_nte"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "Tamanho _Normal"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_Não é Não Solicitado"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "Abrir numa Nova _Janela"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "Mensagem _Anterior"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Citada"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Ler"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Gravar a Mensagem..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "Rec_uperar a Mensagem Apagada"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "Marcar _por Ler"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Aumentar _Zoom"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Fechar esta janela"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Fechar"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -21284,290 +22296,6 @@ msgstr "Ver o memo seleccionado"
 msgid "_Open Memo"
 msgstr "_Abrir o Memo"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Anexar um ficheiro"
-
-#.
-#. <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 "Fechar o ficheiro actual"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Apagar tudo excepto a assinatura"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Encriptar esta mensagem com PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Encriptar esta mensagem com o seu Certificado de Encriptação S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "For_mato"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "Obter notificação de entrega quando a mensagem for lida"
-
-#: ../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 "Inserir opções de Envio"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "Abrir um ficheiro"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "Encriptação PGP"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "Assinatura PGP"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "_Encriptação PGP"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "A_ssinatura PGP"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "P_edir Recibo de Leitura"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "En_cripação S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "Encripação S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "Assi_natura S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "Assinatura S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "_Enviar"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Gravar Como"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "Gravar Rascunho"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Gravar _Como..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Gravar o _Rascunho"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Gravar como rascunho"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Gravar na pasta..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Gravar o ficheiro actual"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Gravar o ficheiro actual com outro nome"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Gravar a mensagem numa pasta especificada"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Enviar"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Enviar a mensagem em formato HTML"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Enviar esta mensagem"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "Definir a prioridade da mensagem como elevada"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Assinar esta mensagem com a sua chave PGP"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Assinar esta mensagem com o seu Certificado de Assinatura S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Alterna se o campo BCC é ou não apresentado"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Alterna se o campo CC é ou não apresentado"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Alterna se o selector De é ou não apresentado"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Alterna se o campo Afixar-Em é ou não apresentado"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Alterna se o campo Responder-A é ou não apresentado"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "Alterna se o campo Para é ou não apresentado"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "Campo _Bcc"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "Campo _Cc"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "_Apagar tudo"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "Campo _De"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Abrir..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "Campo _Afixar-Em"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "_Prioritizar a Mensagem"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "Campo _Responder-A"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_Segurança"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "_Opções de Envio"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "Campo _Para"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Fechar"
-
-#: ../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 "Gravar e Fechar"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Gravar e Fec_har"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Gravar o ficheiro actual e fechar a janela"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Adicionar a pasta à sua lista de pastas subscritas"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Actualizar a Lista"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Actualizar a Lista de Pastas"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Remover a pasta da sua lista de pastas subscritas"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Subscrever"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Remover a subscrição"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverter a Selecção"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr "Clique alterar/ver os detalhes de estado da tarefa"
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "Detalhes de Estado"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "Fuso Horário"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "Detalhes de _Estado"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Copiar as tarefas seleccionadas"
@@ -21764,50 +22492,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Apresentar/Esconder a Barra de Estados"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "Trabalhar _Desligado"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Fechar a Janela"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Es_quecer as Senhas"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "Perguntas _Frequentes"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Esconder os Botões"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Apenas Í_cones"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Referência Rápida"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Aparência do _Alternador"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Opções de _Sincronização..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Apenas _Texto"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Janela"
 
@@ -21877,18 +22609,18 @@ msgstr "_Memos"
 
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
-msgstr "Com Data de _Término"
+msgstr "Com _Data Limite"
 
 #: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
 msgstr "Com _Estado"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:410
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
+#. 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"
 
@@ -21905,8 +22637,8 @@ msgid "Select a Time Zone"
 msgstr "Seleccione um Fuso Horário"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "Caixa de Selecção do Fuso-Horário"
+msgid "Timezone drop-down combination box"
+msgstr "Caixa de selecção de fuso-horário"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21918,19 +22650,19 @@ msgstr ""
 "um fuso horário.\n"
 "Utilize o botão direito do rato para afastar."
 
-#: ../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 "Colecção"
 
-#: ../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 Vistas 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 Vistas"
 
@@ -21940,17 +22672,17 @@ msgid "Define Views for \"%s\""
 msgstr "Definir Vistas para \"%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 "Tabela"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "Instância"
 
-#: ../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 "Gravar a Vista Actual"
 
@@ -22002,11 +22734,11 @@ msgstr "Gravar a vista personalizada actual"
 msgid "Create or edit views"
 msgstr "Criar ou editar vistas"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Fábrica"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Definir uma Nova Vista"
 
@@ -22022,17 +22754,17 @@ msgstr "Tipo de Vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Barra de Anexos"
 
-#: ../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 "Incapaz de anexar o ficheiro %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 "Incapaz de anexar o ficheiro %s: não é um ficheiro normal"
@@ -22054,33 +22786,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "Sugerir a apresentação automática do anexo"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1724
+#: ../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 "Calendário do Mês"
 
 #: ../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 "Cor de enchimento"
 
 #: ../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 "Cor GDK de enchimento"
 
 #: ../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 "Textura de enchimento"
 
@@ -22105,29 +22836,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:3062
+#: ../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:3063
+#: ../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 "Espaçamento"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:291
 msgid "Now"
 msgstr "Agora"
 
-#: ../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 "A hora tem de ser no formato: %s"
@@ -22136,152 +22867,150 @@ msgstr "A hora tem de ser no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "O valor de percentagem tem de ser entre 0 e 100, inclusivé"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "Báltico"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "Europeu Central"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "Chinês"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "Grego"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "Japonês"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "Tailandês"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../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 "Europeu Ocidental"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "Europeu Ocidental, Novo"
 
-#: ../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 "Tradicional"
 
-#: ../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 "Simplificado"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "Visual"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Conjunto de caracteres desconhecido: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "Codificação de Caracteres"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr "Introduza o conjunto de caracteres a utilizar"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "Codificação de C_aracteres"
 
-#: ../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 introduzir a data"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Prima este botão para apresentar um calendário"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
 msgstr "Caixa de selecção para escolher a hora"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "Ag_ora"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Hoje"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Valor de Data Inválido"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Valor de Hora Invá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á ou não expandido"
 
-#: ../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 "Utilizar sublinhado"
 
-#: ../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"
@@ -22289,38 +23018,38 @@ msgstr ""
 "Se definido, um sublinhado no texto indica que o caracter seguinte deverá "
 "ser utilizado para a tecla de atalho"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "Espaço a colocar entre a etiqueta e o filho"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Widget de 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 ""
 "Um widget para apresentar em substituição da normal etiqueta de expansor"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "Tamanho do Expansor"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "Tamanho da seta de expansão"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Espaçamento do Indicador"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Espaço em torno da seta de expansão"
 
 #. 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 "Procura Avançada"
 
@@ -22365,23 +23094,31 @@ msgstr "Pasta Actual"
 msgid "Current Message"
 msgstr "Mensagem Actual"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:167
 msgid "Choose Image"
 msgstr "Seleccione a Imagem"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:625
 msgid "World Map"
 msgstr "Mapa Mundi"
 
-#: ../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 mapa interactivo baseado no rato para selecção de um fuso-horário. "
 "Utilizadores apenas com teclado deverão antes seleccionar o fuso-horário na "
 "caixa de selecção abaixo."
 
+#: ../widgets/misc/e-online-button.c:112
+msgid "Online"
+msgstr "Ligado"
+
+#: ../widgets/misc/e-online-button.c:113
+msgid "The button state is online"
+msgstr "O estado do botão é ligado"
+
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Sincronizar com:"
@@ -22406,61 +23143,61 @@ msgstr "Modelo de refluxo"
 msgid "Column width"
 msgstr "Largura da coluna"
 
-#: ../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 "Procurar"
 
-#: ../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 "Clique aqui para alterar o tipo de procura"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Procurar"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "Procurar _Agora"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID de Item"
 
-#: ../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 "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:1013
+#: ../widgets/misc/e-search-bar.c:1007
 msgid "Sho_w: "
 msgstr "_Apresentar: "
 
 #. 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 "Proc_urar: "
 
 #. 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 " e_m "
 
-#: ../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 "Linha 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 "Coluna de Cursor"
@@ -22477,7 +23214,7 @@ msgstr "Modo de Selecção"
 msgid "Cursor Mode"
 msgstr "Modo de Cursor"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:518
 msgid "When de_leted:"
 msgstr "Ao apa_gar:"
 
@@ -22501,10 +23238,6 @@ msgstr "<b>Acompanhamento de Estado</b>"
 msgid "A_uto-delete sent item"
 msgstr "Apagar a_utomaticamente o item enviado"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "Classificação"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "Criar um item _enviado para acompanhar a informação"
@@ -22585,39 +23318,40 @@ msgstr "_Após:"
 msgid "_All information"
 msgstr "_Toda a informação"
 
-#: ../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 "_Atrasar a entrega das mensagens"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_Entregue"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_Definir data de expiração"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Até:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "_Quando conveniente"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "_Quando aberta:"
 
 #. 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%% terminado)"
@@ -22662,23 +23396,23 @@ msgstr "Coluna com Foco"
 msgid "Unselected Column"
 msgstr "Coluna Des-seleccionada"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Coluna Riscada"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Sublinhar Coluna"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Coluna em Negrito"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Coluna Colorida"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Cor de Fundo da Coluna"
 
@@ -22716,7 +23450,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos Disponí_veis:"
 
 #: ../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 "Ascendente"
 
@@ -22729,7 +23463,7 @@ msgid "Clear _All"
 msgstr "Limpar _Todos"
 
 #: ../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 "Descendente"
 
@@ -22792,14 +23526,14 @@ msgstr "_Ordenar..."
 #: ../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 "Código de Não Perturbar"
 
 #: ../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 "Cabeçalho Completo"
 
@@ -22833,293 +23567,555 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d itens)"
 
-#: ../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:3020 ../widgets/table/e-table-item.c:3021
+#: ../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 "Cores de Linhas Alternadas"
 
-#: ../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:3027 ../widgets/table/e-table-item.c:3028
-#: ../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:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Grelha Desenhada Horizontalmente"
 
-#: ../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:3034 ../widgets/table/e-table-item.c:3035
-#: ../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:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Grelha Desenhada Verticalmente"
 
-#: ../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:3041 ../widgets/table/e-table-item.c:3042
-#: ../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:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Desenhar 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:3048 ../widgets/table/e-table-item.c:3049
+#: ../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:3013 ../widgets/table/e-table-item.c:3014
+#: ../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 selecção"
 
-#: ../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:3055 ../widgets/table/e-table-item.c:3056
-#: ../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:3338
+#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "Tolerância de Comprimento"
 
-#: ../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:3089 ../widgets/table/e-table-item.c:3090
-#: ../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:3370
+#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "Altura de linha 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 "Estático"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Personalizar a Vista Actual"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "Ordenação _Ascendente"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "Ordenação _Descendente"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "_Desordenar"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "Agrupar Por _Este Campo"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "Agrupar Por _Caixa"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "Remover Esta _Coluna"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "Adicionar uma C_oluna..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "A_linhamento"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "Melhor A_juste"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "Formatar as Coluna_s..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "Personali_zar a Vista Actual..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Ordenar Por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_Personalizado"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Descrição de Fonte"
 
-#: ../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 Ordenação"
 
-#: ../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 "Árvore"
 
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Cabeçalho da tabela"
 
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Modelo da tabela"
 
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Linha do cursor"
 
-#: ../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:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Procurar sempre"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Utilizar clique para adicionar"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "Adaptador de tabela ETree"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "Aspecto Retro"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "Desenhar linhas e expansores +/-."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Métodos de Introdução"
 
-#: ../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 "Processador de Eventos"
 
-#: ../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 "Negrito"
 
-#: ../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 "Riscada"
 
-#: ../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 "Âncora"
 
-#: ../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 "Alinhamento"
 
-#: ../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 "Cortar à Largura"
 
-#: ../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 "Cortar à Altura"
 
-#: ../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 "Cortar"
 
-#: ../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 "Encher rectângulo de corte"
 
-#: ../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 "Deslocamento 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 "Deslocamento 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 "Largura do texto"
 
-#: ../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 "Altura do texto"
 
-#: ../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 "Utilizar elípticas"
 
-#: ../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 "Elípticas"
 
-#: ../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 "Quebra linha"
 
-#: ../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 "Caracteres de quebra"
 
-#: ../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 "Linhas máx."
 
-#: ../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 "Desenhar margens"
 
-#: ../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 "Permitir novas linhas"
 
-#: ../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 "Desenhar fundo"
 
-#: ../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 "Desenhar botão"
 
-#: ../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 "Posição do cursor"
 
-#: ../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 "Contexto 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 "Manípulo de Popup"
 
+#~ msgid "Permission Denied."
+#~ msgstr "Autorização Negada."
+
+#~ msgid "_Contact"
+#~ msgstr "_Contacto"
+
+#~ msgid "Contact _List"
+#~ msgstr "_Lista de Contactos"
+
+#~ msgid "Address _Book"
+#~ msgstr "Livro de _Endereços"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propriedades..."
+
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>Apresentação</b>"
+
+#~ msgid "<b>Server Information</b>"
+#~ msgstr "<b>Informação de Servidor</b>"
+
+#~ msgid "_Appointment"
+#~ msgstr "_Compromisso"
+
+#~ msgid "M_eeting"
+#~ msgstr "R_eunião"
+
+#~ msgid "All Day A_ppointment"
+#~ msgstr "Com_promisso de Dia Completo"
+
+#~ msgid "Cale_ndar"
+#~ msgstr "Cale_ndário"
+
+#~ msgid "Mem_o"
+#~ msgstr "Mem_o"
+
+#~ msgid "_Shared memo"
+#~ msgstr "Memo partil_hado"
+
+#~ msgid "Memo li_st"
+#~ msgstr "Li_sta de memos"
+
+#~ msgid "Assigne_d Task"
+#~ msgstr "Tarefa Atribuí_da"
+
+#~ msgid "Tas_k list"
+#~ msgstr "L_ista de tarefas"
+
+#~ msgid "Unknown reason"
+#~ msgstr "Razão desconhecida"
+
+#~ msgid "Open File"
+#~ msgstr "Abrir o Ficheiro"
+
+#~ msgid "_Save Message"
+#~ msgstr "_Gravar a Mensagem"
+
+#~ msgid "Cannot open file &quot;{0}&quot;."
+#~ msgstr "Incapaz de abrir o ficheiro &quot;{0}&quot;."
+
+#~ msgid "folder-display|%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgid "_Mail Message"
+#~ msgstr "_Mensagem de Email"
+
+#~ msgid "Mail _Folder"
+#~ msgstr "_Pasta de Mensagens"
+
+#~ msgid "Attach original message"
+#~ msgstr "Anexar a mensagem original"
+
+#~ msgid "Do not quote original message"
+#~ msgstr "Não citar a mensagem original"
+
+#~ msgid "Quote original message"
+#~ msgstr "Citar a mensagem original"
+
+#~ msgid "Enter a name for this signature."
+#~ msgstr "Introduza um nome para esta assinatura."
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "folder &quot;{0}&quot;?"
+#~ msgstr ""
+#~ "Deseja mesmo remover definitivamente todas as mensagens apagadas na pasta "
+#~ "&quot;{0}&quot;?"
+
+#~ msgid "Delete &quot;{0}&quot;?"
+#~ msgstr "Apagar &quot;{0}&quot;?"
+
+#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+#~ msgstr "Apagar as mensagens na Pasta de Procura &quot;{0}&quot;?"
+
+#~ msgid "Do you want the operation to be performed also in the subfolders?"
+#~ msgstr "Deseja que a operação também seja realizada nas subpastas?"
+
+#~ msgid "Mark all messages in this folder and subfolders as read?"
+#~ msgstr "Marcar todas as mensagens nesta pasta e suas subpastas como lidas?"
+
+#~ msgid "Only on _Current Folder"
+#~ msgstr "Apenas na Pasta _Actual"
+
+#~ msgid "Enable attachment reminder plugin"
+#~ msgstr "Activar o plugin de lembrete de anexo"
+
+#~ msgid "Enable attachment reminder plugin."
+#~ msgstr "Activar o plugin de lembrete de anexo."
+
+#~ msgid "Remind _missing attachments"
+#~ msgstr "Lembrar de anexos em _falta"
+
+#~ msgid "_Refresh:"
+#~ msgstr "Actual_izar:"
+
+#~ msgid "There is no configuration option for this plugin."
+#~ msgstr "Não existe opção de configuração para este plugin."
+
+#~ msgid "Gives an option to print from the composer."
+#~ msgstr "Permite imprimir a mensagem a partir do compositor."
+
+#~ msgid "Print Message"
+#~ msgstr "Imprimir a Mensagem"
+
+#~ msgid "Prints the message"
+#~ msgstr "Imprime a mensagem"
+
+#~ msgid "A plugin that handles the Startup wizard."
+#~ msgstr "Um plugin que gere o Assistente Inicial."
+
+#~ msgid "Startup wizard"
+#~ msgstr "Assistente Inicial"
+
+#~ msgid "A string description of the current printer settings."
+#~ msgstr "Uma descrição textual da configuração actual de impressora."
+
+#~ msgid "No folder name specified."
+#~ msgstr "Nenhum nome de pasta especificado."
+
+#~ msgid "Folder name cannot contain the Return character."
+#~ msgstr "Nome de pasta não pode conter o caracter Enter."
+
+#~ msgid "Folder name cannot contain the character \"/\"."
+#~ msgstr "Nome de pasta não pode conter o caracter \"/\"."
+
+#~ msgid "Folder name cannot contain the character \"#\"."
+#~ msgstr "Nome de pasta não pode conter o caracter \"#\"."
+
+#~ msgid "'.' and '..' are reserved folder names."
+#~ msgstr "'.' e '..' são nomes de pastas reservados."
+
+#~ msgid "_Test"
+#~ msgstr "_Teste"
+
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "Copiar a selecção para a área de transferência"
+
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "Cortar a selecção para a área de transferência"
+
+#~ msgid "Paste from clipboard"
+#~ msgstr "Colar da área de transferência"
+
+#~ msgid "I_nsert"
+#~ msgstr "I_nserir"
+
+#~ msgid "All Day Event"
+#~ msgstr "Evento de Dia Completo"
+
+#~ msgid "Send _Options"
+#~ msgstr "_Opções de Envio"
+
+#~ msgid "Show messages in the normal style"
+#~ msgstr "Apresentar as mensagens em estilo normal"
+
+#~ msgid "Delete all but signature"
+#~ msgstr "Apagar tudo excepto a assinatura"
+
+#~ msgid "For_mat"
+#~ msgstr "For_mato"
+
+#~ msgid "HT_ML"
+#~ msgstr "HT_ML"
+
+#~ msgid "Open a file"
+#~ msgstr "Abrir um ficheiro"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "Encriptação PGP"
+
+#~ msgid "PGP Sign"
+#~ msgstr "Assinatura PGP"
+
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "Encripação S/MIME"
+
+#~ msgid "S/MIME Sign"
+#~ msgstr "Assinatura S/MIME"
+
+#~ msgid "Save As"
+#~ msgstr "Gravar Como"
+
+#~ msgid "Save in folder..."
+#~ msgstr "Gravar na pasta..."
+
+#~ msgid "Save the message in a specified folder"
+#~ msgstr "Gravar a mensagem numa pasta especificada"
+
+#~ msgid "Send"
+#~ msgstr "Enviar"
+
+#~ msgid "Send the mail in HTML format"
+#~ msgstr "Enviar a mensagem em formato HTML"
+
+#~ msgid "_Delete all"
+#~ msgstr "_Apagar tudo"
+
+#~ msgid "_Open..."
+#~ msgstr "_Abrir..."
+
+#~ msgid "C_lose"
+#~ msgstr "_Fechar"
+
+#~ msgid "H_TML"
+#~ msgstr "H_TML"
+
+#~ msgid "Save and _Close"
+#~ msgstr "Gravar e Fec_har"
+
+#~ msgid "Save the current file and close the window"
+#~ msgstr "Gravar o ficheiro actual e fechar a janela"
+
+#~ msgid "Refresh List"
+#~ msgstr "Actualizar a Lista"
+
+#~ msgid "Refresh List of Folders"
+#~ msgstr "Actualizar a Lista de Pastas"
+
+#~ msgid "Remove folder from your list of subscribed folders"
+#~ msgstr "Remover a pasta da sua lista de pastas subscritas"
+
+#~ msgid "Subscribe"
+#~ msgstr "Subscrever"
+
+#~ msgid "Unsubscribe"
+#~ msgstr "Remover a subscrição"
+
+#~ msgid "_Invert Selection"
+#~ msgstr "_Inverter a Selecção"
+
+#~ msgid "Status Details"
+#~ msgstr "Detalhes de Estado"
+
+#~ msgid "Time Zone"
+#~ msgstr "Fuso Horário"
+
+#~ msgid "TimeZone Combobox"
+#~ msgstr "Caixa de Selecção do Fuso-Horário"
+
 #~ msgid ""
 #~ "The address book {0} is read only, thus you cannot add contacts there. "
 #~ "Select other address book, please."
@@ -23172,9 +24168,6 @@ msgstr "Manípulo de Popup"
 #~ msgid "Di_sable"
 #~ msgstr "De_sactivar"
 
-#~ msgid "Automatic smiley recognition"
-#~ msgstr "Reconhecimento automatico de risonhos"
-
 #~ msgid "New Mail Notify sound file"
 #~ msgstr "Ficheiro de som de Notificação de Nova Mensagem"
 
@@ -23233,9 +24226,6 @@ msgstr "Manípulo de Popup"
 #~ msgid "System error: %s"
 #~ msgstr "Erro de sistema: %s"
 
-#~ msgid "Camel error: %s"
-#~ msgstr "Erro camel: %s"
-
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "Conta incapaz de enviar email"
 
@@ -23261,9 +24251,6 @@ msgstr "Manípulo de Popup"
 #~ msgid "Download messages for offline"
 #~ msgstr "Obter mensagens para o modo desligado"
 
-#~ msgid "_Phone List"
-#~ msgstr "Lista Tele_fónica"
-
 #~ msgid "MTWTFSS"
 #~ msgstr "STQQSSD"
 
@@ -23798,13 +24785,6 @@ msgstr "Manípulo de Popup"
 #~ msgid "_Subscribe"
 #~ msgstr "_Subscrever"
 
-#~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Incapaz de criar o ficheiro de resultado: %s\n"
-#~ " %s"
-
 #~ msgid "Mark all messages as read in the selected folder"
 #~ msgstr "Marcar todas as mensagens como lidas na pasta seleccionada"
 
@@ -23826,9 +24806,6 @@ msgstr "Manípulo de Popup"
 #~ msgid "Original Location"
 #~ msgstr "Localização Original"
 
-#~ msgid "_Insert"
-#~ msgstr "_Inserir"
-
 #~ msgid "Search Type"
 #~ msgstr "Tipo de Procura"
 
@@ -23962,7 +24939,7 @@ msgstr "Manípulo de Popup"
 #~ msgstr "Cor para as tarefas atrasadas"
 
 #~ msgid "Color for tasks due today"
-#~ msgstr "Cor para as tarefas cujo prazo termina hoje"
+#~ msgstr "Cor para as tarefas cuja data limite é hoje"
 
 #~ msgid "Days"
 #~ msgstr "Dias"
author	Matthew Barnes <mbarnes@src.gnome.org>	2008-08-15 04:19:12 +0800
committer	Matthew Barnes <mbarnes@src.gnome.org>	2008-08-15 04:19:12 +0800
commit	7ade227e6409c98a4010992450e111cf7bb10520 (patch)
tree	bdd716d894ae2f3b1affaa6bb68950a89441db13 /po
parent	cca29c3424aede2bb3c9ec5a6d255ce490d3511b (diff)
download	gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.gz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.bz2 gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.lz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.xz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.zst gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.zip