[evolution/gnome-2-28] Updated Basque language



commit dac66109cf724e97c60e1292cae1a4b39aa87ee9
Author: Inaki Larranaga Murgoitio <dooteo zundan com>
Date:   Tue Aug 25 15:29:04 2009 +0200

    Updated Basque language

 po/eu.po |10509 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 4702 insertions(+), 5807 deletions(-)
---
diff --git a/po/eu.po b/po/eu.po
index 2d6e7c0..0d89f40 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,41 +1,41 @@
 # translation of eu.po to Basque
 # Copyright (C) 2001, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:631
 # Hizkuntza Politikarako Sailburuordetza <hizpol ej-gv es>, 2004.
 # Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>, 2005, 2006, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-12 13:31+0100\n"
-"PO-Revision-Date: 2009-02-12 16:54+0100\n"
+"POT-Creation-Date: 2009-08-11 16:00+0200\n"
+"PO-Revision-Date: 2009-08-25 11:49+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>\n"
 "Language-Team: Basque <itzulpena euskalgnu org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
 #: ../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 address book"
 msgstr "evolution-en helbide-liburua"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "Kontaktu berria"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "Kontaktuen zerrenda berria"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -58,32 +58,32 @@ msgstr "Kontaktua: "
 msgid "evolution minicard"
 msgstr "evolution-en txarteltxoa"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "Alarmak ditu."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "Errepikapenak ditu."
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "Bilera bat da."
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Egutegi-gertaera: laburpena %s da."
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "Egutegi-gertaera: ez du laburpenik."
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "Egutegi-gertaeren ikuspegia"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "Hartu fokua"
 
@@ -107,8 +107,8 @@ msgstr "Joan gaurko egunera"
 msgid "Go to Date"
 msgstr "Joan data jakin batera"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "taula uneko orduaren barrutia ikusteko eta hautatzeko"
 
@@ -152,7 +152,7 @@ msgid "calendar view for one or more days"
 msgstr "Egun baten edo gehiagoren egutegi-ikuspegia"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A, %Y %b %d"
 
@@ -163,18 +163,18 @@ msgstr "%A, %Y %b %d"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a, %Y %b %d"
 
@@ -182,10 +182,10 @@ msgstr "%a, %Y %b %d"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%Y %b %d"
 
@@ -195,15 +195,15 @@ msgstr "%Y %b %d"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%b %d"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Gnome egutegia"
 
@@ -215,11 +215,11 @@ msgstr "Bilaketa-barra"
 msgid "evolution calendar search bar"
 msgstr "Evolution-en egutegiko bilaketa-barra"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "Joan botoia"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "Egin klik gertaera gehiago bilatzeko."
 
@@ -250,50 +250,50 @@ msgstr "laster-leihoa"
 msgid "popup a child"
 msgstr "ireki laster-leiho umea"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "editatu"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "hasi gelaxka hau editatzen"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "txandakatu"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "txandakatu gelaxka"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
 msgid "expand"
 msgstr "zabaldu"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
 msgid "expands the row in the ETree containing this cell"
 msgstr "zabaldu errenkada gelaxka hau duen ETree-an"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
 msgid "collapse"
 msgstr "tolestu"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
 msgid "collapses the row in the ETree containing this cell"
 msgstr "tolestu errenkada gelaxka hau duen ETree-an"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "Taulako gelaxka"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "egin klik gehitzeko"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "egin klik"
 
@@ -327,14 +327,6 @@ msgstr "Aktibatu lehenetsia"
 msgid "Popup Menu"
 msgstr "Bistaratu menua"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Txandakatu eranskin-barra"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "aktibatu"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -388,9 +380,9 @@ msgstr "Ezin izan da helbide-liburua kendu."
 
 #: ../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."
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 "Unean Evolution-etik GroupWise sistemako helbide-liburura soilik duzu "
 "sarbidea. Erabili GroupWise-ren beste posta-bezero bat behin, zure GroupWise-"
@@ -414,7 +406,7 @@ msgstr "Huts egin du LDAP zerbitzarian autentifikatzean"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
 msgstr "Huts egin du kontaktua ezabatzean"
 
@@ -564,104 +556,93 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "Sinkronizazio-helbide lehenetsia:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "Ezin izan da helbide-liburua kargatu"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "Ezin izan da pilot-aren Helbidearen aplikazio-blokea irakurri"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "Osatze automatikoa"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "K_ontaktuak"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "Ziurtagiriak"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Konfiguratu osatze automatikoa hemen"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure contacts and autocompletion here"
+msgstr "Konfiguratu kontaktuak eta osatze automatikoa hemen"
 
-#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Address Book"
 msgstr "Evolution-en helbide-liburua"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book address popup"
 msgstr "Evolution-en helbide-liburuko helbideen laster-leihoa"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address viewer"
 msgstr "Evolution-en helbide-liburuko helbide-ikustailea"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book card viewer"
 msgstr "Evolution-en helbide-liburuko txartel-ikustailea"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book component"
 msgstr "Evolution-en helbide-liburuaren osagaia"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Evolution-en S/MIME ziurtagiri kudeaketaren kontrola"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
 msgstr "Evolution-en karpeta-ezarpenak konfiguratzeko kontrola"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr "Kudeatu zure S/MIME ziurtagiriak hemen"
 
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "Ordenagailu honetan"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "LDAP zerbitzarian"
+
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. ensure the source name is in current locale, not read from configuration
@@ -673,144 +654,179 @@ msgstr "Ordenagailu honetan"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "Pertsonala"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "LDAP zerbitzarian"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
-msgctxt "New"
-msgid "_Contact"
-msgstr "_Kontaktua"
-
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "Sortu kontaktu berria"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
-msgctxt "New"
-msgid "Contact _List"
-msgstr "Kontaktuen _zerrenda"
-
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "Sortu kontaktu-zerrenda berria"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
-msgctxt "New"
-msgid "Address _Book"
-msgstr "Helbide-_liburua"
-
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "Sortu helbide-liburu berria"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Huts egin du Helbide-liburuaren ezarpenak edo karpetak bertsio-berritzean."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Aukera hau hautatuz gero, zure LDAP zerbitzariak SSL onartzen badu bakarrik "
+"konektatuko da Evolution LDAP zerbitzarira."
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Aukera hau hautatuz gero, zure LDAP zerbitzariak TLS onartzen badu bakarrik "
+"konektatuko da Evolution LDAP zerbitzarira."
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"Aukera hau hautatzeak esan nahi du zure zerbitzariak ez duela onartzen ez "
+"SSL eta ez TLS.  Horrek esan nahi du zure konexioa ez dela segurua izango, "
+"eta segurtasun-zuloak izan ditzakezula."
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "Oinarria"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Mota:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopiatu _liburuaren edukia lokalean lineaz kanpo lan egiteko"
 
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"LDAP zerbitzariko ataka horretatik saiatuko da konektatzen Evolution. Ataka "
+"estandarren zerrenda bat ematen da. Galdetu sistema-administratzaileari zein "
+"ataka ezarri behar duzun."
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"Hau da Evolution-ek zu identifikatzeko erabiliko duen metodoa. Kontuan izan "
+"hemen \"Helbide elektronikoa\" ezartzen bada, anonimoki sartu behar dela "
+"LDAP zerbitzarian."
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"Bilaketa-esparruak definitzen du zein mailataraino bilatu nahi duzun \n"
+"direktorio-zuhaitzean behera. \"Azpi\" bilaketa-esparruak zure bilaketa-"
+"oinarritik beherako sarrera guztiak barne hartuko ditu.\n"
+"\"Bat\" bilaketa-esparruak oinarritik maila bat beherago arteko sarrerak "
+"bakarrik hartuko ditu."
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Orokorra"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/component/addressbook-config.c:1021
 #: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Helbide-liburua"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "Zerbitzariaren datuak"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "Autentifikazioa"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Xehetasunak"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 msgid "Searching"
 msgstr "Bilaketa"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "Deskargatzen"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "Helbide-liburuaren propietateak"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "Migratzen..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "'%s' migratzen:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP zerbitzariak"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "Osatze automatikoaren ezarpenak"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -822,7 +838,7 @@ msgstr ""
 "\n"
 "Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -832,7 +848,7 @@ msgstr ""
 "\n"
 "Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -842,7 +858,7 @@ msgstr ""
 "\n"
 "Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -853,18 +869,18 @@ msgstr ""
 "Itxaron Evolution-ek Pilot sinkronizazioaren datuak migratu bitartean..."
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "Karpetaren izena aldatu"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "Karpeta-izenak ezin du '/' karaktererik eduki."
 
@@ -877,19 +893,19 @@ msgid "Save As vCard..."
 msgstr "Gorde vCard gisa..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "Izena _aldatu..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1609
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:939
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -897,11 +913,10 @@ msgid "_Delete"
 msgstr "E_zabatu"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propietateak"
 
@@ -914,20 +929,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP zerbitzarian anonimoki sartzea"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "Huts egin du autentifikatzean.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:422
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:500
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Idatzi pasahitza"
@@ -977,7 +992,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
 msgstr "Panel bertikalaren posizioa"
 
@@ -994,10 +1009,23 @@ msgid "Whether to show the preview pane."
 msgstr "Erakutsi/ezkutatu aurrebistaren panela"
 
 #: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "Osatze automatikoa"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
 msgid "Always _show address of the autocompleted contact"
 msgstr "Erakutsi _beti helbidea auto-osatutako kontaktuarekin"
 
-#: ../addressbook/gui/component/autocompletion-config.c:180
+#: ../addressbook/gui/component/autocompletion-config.c:182
+msgid "Date/Time Format"
+msgstr "Data/Orduaren formatua"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+msgid "Table column:"
+msgstr "Taulako zutabea:"
+
+#: ../addressbook/gui/component/autocompletion-config.c:187
 msgid "Look up in address books"
 msgstr "Begiratu helbide-liburuetan"
 
@@ -1006,21 +1034,19 @@ msgid "1"
 msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentifikazioa</b>"
@@ -1033,147 +1059,75 @@ msgstr "<b>Deskargatzea</b>"
 msgid "<b>Searching</b>"
 msgstr "<b>Bilaketa</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>Mota:</b>"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "Gehitu helbide-liburua"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "Beti"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "Anonimoki"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"Anonimoki\n"
+"Helb. elek. erabiliz\n"
+"Izen bereizlea (DN) erabiliz"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "_Arakatu liburu hau muga gainditu arte"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "Oinarrizkoa"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "Izen bereizia"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "Helbide elektronikoa"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "Bilatu bilaketa-oinarri posibleak"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Lo_gin:"
 msgstr "_Saio-hasiera:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "Inoiz ere ez"
-
-#. 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:287
-msgid "No encryption"
-msgstr "Enkriptaziorik gabe"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "Bat"
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"One\n"
+"Sub"
+msgstr ""
+"Bat\n"
+"Azpia"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "SSL enkriptazioa"
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL enkripatzea\n"
+"TLS enkripatzea\n"
+"Enkripatzerik gabe"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Search Filter"
 msgstr "Bilaketa-iragazkia"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "Search _base:"
 msgstr "Bilaketa-_oinarria:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search _filter:"
 msgstr "Bilaketa-_iragazkia:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "Bilaketa-iragazkia"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
 "Bilaketa-iragazkita bilatutako objektuen mota da, bilaketa lantzen den "
-"bitartean. Hau ez bada aldatzen \"pertsona\" motako objektu-klasean landuko "
+"bitartean. Hau ez bada aldatzen \"pertsona\" motan landuko "
 "da lehenespeneko bilaketa."
 
-#: ../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."
-msgstr ""
-"Aukera hau hautatuz gero, zure LDAP zerbitzariak SSL onartzen badu bakarrik "
-"konektatuko da Evolution LDAP zerbitzarira."
-
-#: ../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."
-msgstr ""
-"Aukera hau hautatuz gero, zure LDAP zerbitzariak TLS onartzen badu bakarrik "
-"konektatuko da Evolution LDAP zerbitzarira."
-
-#: ../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 "
-"vulnerable to security exploits."
-msgstr ""
-"Aukera hau hautatzeak esan nahi du zure zerbitzariak ez duela onartzen ez "
-"SSL eta ez TLS.  Horrek esan nahi du zure konexioa ez dela segurua izango, "
-"eta segurtasun-zuloak izan ditzakezula."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "Azpi"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
 msgstr "Onartutako Bilaketa Oinarriak"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "TLS enkriptazioa"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 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 "
@@ -1183,26 +1137,13 @@ msgstr ""
 "bilaketa-oinarria. Hutsik uzten baduzu, bilaketa direktorio-zuhaitzaren "
 "erroan hasiko da."
 
-#: ../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 "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"Bilaketa-esparruak definitzen du zein mailataraino bilatu nahi duzun \n"
-"direktorio-zuhaitzean behera. \"Azpi\" bilaketa-esparruak zure bilaketa-"
-"oinarritik beherako sarrera guztiak barne hartuko ditu.\n"
-"\"Bat\" bilaketa-esparruak oinarritik maila bat beherago arteko sarrerak "
-"bakarrik hartuko ditu."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP zerbitzariaren izen osoa da hau. Adibidez, \"ldap.nireenpresa.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1211,17 +1152,7 @@ msgstr ""
 "baduzu, \n"
 "helbide-liburua mantso ibiliko da."
 
-#: ../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 "
-"server."
-msgstr ""
-"Hau da Evolution-ek zu identifikatzeko erabiliko duen metodoa. Kontuan izan "
-"hemen \"Helbide elektronikoa\" ezartzen bada, anonimoki sartu behar dela "
-"LDAP zerbitzarian."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1229,87 +1160,61 @@ msgstr ""
 "Hau da zerbitzariak zure Evolution karpeta-zerrendan izango duen izena. "
 "Bistaratzeko bakarrik erabiliko da. "
 
-#: ../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 "
-"port you should specify."
-msgstr ""
-"LDAP zerbitzariko ataka horretatik saiatuko da konektatzen Evolution. Ataka "
-"estandarren zerrenda bat ematen da. Galdetu sistema-administratzaileari zein "
-"ataka ezarri behar duzun."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "Erabili izen bereizia (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "Erabili helbide elektronikoa"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "Ahal den guztietan"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "Gehitu _helbide-liburua"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
 msgstr "Des_karga-muga:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "_Bilatu bilaketa-oinarri posibleak"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
 msgstr "_Saioa hasteko metodoa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "_Ataka:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
 msgstr "Bilaketa-_esparrua: "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "_Zerbitzaria:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "_Denbora-muga:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "E_rabili konexio segurua:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "txartel"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:286
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:720
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "minutu"
 
@@ -1334,44 +1239,42 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Hainbat</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>Oharrak</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Bestelakoa</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefonoa</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Web helbideak</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Lanekoa</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegoriak..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontaktua"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
@@ -1380,1280 +1283,259 @@ msgid "Full _Name..."
 msgstr "_Izen-abizenak..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2478
 msgid "Image"
 msgstr "Irudia"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN mezularia"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Posta-helbidea"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Nic_kname:"
 msgstr "_Goitizena:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "Oharrak"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "Datu pertsonalak"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "Telefonoa"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
-msgid "Work"
-msgstr "Lanekoa"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "Helbi_dea:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "_Urteurrena:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "_Laguntzailea"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "U_rtebetetzea:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1909
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "_Egutegia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "_Herria:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "_Enpresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "Es_tatua:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "_Saila:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "_Artxibatu honela:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "_Libre/okupatuta informazioa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "_Gune nagusia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "_Kudeatzailea:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_Notes:"
-msgstr "_Oharrak:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Bulegoa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "_Posta-kutxa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "_Lanbidea:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "_Ezkontidea:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "E_statua/Probintzia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "_Titulua:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "_Bideo-berriketa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "Mezuak HT_ML formatuan jaso nahi ditu"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "_Web egunkaria:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Non:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "Pos_ta-kodea:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "Helbidea"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "Izena"
 
-#: ../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:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
-#: ../widgets/text/e-text.c:3689
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Editagarria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "Estatu Batuak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "Afganistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "Albania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "Aljeria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "Samoa amerikarra"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "Andorra"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "Angola"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "Anguilla"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "Antartika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "Antigua eta Barbuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "Argentina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "Armenia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "Aruba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "Australia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "Austria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "Azerbaijan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "Bahamak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "Bahrain"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "Bangladesh"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "Barbados"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "Bielorrusia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "Belgika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "Belize"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "Benin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "Bermuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "Bhutan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "Bolivia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "Bosnia Herzegovina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "Botswana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "Bouvet uhartea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "Brasil"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "Indiako Ozeanoko Britainiar Lurraldea"
-
-#: ../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:164
-msgid "Bulgaria"
-msgstr "Bulgaria"
-
-#: ../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:166
-msgid "Burundi"
-msgstr "Burundi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "Kanbodia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "Kamerun"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "Kanada"
-
-#: ../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:171
-msgid "Cayman Islands"
-msgstr "Kaiman uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "Afrika Erdiko Errepublika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "Txad"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "Txile"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "Txina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "Christmas uhartea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "Cocos Keeling uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "Kolonbia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "Komoroak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "Kongo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Kongoko Errepublika Demokratikoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "Cook uharteak"
-
-#: ../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:184
-msgid "Cote d'Ivoire"
-msgstr "Boli Kosta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "Kroazia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "Kuba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "Zipre"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "Txekiar Errepublika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "Danimarka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "Djibuti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "Dominika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "Dominikar Errepublika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "Ekuador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "Egipto"
-
-#: ../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:196
-msgid "Equatorial Guinea"
-msgstr "Ekuatore Ginea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "Eritrea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "Estonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "Etiopia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "Malvina uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "Faroe uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "Fiji"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "Finlandia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "Frantzia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "Guyana frantsesa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "Polinesia frantsesa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "Hegoaldeko lurralde frantsesak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "Gabon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "Gambia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "Georgia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "Alemania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "Ghana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "Grezia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "Groenlandia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "Grenada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "Guadalupe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "Guam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "Guatemala"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "Guernsey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "Ginea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "Ginea Bissau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "Guyana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "Haiti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "Heard eta McDonald uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "Vatikano Hiriko Estatua"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "Honduras"
-
-#: ../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:229
-msgid "Hungary"
-msgstr "Hungaria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "Islandia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "India"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "Indonesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "Iran"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "Irak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "Irlanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "Man uhartea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "Israel"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "Italia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "Jamaika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "Japonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "Jersey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "Jordania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "Kazakhstan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "Kenya"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "Kiribati"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "Koreako Herri Errepublika Demokratikoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "Koreako Errepublika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "Kuwait"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "Kirgizistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "Laos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "Letonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "Libano"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "Lesotho"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "Liberia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "Libia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "Liechtenstein"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "Lituania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "Luxenburgo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "Macau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "Mazedonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "Madagaskar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "Malawi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "Malaysia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "Maldivak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "Mali"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "Malta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "Marshall uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "Martinika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "Mauritania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "Maurizio"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "Mayotte"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "Mexiko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "Mikronesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "Moldaviako Errepublika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "Monako"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "Mongolia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "Montserrat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "Maroko"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "Mozanbike"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "Birmania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "Namibia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "Nauru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "Nepal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "Herbehereak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "Antilla herbeheretarrak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "Kaledonia Berria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "Zeelanda Berria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "Nikaragua"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "Niger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "Nigeria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "Niue"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "Norfolk uhartea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "Iparraldeko Mariana uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "Norvegia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "Oman"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "Pakistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "Palau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "Palestinako lurraldea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "Panama"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "Papua Ginea Berria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "Paraguai"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "Peru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "Filipinak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "Pitcairn"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "Polonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "Portugal"
-
-#: ../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:308
-msgid "Qatar"
-msgstr "Qatar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "Reunion"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "Errumania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "Errusiar Federakundea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "Ruanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "Saint Kitts eta Nevis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "Santa Luzia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "Saint Vincent eta Grenadinak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "Samoa"
-
-#: ../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:318
-msgid "Sao Tome And Principe"
-msgstr "Sao Tome eta Principe"
-
-#: ../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:320
-msgid "Senegal"
-msgstr "Senegal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "Serbia eta Montenegro"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "Seychelleak"
-
-#: ../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:324
-msgid "Singapore"
-msgstr "Singapur"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "Eslovakia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "Eslovenia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "Salomon uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "Somalia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "Hegoafrika"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "Hegoaldeko Georgia eta Hegoaldeko Sandwich uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "Espainia"
-
-#: ../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:333
-msgid "St. Helena"
-msgstr "Santa Helena"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "Saint-Pierre eta Mikelune"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "Sudan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "Surinam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Svalbard eta Jan Mayen uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "Swazilandia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "Suedia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "Suitza"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "Siria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "Taiwan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "Tadjikistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "Tanzaniako Errepublika Batua"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "Thailandia"
-
-#: ../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:347
-msgid "Togo"
-msgstr "Togo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "Tokelau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "Tonga"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "Trinidad eta Tobago"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "Tunisia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "Turkia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "Turkmenistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "Turk eta Caico uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "Tuvalu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "Uganda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "Ukraina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "Arabiar Emirerri Batuak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "Erresuma Batua"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "Estatu Batuetako kanpoaldeko uharte txikiak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "Uruguai"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "Uzbekistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "Vanuatu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "Venezuela"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "Vietnam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "Birjina uharteak (britainiarrak)"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "Birjina uharteak (amerikarrak)"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "Wallis eta Futuna uharteak"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "Mendebaldeko Sahara"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "Yemen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "Zambia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "Zimbawe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:467
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "Izena"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL berehalako mezularia"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../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:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo mezularia"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu mezularia"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "Zerbitzua"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "Kokalekua"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "Erabiltzaile-izena"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "Lanekoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Etxekoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2259
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "Iturburu-liburua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "Helburu-liburua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "Kontaktu berria da"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "Eremu editagarriak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "Beharrezko eremuak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "Aldatuta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktu-editorea - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "Hautatu irudi bat kontaktu honentzat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "Irudirik _ez"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2661,43 +1543,43 @@ msgstr ""
 "Kontaktu-data ez da baliozkoa:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' baliogabeko formatua du"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' baliogabeko formatua du"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' hutsik dago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
-msgstr "kontaktua ez da balizkoa."
+msgstr "Kontaktua ez da baliozkoa."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "Gehitu kontaktua azkar"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "_Editatu osoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "_Izen-abizenak"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "_Helb. el"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "_Hautatu helbide-liburua"
 
@@ -2735,111 +1617,61 @@ msgstr ""
 "Ziur zaude kontaktu hauek\n"
 "ezabatu nahi dituzula?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "_2. helbidea:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "_Herria:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "Es_tatua:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "Helbide osoa"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "Pos_ta-kodea:"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"Jn.\n"
+"Andrea\n"
+"And.\n"
+"Andereño\n"
+"Dk."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Esq."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
+"\n"
+"Aita\n"
+"Semea\n"
+"I\n"
+"II\n"
+"III\n"
+"jauna"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Izen-abizenak"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "jn."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "and."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Semea"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Andereño"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Jauna"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Andrea"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Andereño"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Jauna"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "_Izena:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "_Deitura:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "_Bigarrena:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "_Atzizkia:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "Gehitu berehalako mezularitzako kontua"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "_Kontu-izena:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "_Berehalako mezularitzako zerbitzua:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "_Kokalekua:"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>Kideak</b>"
@@ -2850,9 +1682,9 @@ msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "Hautatu..."
 
@@ -2878,11 +1710,11 @@ msgid "_Members"
 msgstr "_Kideak"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
 #: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Liburua"
 
@@ -2928,27 +1760,27 @@ msgstr ""
 "karpeta honetan. Hala ere gehitu nahi duzu?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "_Batu"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "Batu kontaktua"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "Helb. el."
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Edozein eremuk hau dauka:"
@@ -2962,35 +1794,35 @@ msgstr "Helb. el. honela hasten da:"
 msgid "Name contains"
 msgstr "_Izenak hau dauka:"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Kontakturik ez"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "Kontaktu 1"
 msgstr[1] "%d kontaktu"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
 #: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Kontsulta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "Errorea liburu-ikuspegia lortzean"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3354
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
-#: ../widgets/text/e-text.c:3553
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Modeloa"
 
@@ -3007,105 +1839,103 @@ msgid "Source"
 msgstr "Iturburua"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:565
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "Mota"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
 msgid "Save as vCard..."
 msgstr "Gorde vCard gisa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1587
-#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Ireki"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "_New Contact..."
 msgstr "Kontaktu _berria..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "New Contact _List..."
 msgstr "Kontaktuen _zerrenda berria..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Save as vCard..."
 msgstr "_Gorde vCard gisa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contact"
 msgstr "_Birbidali kontaktua"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contacts"
 msgstr "_Birbidali kontaktuak"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to Contact"
 msgstr "Bidali _mezua kontaktuari"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to List"
 msgstr "Bidali _mezua zerrendari"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contacts"
 msgstr "Bidali _mezua kontaktuei"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Cop_y to Address Book..."
 msgstr "Kop_iatu helbide-liburuan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Mo_ve to Address Book..."
 msgstr "E_raman helbide-liburura..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Cu_t"
 msgstr "E_baki"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:930
-#: ../composer/e-msg-composer.c:2056 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "Ko_piatu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "P_aste"
 msgstr "_Itsatsi"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "Sailkatu gabeak"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "Laguntzailea"
 
@@ -3134,8 +1964,8 @@ msgid "Car Phone"
 msgstr "Autoko telefonoa"
 
 #: ../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:138
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../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
@@ -3143,7 +1973,7 @@ msgid "Categories"
 msgstr "Kategoriak"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "Enpresa"
 
@@ -3192,22 +2022,22 @@ msgid "Journal"
 msgstr "Egunkaria"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "Zuzendaria"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "Telefono mugikorra"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "Goitizena"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "Oharra"
 
@@ -3236,14 +2066,14 @@ msgid "Radio"
 msgstr "Irrati-telefonoa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:577
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Funtzioa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "Ezkontidea"
 
@@ -3273,55 +2103,53 @@ msgstr "Unitatea"
 msgid "Web Site"
 msgstr "Web gunea"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:992
-#: ../widgets/table/e-table-group-container.c:993
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-leaf.c:642
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Zabalera"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:985
-#: ../widgets/table/e-table-group-container.c:986
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Altuera"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Fokua du"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Eremua"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Eremu-izena"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Testu-eredua"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Eremu-izenaren geh. luzera"
 
@@ -3329,7 +2157,7 @@ msgstr "Eremu-izenaren geh. luzera"
 msgid "Column Width"
 msgstr "Zutabe-zabalera"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3339,7 +2167,7 @@ msgstr ""
 "\n"
 "Kontaktuak bilatzen..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3353,7 +2181,7 @@ msgstr ""
 "\n"
 "edo egin klik bikoitza hemen kontaktu berria sortzeko."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3367,7 +2195,7 @@ msgstr ""
 "\n"
 "Egin klik bikoitza hemen kontaktu berria sortzeko."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3377,7 +2205,7 @@ msgstr ""
 "\n"
 "Bilatu kontaktua."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3387,41 +2215,41 @@ msgstr ""
 "\n"
 "Ez dago ikuspegi honetan erakusteko elementurik."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Moldagailua"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Laneko helb. el."
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Etxeko helb. el."
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "Beste helb. el."
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Hautatuta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Kurtsorea du"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "Ire_ki esteka arakatzailean"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "_Kopiatu estekaren helbidea"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "_Bidali mezu berria honi..."
 
@@ -3430,96 +2258,101 @@ msgstr "_Bidali mezu berria honi..."
 msgid "Copy _Email Address"
 msgstr "Kopiatu _helbide elektronikoa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "Zerrendako kideak"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "Saila"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "Lanbidea"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "Kokalekua"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "Bideo-berriketa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2512
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2548
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Egutegia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Libre/okupatuta"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "Faxa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "Helbidea"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "Etxeko orria"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "Web egunkaria"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2538
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2580
 msgid "Birthday"
 msgstr "Urtebetetzea"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2539
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2581
 msgid "Anniversary"
 msgstr "Urteurrena"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "Lanpostua"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "Etxeko orria"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Blog-a"
 
@@ -3574,12 +2407,11 @@ msgstr "Protokoloa ez da onartzen"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "Bertan behera utzita"
 
@@ -3590,13 +2422,13 @@ msgstr "Ezin izan da bertan behera utzi"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "Autentifikazioak huts egin du"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "Autentifikazioa behar da"
 
@@ -3713,7 +2545,7 @@ msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "Errorea kontaktua gehitzean"
 
@@ -3730,7 +2562,7 @@ msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "Errorea kontaktua kentzean"
 
@@ -3758,7 +2590,7 @@ msgid "Display _All Contacts"
 msgstr "Bistaratu _kontaktu guztiak"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3767,46 +2599,46 @@ msgstr ""
 "%s badago lehendik ere.\n"
 "Gainidatzi nahi duzu?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "Gainidatzi"
 
 #. 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:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontaktua"
 msgstr[1] "kontaktuak"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "Hautatu helbide-liburua"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "zerrenda"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "Eraman kontaktua hona"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "Kopiatu kontaktua hemen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "Eraman kontaktuak hona"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "Kopiatu kontaktuak hemen"
 
@@ -3830,326 +2662,127 @@ msgstr "Kontaktuaren informazioa"
 msgid "Contact information for %s"
 msgstr "%s kontaktuaren informazioa"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
 msgstr "Helbide-liburuan kontsulta egiten..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "eta beste kontaktu bat."
-msgstr[1] "eta beste %d kontaktu."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "Erakutsi vCard osoa"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "Erakutsi vCard trinkoa"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "Gorde helbide-liburuan"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Txartelen ikuspegia"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Inportatzen..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook-eko CSV edo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook-eko CSV edo Tab inportatzailea"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla-ko CSV edo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla-ko CSV edo Tab inportatzailea"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution-eko CSV edo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution-eko CSV edo Tab inportatzailea"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP datuak trukatzeko formatua (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "Evolution-en LDIF inportatzailea"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "Evolution-en vCard inportatzailea"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Inprimaki hutsak amaieran:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Testua"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Behean:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Neurriak:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "_Letra-tipoa..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Letra-tipoak"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Orri-oina:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Formatua"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "Goiburua"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Goiburua/Orri-oina"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Izenburuak"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Letra bakoitzaren izenburuak"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Altuera:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Jarraian, bata bestearen atzetik"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Sartu:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Horizontala"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Ezkerrean:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Letra-fitxak alboan"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Marjinak"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Zutabe-kopurua:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Aukerak"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientazioa"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Orrialdea"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Prestatu orrialdea:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Papera"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Paper-iturria:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Bertikala"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Aurrebista:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Inprimatu itzaldura grisarekin"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Orrialde bikoitietan kontrako marjinan jarri"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Eskuinean:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Sekzioak:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Itzaldura"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "Tamaina:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Hasi orrialde berrian"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Estiloaren izena:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Goian:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "Mota:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Zabalera:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "_Letra-tipoa..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Ezin da fitxategia ireki"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "Ezin izan da helbide-liburuen zerrenda lortu"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "ezin da helbide-liburua ireki"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "Zehaztu irteerako fitxategia irteera estandarraren ordez"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "IRTEERA-FITXATEGIA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "Zerrendatu helbide-liburuen karpeta lokalak"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "Erakutsi txartelak vcard edo csv fitxategi gisa"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "Esportatu modu asinkronoan"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "Irteera-fitxategiko txartel-kopurua modu asinkronoan, tamaina lehenetsia 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "KOPURUA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "Komando-lerroko argumentuen errorea, idatzi --help erabilera ikusteko."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "Csv edo vcard formatuak bakarrik onartzen ditu."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "Modu asinkronoan, irteerak fitxategia izan behar du."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "Modu normalean, ez dago tamaina-aukeraren beharrik."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "Kudeatu gabeko errorea"
 
@@ -4565,7 +3198,7 @@ msgstr "Zereginak ez dira erabilgarri egongo Evolution berriro abiatu arte."
 msgid "_Discard Changes"
 msgstr "_Ez gorde"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "_Gorde"
 
@@ -4587,56 +3220,56 @@ msgstr "_Bidali jakinarazpena"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "Zatitu egun anitzeko gertaerak:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "Ezin izan da evolution-data-server abiarazi"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ezin izan da pilot-aren Egutegia aplikazio-blokea irakurri"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "Ezin izan da pilot-aren Zirkularra aplikazio-blokea irakurri"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "Ezin izan da pilot-aren Zirkularra aplikazio-blokean idatzi"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "Lehentasun lehenetsia:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ezin izan da pilot-aren Egitekoen aplikazio-blokea irakurri"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "Ezin izan da pilot-aren Egitekoen aplikazio-blokean idatzi"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "Egutegia eta zereginak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "Egutegiak"
 
@@ -4677,24 +3310,24 @@ msgid "Memo_s"
 msgstr "_Zirkularrak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "Zirkularrak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Zereginak"
@@ -4705,7 +3338,7 @@ msgstr "_Egutegiak"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Zereginak"
 
@@ -4713,27 +3346,27 @@ msgstr "_Zereginak"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution-en egutegiaren alarma bidezko jakinarazpen-zerbitzua"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutu"
 msgstr[1] "minutu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:287
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:721
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ordu"
 msgstr[1] "ordu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "Hasierako ordua"
 
@@ -4748,10 +3381,10 @@ msgstr "Itxi _denak"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "Kokalekua:"
 
@@ -4764,11 +3397,11 @@ msgid "_Dismiss"
 msgstr "_Itxi"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
+#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../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
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
@@ -4784,32 +3417,32 @@ msgstr "_Utzi geroko"
 msgid "location of appointment"
 msgstr "hitzorduaren helbidea"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
 msgid "No summary available."
 msgstr "Ez dago laburpen erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 msgid "No location information available."
 msgstr "Ez dago kokaleku-informazio erabilgarririk."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d alarma dituzu"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4821,7 +3454,7 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta dago.\n"
 "Oroigarri normala bistaratuko da."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4838,7 +3471,7 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
@@ -4913,123 +3546,137 @@ msgid "Calendars to run alarms for"
 msgstr "Alarmak exekutatzeko egutegiak - "
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr "Aktibatu hau sistemako ordu-zona Evolution-en erabiltzeko."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "Kolorea Marcus Bains-en linea ordu-barran marrazteko (hutsik lehenespenez)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Kolorea Marcus Bains-en linea eguneko ikuspegian marrazteko."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "Konprimitu asteburuak hileko ikuspegian"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "Berretsi borratzea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr ""
+"Gertaera berri baten errepikapen lehenetsien kopurua. "
+"-1 betirako adierazten du."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Hasierako eta amaierako lanorduak zehaztu behar diren egunak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Hitzordu lehenetsiaren oroigarria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+msgid "Default recurrence count"
+msgstr "Errepikapen kopuru lehenetsia"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "Oroigarri lehenetsiaren unitateak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "Oroigarri lehenetsiaren balioa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "Direktorioa alarmen audioko fitxategiak gordetzeko"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "Gertaeraren gradientea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "Gertaeraren gardentasuna"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "'Libre/okupatuta' zerbitzarien URLak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "'Libre/okupatuta' txantiloien URLak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "Gertaeren gradientea egutegiko ikuspegian."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "Ezkutatu burututako zereginak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "Ezkutatu zereginaren unitateak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "Ezkutatu zereginaren balioa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "Panel horizontalaren posizioa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Laneguna amaitzen den ordua (24 orduko formatuan: 0 - 23)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Laneguna hasten den ordua (24 orduko formatuan: 0 - 23)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Ordu banaketak Eguneko eta Lan-asteko ikuspegietan erakutsitako tarteak, "
 "minututan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr "Azken alarma-ordua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Level beyond which the message should be logged."
 msgstr "Maila, hortik gora mezua erregistratzeko."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Zerrendatu azken aldian erabilitako bigarren mailako ordu-zonak 'Eguneko "
 "ikuspegia'n."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of server URLs for free/busy publishing."
 msgstr "URL zerbitzarien zerrenda 'libre/okupatuta' argitaratzeko."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-en linea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains-en linearen kolorea - Egutegi ikuspegia"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains-en linearen kolorea - Ordu-barra"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -5037,39 +3684,39 @@ msgstr ""
 "Azken aldian erabilitako ordu-zonen gehienezko kopurua 'day_second_zones' "
 "zerrendan gogoratzeko."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Azken aldian erabilitako ordu-zonen gehienezko kopurua gogoratzeko."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Laneguna amaitzen den minutua (0 - 59)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Laneguna hasten den minutua (0 - 59)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
 msgstr "Panel horizontalaren posizioa hileko ikuspegian"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
 msgstr "Panel bertikalaren posizioa hileko ikuspegian"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Number of units for determining a default reminder."
 msgstr "Oroigarri lehenetsia zehazteko unitate-kopurua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining when to hide tasks."
 msgstr "Zereginak noiz ezkutatu zehazteko unitate-kopurua."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Overdue tasks color"
 msgstr "Atzeratutako zereginen kolorea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5077,7 +3724,7 @@ msgstr ""
 "Panel horizontalaren posizioa pixeletan, data-nabigatzailearen egutegiaren "
 "eta zereginen zerrendaren artean (hileko ikuspegian ez dagoenean)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5085,7 +3732,7 @@ msgstr ""
 "Panel horizontalaren posizioa pixeletan, ikuspegia eta data-nabigatzailearen "
 "eta zereginen zerrendaren artean (hileko ikuspegian dagoenean)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5093,7 +3740,7 @@ msgstr ""
 "Panel bertikalaren posizioa, egutegiaren zerrendaren eta data-nabigatzaileko "
 "egutegiaren artekoa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5101,7 +3748,7 @@ msgstr ""
 "Panel bertikalaren posizioa pixeletan, zereginen zerrendaren eta zereginen "
 "aurrebistaren panelaren artean, pixeletan."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5109,7 +3756,7 @@ msgstr ""
 "Panel bertikalaren posizioa pixeletan, ikuspegia eta data-nabigatzailearen "
 "egutegiaren eta zereginen zerrendaren artean (hileko ikuspegian dagoenean)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5117,69 +3764,85 @@ msgstr ""
 "Panel bertikalaren posizioa pixeletan, ikuspegia eta  data-nabigatzailearen "
 "egutegiaren eta zereginen zerrendaren artean (hileko ikuspegian ez dagoenean)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+msgid "Primary calendar"
+msgstr "Egutegi nagusia"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Primary memo list"
+msgstr "Zirkularren zerrenda nagusia"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Primary task list"
+msgstr "Zereginen zerrenda nagusia"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Alarmek exekutatuko dituzten programak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Recently used second time zones in a Day View"
 msgstr "Azken aldian erabilitako ordu-zonak 'Eguneko ikuspegia'n"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr "Gorde alarmen audioen direktorioa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Scroll Month View by a week"
+msgstr "Korritu 'Hileko ikuspegia' aste bat"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Erakutsi RSPV eremuak gertaeren/bileren/zereginen editorean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Erakutsi Araua eremua gertaeren/bileren/zereginen editorean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show appointment end times in week and month views"
 msgstr "Erakutsi hitzorduen amaiera-orduak asteko eta hileko ikuspegietan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Erakutsi Kategoriak eremua gertaeren/bileren/zereginen editorean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
 msgstr "Erakutsi alarmaren pantaila jakinarazpenen ontzian"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Erakutsi Egoera eremua gertaeren/bileren/zereginen editorea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show the \"Preview\" pane"
 msgstr "Erakutsi \"Aurrebista\" panela"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the \"Preview\" pane."
 msgstr "Erakutsi \"Aurrebista\" panela."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Erakutsi Ordu-zona eremua gertaeren/bileren editorean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Erakutsi Mota eremua gertaeren/bileren/zereginen editorean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show week number in Day and Work Week View"
 msgstr "Erakutsi aste-zenbakiak Eguneko eta Lan-asteko ikuspegietan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show week numbers in date navigator"
 msgstr "Erakutsi aste-zenbakiak data-nabigatzailean"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -5187,15 +3850,15 @@ msgstr ""
 "Ezartzen bada, bigarren mailako ordu-zona erakusten du eguneko ikuspegian. "
 "Balioa 'timezone' gakoan erabilitakoaren antzekoa da."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
 msgstr "Gaurko zereginen kolorea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Tasks vertical pane position"
 msgstr "Zereginen panel bertikalaren posizioa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5205,7 +3868,7 @@ msgstr ""
 "helbide elektronikoaren erabiltzailearen zatiarekin ordeztuko da. %d : "
 "domeinuarekin ordeztuko da."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5213,11 +3876,11 @@ msgstr ""
 "Ordu-zona lehenetsia egutegiko data eta orduetan erabiltzeko, Olsen ordu-"
 "zonako datu-baseko itzuli gabeko kokaleku gisa (adib. \"America/New York\")."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
 msgstr "Eguneko ikuspegiaren bigarren mailako ordu-zona"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -5225,20 +3888,19 @@ msgstr ""
 "Honako hiru balio erabilgarri daude: \"0\" - erroreak. \"1\" - abisuak. \"2"
 "\" - mezuen arazketa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Time divisions"
 msgstr "Orduen zatiketa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Time the last alarm ran, in time_t."
 msgstr "Azken alarma exekutatu zen ordua, 'time_t'-en "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "Ordu-zona"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5246,41 +3908,61 @@ msgstr ""
 "Gertaeren gardentasuna egutegiko ikuspegian, 0 (gardena) eta 1 (opakoa) "
 "arteko balioa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr "24 orduko formatua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr "Nabarmendutako egutegiaren (\"nagusia\") URIa"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr "Nabarmendutako zirkularren zerrendaren (\"nagusia\") URIa"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr "Nabarmendutako zereginen zerrendaren (\"nagusia\") URIa"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Oroigarri lehenetsiaren unitateak (\"minutu\", \"ordu\" edo \"egun\")."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unitateak zereginak noiz ezkutatu zehazteko (\"minutu\", \"ordu\" edo \"egun"
 "\")."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+msgid "Use system timezone"
+msgstr "Erabili sistemako ordu-zona"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "Erabili sistemako ordu-zona Evolution-en hautatutako ordu-zonaren ordez."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "Astearen hasiera"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Astearen hasierako laneguna, igandetik (0) larunbatera (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Alarmak bistaratzeko jakinarazpenen ontzia erabiliko den edo ez"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Hitzordua edo zeregina ezabatzean berrespena eskatuko den edo ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Hitzorduak eta zereginak betiko ezabatzean berrespena eskatuko den edo ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5288,143 +3970,143 @@ msgstr ""
 "Astebukaerak hileko ikuspegian konprimituko den edo ez (larunbata eta "
 "igandea asteko lanegun baten lekua hartuko dute)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Gertaeren amaiera-orduak asteko eta hileko ikuspegietan erakutsiko diren edo "
 "ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Marcus Bains-en linea (uneko orduan) egutegian marraztuko den edo ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Egindako zereginak zereginen ikuspegitik ezkutatuko diren edo ez"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "Hileko ikuspegia astearen arabera korrituko den, ez hilaren arabera."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to set a default reminder for appointments."
 msgstr "Hitzorduen oroigarri lehenetsi bat ezarriko den edo ez"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "RSPV eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Kategoriak eremua gertaeren/bileren editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Araua eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Egoera eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Am/pm erabili beharrean orduak 24 orduko formatuan bistaratuko diren edo ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Ordu-zona eremua gertaeren/bileren editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Mota eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "Eguneko eta Lan-asteko ikuspegietan aste-zenbakiak erakutsiko diren edo ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Data-nabigatzailean aste-zenbakiak erakutsiko diren edo ez."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "Gertaerak bistaratzean udako ordua erabili edo ez."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "Lanegunak"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr "Lanegunaren amaierako ordua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr "Lanegunaren amaierako minutua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
 msgstr "Lanegunaren hasierako ordua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "Lanegunaren hasierako minutua"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "udako ordua"
+#: ../calendar/gui/cal-editor-utils.c:100
+msgid "Invalid object"
+msgstr "Objektua ez da baliozkoa."
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "Laburpenak hau dauka"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "Azalpenak hau dauka"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "Kategoria da"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "Iruzkinak hau dauka"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "Kokalekuak hau dauka"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
 msgstr "Hurrengo 7 egunetako zereginak"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
 msgstr "Zeregin aktiboak"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
 msgstr "Atzeratutako zereginak"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "Burutako zereginak"
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
 msgstr "Zereginak eranskinekin"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
 msgstr "Hitzordu aktiboak"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "Hurrengo 7 egunetako hitzorduak"
 
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Inprimatu"
 
-#: ../calendar/gui/calendar-commands.c:315
+#: ../calendar/gui/calendar-commands.c:331
 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 "
@@ -5437,137 +4119,106 @@ msgstr ""
 "\n"
 "Benetan ezabatu nahi dituzu?"
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "Ezabatu hau baino zaharragoak diren gertaerak"
 
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:368
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:288
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:722
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "egun"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "Web-ean"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "Urtebetetzeak eta urteurrenak"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Eguraldia"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "Urtebetetzeak eta urteurrenak"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "Egutegi _berria"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "K_opiatu..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "_Egin erabilgarri lineaz kanpo erabiltzeko"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "_Ez egin hau lineaz kanpo eskuragarri"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "Huts egin du egutegiak bertsio-berritzean."
 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Ezin izan da '%s' egutegia ireki gertaerak eta bilerak sortzeko"
 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ez dago egutegirik erabilgarri gertaerak eta bilerak sortzeko"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "Egutegi-iturburuaren hautatzailea"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1488
-msgctxt "New"
-msgid "_Appointment"
-msgstr "_Hitzordua"
-
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: ../calendar/gui/calendar-component.c:1496
-msgctxt "New"
-msgid "M_eeting"
-msgstr "_Bilera"
-
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "Egun osoko hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1504
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "Egun _osoko hitzordua"
-
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "Sortu egun osoko hitzordu berria"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "Egutegi berria"
 
-#: ../calendar/gui/calendar-component.c:1512
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "_Egutegia"
-
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "Egutegi berria sortzen du"
 
@@ -5609,20 +4260,20 @@ msgid "Category"
 msgstr "Kategoria"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Sailkapena"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "Konfidentziala"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Azalpena"
@@ -5642,21 +4293,27 @@ msgstr "Ez"
 msgid "Exist"
 msgstr "Bai"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "Kokalekua"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Antolatzailea"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Pribatua"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Publikoa"
 
@@ -5666,11 +4323,11 @@ msgid "Recurrence"
 msgstr "Errepikapena"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../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:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
 msgstr "Laburpena"
 
@@ -5690,35 +4347,55 @@ msgid "does not contain"
 msgstr "hau ez daukana"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "da"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ez da"
 
-#: ../calendar/gui/comp-editor-factory.c:409
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Errorea egutegia irekitzean"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "Metodo hori ez da onartzen egutegia irekitzean"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "Egutegia irekitzeko baimena ukatu egin da"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "Editatu alarma"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Bistaratu pantailan abisu bat"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Jo soinua"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Exekutatu programa"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Bidali mezua"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarma</b>"
@@ -5748,83 +4425,68 @@ msgid "Mes_sage:"
 msgstr "M_ezua:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "Jo soinua"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "Bistaratu pantailan abisu bat"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "Exekutatu programa"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "Hautatu fitxategia"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "Bidali honi:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "Bidali mezua"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "_Argumentuak:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "_Programa:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "_Errepikatu alarma"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "_Soinua:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "geroago"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-msgid "before"
-msgstr "lehenago"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "egun"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "hitzordu-amaiera baino"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"lehenago\n"
+"ondoren"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "bider, maiztasun honekin:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "ordu"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"minutu\n"
+"ordu\n"
+"egun"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "minutu"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"minutuak\n"
+"orduak\n"
+"egunak"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "hitzordu-hasiera baino"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"hitzordu-hasiera\n"
+"hitzordu-amaiera"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5835,47 +4497,54 @@ msgid "A_dd"
 msgstr "_Gehitu"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alarmak"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "_Proposatu eranskina automatikoki bistaratzea"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "Erantsi fitxategia(k)"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 msgid "Selected Calendars for Alarms"
 msgstr "Hautatutako egutegiak alarmentzako"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+msgid "Time and date:"
+msgstr "Ordua eta data:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+msgid "Date only:"
+msgstr "Data soilik:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "(Shown in a Day View)"
 msgstr "(Erakutsi eguneko ikuspegian)"
@@ -5902,51 +4571,60 @@ msgstr ""
 "domeinugatik ordeztuko dira.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">Alarmak</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Abisuak</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">Data/Orduaren formatua</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">'Libre/okupatuta' zerbitzari lehentsia</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Orokorra</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Zereginen zerrenda</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Ordua</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Lan-astea</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "Egokitu _udako ordutegira"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "Eg_unaren amaiera:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "Bistaratu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+msgid "Display alarms in _notification area only"
+msgstr "Erakutsi alarmaren pantaila _jakinarazpenen arean soilik"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Ostirala"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5956,13 +4634,13 @@ msgstr ""
 "Orduak\n"
 "Egunak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Astelehena"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5980,215 +4658,231 @@ msgstr ""
 "Larunbata\n"
 "Igandea"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "_ig."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr "_Korritu 'Hileko ikuspegia' aste bat"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Se_cond zone:"
 msgstr "_Bigarren zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "Hautatu egutegiak alarmen jakinarazpenerako"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "Era_kutsi oroigarria hitzordua hasi baino"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show a _reminder"
 msgstr "Erakutsi _oroigarria"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Erakutsi aste-_zenbakiak Eguneko eta Lan-asteko ikuspegietan"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Igandea"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
 msgstr "_Gaurko zereginak:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "o_g."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "Txantiloia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "_Ordu-zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "Ordu-formatua:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "Use s_ystem time zone"
+msgstr "Erabili _sistemaren ordu-zona"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Asteazkena"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "Astearen _hasiera:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "Lanegunak:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ordu (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_24 ordu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr "Eskatu _berrespena elementuak ezabatzeko"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "_Konprimitu asteburuak hileko ikuspegian"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "_Egunaren hasiera:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "_or."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr "Ezkutatu _burututako zereginak"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "_al."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
 msgstr "_Atzeratutako zereginak:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "_lr."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
 msgstr "_Erakutsi hitzorduen amaiera-orduak asteko eta hileko ikuspegietan"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "Or_duen zatiketa:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "a_r."
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "a_z."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "before every anniversary/birthday"
 msgstr "urteurrena/urtebetetzea baino lehen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr "lehenago"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "Mota:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Kopiatu _egutegiaren edukia lokalean lineaz kanpoko eragiketak lantzeko"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Kopiatu _zereginen edukia lokalean lineaz kanpo lan egiteko"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Kopiatu z_irkularren edukia lokalean lineaz kanpo lan egiteko"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "_Kolorea:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Zereginen zerrenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Zirkularren zerrenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Egutegiaren propietateak"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Egutegi berria"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Zeregin-zerrendaren propietateak"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "Zeregin-zerrenda berria"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "Zirkularren zerrendaren propietateak"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Zirkularren zerrenda berria"
 
@@ -6241,297 +4935,237 @@ msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 msgid "Validation error: %s"
 msgstr "Balidazio-errorea: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " - "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (Eginda "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "Eginda "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (Falta: "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "Falta: "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "Erantsitako mezua - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1770
-#: ../composer/e-msg-composer.c:1989
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Erantsitako mezu bat"
-msgstr[1] "Erantsitako %d mezu"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2057
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "_Lekuz aldatu"
-
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "Bertan behera _utzi arrastatzea"
+#: ../calendar/gui/dialogs/comp-editor.c:224
+msgid "Could not save attachments"
+msgstr "Ezin izan dira eranskinak gorde"
 
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "eranskina"
-
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:487
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Meeting - %s"
 msgstr "Bilera - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Esleitutako zeregina - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Memo - %s"
 msgstr "Zirkularra - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "No Summary"
 msgstr "Laburpenik ez"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:762
 msgid "Keep original item?"
 msgstr "Mantendu jatorrizko elementua?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "Click here to close the current window"
 msgstr "Egin klik uneko leihoa ixteko"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiatu hautatutako testua arbelean"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:982
 msgid "Cut selected text to the clipboard"
 msgstr "Ebaki hautatutako testua arbelera"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:989
 msgid "Click here to view help available"
 msgstr "Egin klik laguntza eskuragarria ikusteko"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:996
 msgid "Paste text from the clipboard"
 msgstr "Itsatsi testua arbeletik"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1017
 msgid "Click here to save the current window"
 msgstr "Egin klik uneko leihoa gordetzeko"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1024
 msgid "Select all text"
 msgstr "Hautatu testu osoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1031
 msgid "_Classification"
 msgstr "_Sailkapena"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Fitxategia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1052
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1059
 msgid "_Insert"
 msgstr "_Txertatu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "_Options"
 msgstr "Au_kerak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
 #: ../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 "_Ikusi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "_Eranskina..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Click here to attach a file"
 msgstr "Egin klik fitxategia eransteko"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Categories"
 msgstr "_Kategoriak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Toggles whether to display categories"
 msgstr "Kategoriak erakusten edo ezkutatzen ditu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Time _Zone"
 msgstr "Ordu-_zona"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Toggles whether the time zone is displayed"
 msgstr "Ordu-zona eremua erakusten edo ezkutatzen du"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Pu_blic"
 msgstr "_Publikoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "Classify as public"
 msgstr "Klasifikatu publiko gisa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Private"
 msgstr "_Pribatua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Classify as private"
 msgstr "Klasifikatu pribatu gisa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "_Confidential"
 msgstr "_Konfidentziala"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Classify as confidential"
 msgstr "Klasifikatu konfidentzial gisa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "R_ole Field"
 msgstr "A_raua eremua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Toggles whether the Role field is displayed"
 msgstr "Araua eremua erakusten edo ezkutatzen du"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP eremua erakusten edo ezkutatzen du"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "_Status Field"
 msgstr "_Egoera eremua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Toggles whether the Status field is displayed"
 msgstr "Egoera eremua erakusten edo ezkutatzen du"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "_Type Field"
 msgstr "_Mota eremua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Partaide-mota eremua erakusten edo ezkutatzen du"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
 msgid "Recent _Documents"
 msgstr "Azken _dokumentuak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "Erantsi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "Eranskin <b>%d</b>"
-msgstr[1] "<b>%d</b> eranskin"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "Ezkutatu eranskin-_barra"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "Erakutsi eranskin-_barra"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../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 "_Kendu"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "_Gehitu eranskina..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "Erakutsi eranskinak"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "Sakatu Zuriunea tekla eranskin-barra txandakatzeko"
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr "Gorde"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3348
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Eguneratze bat heltzen bada, honi egindako aldaketak galdu egin litezke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3377
+#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "eranskina"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 msgid "Unable to use current version!"
 msgstr "Ezin da uneko bertsioa erabili!"
 
@@ -6604,7 +5238,7 @@ msgid "Contacts..."
 msgstr "Kontaktuak..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "Delegatu:"
 
@@ -6631,7 +5265,7 @@ msgstr "Egin hau gertaera errepikakorra"
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "Bidaltzeko aukerak"
 
@@ -6668,199 +5302,229 @@ msgstr "Kontsultatu libre/okupatutako informazioa partaideentzako"
 msgid "Appoint_ment"
 msgstr "_Hitzordua"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "Gertaera ezin da editatu, hautatutako egutegia irakurtzeko soilik delako"
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "Gertaera ezin da bere osotasunean editatu, ez baizara antolatzailea"
+
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 msgid "This event has alarms"
 msgstr "Gertaerak alarmak ditu."
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "_Antolatzailea:"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:874
 msgid "_Delegatees"
 msgstr "_Delegatuak"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "_Partaideak"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "Hasiera-datarik gabeko gertaera"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "Amaiera-datarik gabeko gertaera"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "Hasierako data gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "Amaierako data gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "Hasierako ordua gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "Amaierako ordua gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 msgid "The organizer selected no longer has an account."
 msgstr "Hautatutako antolatzaileak ez du konturik orain."
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../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 "_Kendu"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
 msgid "_Add "
 msgstr "_Gehitu "
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ezin da '%s' egutegia ireki."
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1806
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "<b>%s</b>(r)en izenean zabiltz"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "Hitzordua baino egun %d lehenago"
 msgstr[1] "Hitzordua baino %d egun lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "Hitzordua baino ordu %d lehenago"
 msgstr[1] "Hitzordua baino %d ordu lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "Hitzordua baino minutu %d lehenago"
 msgstr[1] "Hitzordua baino %d minutu lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "Pertsonalizatu"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "Hitzordua baino egun 1 lehenago"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "Hitzordua baino egun 1 lehenago"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "Hitzordua baino 15 minutu lehenago"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"15 minutu hitzordua baino lehenago\n"
+"1 ordu hitzordua baino lehenago\n"
+"1 egun hitzordua baino lehenago"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "_Partaideak..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:151
+msgid "Attendees"
+msgstr "Partaideak"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Alarma pertsonalizatua:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Gertaeraren azalpena:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Labu_rpena:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "_Alarmak"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Azalpena:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "_Kokalekua:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "_Ordua:"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
-msgid "for"
-msgstr "errepikatu arte"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
-msgid "until"
-msgstr "data hau arte:"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>_Laguntzaileak</b> "
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "_Aldatu antolatzailea"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "_Kontaktuak..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "Antolatzailea:"
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"nondik\n"
+"arte"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "Zirkularra"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "Zirkularra ezin da editatu, hautatutako zirkularren zerrenda irakurtzeko soilik delako"
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "Zirkularra ezin da bere osotasunean editatu, ez baizara antolatzailea"
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Ezin dira zirkularrak ireki: '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Nori"
 
@@ -6874,7 +5538,7 @@ msgid "T_o:"
 msgstr "Nor_i:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:380
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Taldea:"
@@ -6899,23 +5563,23 @@ msgstr "Zeregin errepikatu bat aldatzen ari zara. Zer aldatu nahi duzu?"
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Zirkular errepikatu bat aldatzen ari zara. Zer aldatu nahi duzu?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Instantzia hau bakarrik"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Instantzia hau eta aurrekoak"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Instantzia hau eta ondorengoak"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Instantzia guztiak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution-ek editatu ezin dituen errepikapenak dauzka hitzordu honek."
 
@@ -6937,7 +5601,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "lehen"
 
@@ -6946,7 +5610,7 @@ msgstr "lehen"
 #. * (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:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "bigarren"
 
@@ -6954,7 +5618,7 @@ msgstr "bigarren"
 #. * (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:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "hirugarren"
 
@@ -6962,21 +5626,29 @@ msgstr "hirugarren"
 #. * (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:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "laugarren"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+msgid "fifth"
+msgstr "bosgarren"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "azken"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Beste data bat"
 
@@ -6984,7 +5656,7 @@ msgstr "Beste data bat"
 #. * 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:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1etik 10era"
 
@@ -6992,7 +5664,7 @@ msgstr "1etik 10era"
 #. * 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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11tik 20ra"
 
@@ -7000,45 +5672,45 @@ msgstr "11tik 20ra"
 #. * 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:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21etik 31ra"
 
 #. 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:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "eguna"
 
 #. 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:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "-"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "aldiz"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 msgid "Add exception"
 msgstr "Gehitu salbuespena"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr "Ezin izan da hautapenik eskuratu aldatzeko."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Modify exception"
 msgstr "Aldatu salbuespena"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 msgid "Could not get a selection to delete."
 msgstr "Ezin izan da hautapena eskuratu ezabatzeko."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "Data/Ordua"
 
@@ -7047,7 +5719,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Salbuespenak</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>Aurrebista</b>"
 
@@ -7055,50 +5727,56 @@ msgstr "<b>Aurrebista</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Errepikapena</b>"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "Errepikatze-aldia"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
 msgstr "Hitzorduaren _baliabideak"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-msgid "forever"
-msgstr "betiko"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
-msgid "month(s)"
-msgstr "hilabete"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"egun\n"
+"aste\n"
+"hilabete\n"
+"urte"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "aste"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "urte"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+"nondik\n"
+"arte\n"
+"betirako"
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr "Bidali nire alarmak gertaera honekin"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:162
+msgid "Notify new attendees _only"
+msgstr "Jakinarazi partaide berriak _soilik"
+
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "Osatze-data gaizki dago"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "Web orria"
 
@@ -7110,74 +5788,38 @@ msgstr "<span weight=\"bold\">Hainbat</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Egoera</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:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "Eginda"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "Handia"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "Egiten ari da"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"Altua\n"
+"Normala\n"
+"Baxua\n"
+"Definitu gabea"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "Txikia"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "Normala"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Ez da hasi"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"Hasi gabe\n"
+"Lanean\n"
+"Burututa\n"
+"Bertan behera utzita"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "Osatutako ehunekoa:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "E_goera:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "Definitu gabe"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_Osatze-data:"
@@ -7200,7 +5842,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "Egin klik zereginaren egoeraren xehetasunak aldatzeko/ikusteko"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "_Bidaltzeko aukerak"
 
@@ -7212,16 +5854,24 @@ msgstr "_Zeregina"
 msgid "Task Details"
 msgstr "Zereginaren xehetasunak"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "Zeregina ezin da editatu, hautatutako zereginen zerrenda irakurtzeko soilik delako"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "Zeregina ezin da bere osotasunean editatu, ez baizara antolatzailea"
+
+#: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "_Antolatzailea:"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:803
 msgid "Due date is wrong"
 msgstr "Mugaeguna gaizki dago"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ezin dira hemengo zereginak ireki: '%s'."
@@ -7318,80 +5968,161 @@ msgstr "%s - %s"
 msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+msgid "I_mport"
+msgstr "_Inportatu"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+msgid "Select a Calendar"
+msgstr "Hautatu egutegia"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+msgid "Select a Task List"
+msgstr "Hautatu zeregin-zerrenda"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+msgid "I_mport to Calendar"
+msgstr "_Inportatu egutegira"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+msgid "I_mport to Tasks"
+msgstr "_Inportatu zereginetara"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "Egin klik %s irekitzeko"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "Izengabea"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "Hasiera-data:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "Azalpena:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Web orria:"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Laburpena:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "Mugaeguna:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "Egoera:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "Egiten ari da"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "Eginda"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Ez da hasi"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "Lehentasuna:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "Handia"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "Normala"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "Txikia"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "Sortuta"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "Amaiera-eguna"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "Azken aldaketa"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Hasiera-data"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:629
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:630
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Okupatuta"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7401,225 +6132,200 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Bai"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ez"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../calendar/gui/e-cal-model.c:1008
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "Errepikatua"
 
-#: ../calendar/gui/e-cal-model.c:1010
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "Gorde honela..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
-msgid "Select folder to save selected attachments..."
-msgstr "Hautatu karpeta hautatutako eranskina gordetzeko..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "irudi_izengabea.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1589
-#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:924
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "_Gorde honela..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "Ezarri _atzeko plano gisa"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "_Gorde hautatutakoa"
-
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
-#, c-format
-msgid "Open in %s..."
-msgstr "Ireki honekin: %s..."
-
-#: ../calendar/gui/e-calendar-table.c:337
+#: ../calendar/gui/e-calendar-table.c:335
 msgid "* No Summary *"
 msgstr "* Laburpenik ez *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2399
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "_Antolatzailea: %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:376
-#: ../calendar/gui/e-calendar-view.c:2403
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
 #, c-format
 msgid "Organizer: %s"
 msgstr "Antolatzailea: %s"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "Start: "
 msgstr "Hasiera: "
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "Due: "
 msgstr "Falta: "
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "Definitu gabe"
+
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "%0"
 
-#: ../calendar/gui/e-calendar-table.c:600
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "%10"
 
-#: ../calendar/gui/e-calendar-table.c:601
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "%20"
 
-#: ../calendar/gui/e-calendar-table.c:602
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "%30"
 
-#: ../calendar/gui/e-calendar-table.c:603
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "%40"
 
-#: ../calendar/gui/e-calendar-table.c:604
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "%50"
 
-#: ../calendar/gui/e-calendar-table.c:605
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "%60"
 
-#: ../calendar/gui/e-calendar-table.c:606
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "%70"
 
-#: ../calendar/gui/e-calendar-table.c:607
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "%80"
 
-#: ../calendar/gui/e-calendar-table.c:608
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "%90"
 
-#: ../calendar/gui/e-calendar-table.c:609
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "%100"
 
-#: ../calendar/gui/e-calendar-table.c:889
-#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: ../calendar/gui/e-calendar-table.c:1172
-#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:642
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:818
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: ../calendar/gui/e-calendar-table.c:1584
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "New _Task"
 msgstr "_Zeregin berria"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "Ireki _web orria"
 
-#: ../calendar/gui/e-calendar-table.c:1590
-#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "_Gorde honela..."
+
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "I_nprimatu..."
 
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
 #: ../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 "E_baki"
 
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1764
-#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: ../calendar/gui/e-calendar-table.c:1600 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Esleitu _zeregina"
 
-#: ../calendar/gui/e-calendar-table.c:1601 ../calendar/gui/e-memo-table.c:935
+#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Birbidali iCalendar gisa"
 
-#: ../calendar/gui/e-calendar-table.c:1602
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta'"
 
-#: ../calendar/gui/e-calendar-table.c:1603
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu hautatutako zereginak 'Osatuta' gisa"
 
-#: ../calendar/gui/e-calendar-table.c:1604
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark as Incomplete"
 msgstr "_Markatu 'Osatu gabea'"
 
-#: ../calendar/gui/e-calendar-table.c:1605
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Ma_rkatu hautatutako zereginak 'Osatu gabea' gisa"
 
-#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-table.c:1614
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: ../calendar/gui/e-calendar-table.c:1847
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
@@ -7637,167 +6343,167 @@ msgstr "Eginda"
 msgid "Completion date"
 msgstr "Osatze-data"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "Mugaeguna"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "Hasiera-data"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2307
-#: ../calendar/gui/e-meeting-list-view.c:602
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2337
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Egoera"
 
-#: ../calendar/gui/e-calendar-view.c:1444
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
 msgstr "elementuak lekuz aldatzen"
 
-#: ../calendar/gui/e-calendar-view.c:1446
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
 msgstr "elementuak kopiatzen"
 
-#: ../calendar/gui/e-calendar-view.c:1755
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: ../calendar/gui/e-calendar-view.c:1756
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: ../calendar/gui/e-calendar-view.c:1757
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "_Bilera berria"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1768
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "_Uneko ikuspegia"
 
-#: ../calendar/gui/e-calendar-view.c:1770
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "Hautatu _gaur"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "_Hautatu data..."
 
-#: ../calendar/gui/e-calendar-view.c:1777
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "I_nprimatu..."
 
-#: ../calendar/gui/e-calendar-view.c:1787
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "_Kopiatu egutegian..."
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "_Eraman egutegira..."
 
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Delegate Meeting..."
 msgstr "_Delegatu bilera..."
 
-#: ../calendar/gui/e-calendar-view.c:1790
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "_Antolatu bilera..."
 
-#: ../calendar/gui/e-calendar-view.c:1791
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "_Birbidali iCalendar gisa..."
 
-#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "_Erantzun"
 
-#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1824
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: ../calendar/gui/e-calendar-view.c:1798
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: ../calendar/gui/e-calendar-view.c:1800
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: ../calendar/gui/e-calendar-view.c:2254
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "Onartua"
 
-#: ../calendar/gui/e-calendar-view.c:2255
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "Ukatua"
 
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2286
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "Behin-behinekoa"
 
-#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-calendar-view.c:2287
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "Delegatua"
 
-#: ../calendar/gui/e-calendar-view.c:2258
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Needs action"
 msgstr "Ekintza behar du"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "Kokalekua: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2453
+#: ../calendar/gui/e-calendar-view.c:2480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Ordua: %s. %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y/%m/%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y/%m/%d %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7810,12 +6516,12 @@ 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:750
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutu-zatiketa"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:768
 msgid "Show the second time zone"
 msgstr "Erakutsi bigarren mailako ordu-zona"
 
@@ -7825,48 +6531,48 @@ msgstr "Erakutsi bigarren mailako ordu-zona"
 #. 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:851 ../calendar/gui/e-day-view.c:1584
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A, %B %d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2322
+#: ../calendar/gui/e-day-view.c:2309
 #, c-format
 msgid "Week %d"
 msgstr "%d. astea"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "Bai. (Errepikapen konplexua)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Egunero"
 msgstr[1] "%d egunez behin"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Astero"
 msgstr[1] "%d astez behin"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7874,35 +6580,35 @@ msgstr[0] "Astero, eguna: "
 msgstr[1] "%d astez behin, eguna: "
 
 #. 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:806
 msgid " and "
 msgstr " eta "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "%s. eguna - "
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s. %s - "
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hilero"
 msgstr[1] "%d hilez behin"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Urtero"
 msgstr[1] "%d urtez behin"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7910,36 +6616,36 @@ msgstr[0] " guztira %d aldiz"
 msgstr[1] " guztira %d aldiz"
 
 #. 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:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", data honetan amaituta: "
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "Hasi"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "Amaitu"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "Muga"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -7950,285 +6656,285 @@ msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "Bilera bertan behera utzi da, hala ere ezin izan da zure egutegietan aurkitu"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1276
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "Zeregina bertan behera utzi da, hala ere ezin izan da zure zereginen "
 "zerrendetan aurkitu"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dio %s(r)i."
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazio berria jaso nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "Bilera eguneratzeko eskaera"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "Bilera bertan behera uztea"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dio %s(r)i."
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "Zeregina eguneratzeko eskaera"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
 msgstr "Zeregina bertan behera uztea"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa argitaratu du."
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa eskatzen dizu."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>(e)k libre/okupatuta eskaerari erantzun dio."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektua ez da baliozkoa eta ezin da eguneratu\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Erantzun hau ez da uneko partaide batena. Partaide gisa gehitu?"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea delako\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:590
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "Eguneratu"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Onartu"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Ukatu"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
@@ -8252,6 +6958,10 @@ msgstr "Egutegia kargatzen"
 msgid "Loading calendar..."
 msgstr "Egutegia kargatzen ari da..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "Antolatzailea:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Zerbitzariaren mezua:"
@@ -8272,77 +6982,73 @@ msgstr "Aukerako partaideak"
 msgid "Resources"
 msgstr "Baliabideak"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "Partaideak"
-
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "Indibiduala"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Taldea"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Baliabidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Gela"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "Mahaiburua"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "Beharrezko partaidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "Aukerako partaidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "Ez-partaidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "Ekintza behar du"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "Partaidea                         "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 msgstr "Egiten ari da"
 
 #. 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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2124
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %Y.eko %Bren %da"
 
@@ -8350,78 +7056,78 @@ msgstr "%A, %Y.eko %Bren %da"
 #. 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:471
-#: ../calendar/gui/e-meeting-time-sel.c:2155
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%a, %Y/%m/%d"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Bulegotik kanpo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Ez dago informaziorik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "_Partaideak..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "_Aukerak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "Erakutsi _txikiagotuta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "_Eguneratu Libre/okupatuta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "Au_tomatikoki hautatu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "_Beharrezko pertsonak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "_Hasiera:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "_Amaiera:"
 
@@ -8449,15 +7155,15 @@ msgstr "Hizkuntza"
 msgid "Member"
 msgstr "Kidea"
 
-#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-memo-table.c:950
 msgid "_Delete Selected Memos"
 msgstr "_Ezabatu hautatutako zirkularrak"
 
-#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Egin klik zirkularra gehitzeko"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8466,327 +7172,221 @@ msgstr ""
 "Errorea %s(e)n:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "Zirkularrak kargatzen"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s - zirkularrak irekitzen"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "Zereginak kargatzen"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "Zereginak egiten..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "Betiko ezabatzen"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 msgstr "Hautatu ordu-zona"
 
 #. 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:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%B %d"
 
-#: ../calendar/gui/gnome-cal.c:2637
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "Ikuspegi _pertsonalizatua"
 
-#: ../calendar/gui/gnome-cal.c:2638
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "_Gorde ikuspegi pertsonalizatua"
 
-#: ../calendar/gui/gnome-cal.c:2643
+#: ../calendar/gui/gnome-cal.c:2679
 msgid "_Define Views..."
 msgstr "_Definitu ikuspegiak..."
 
-#: ../calendar/gui/gnome-cal.c:2880
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s - hitzorduak kargatzen"
 
-#: ../calendar/gui/gnome-cal.c:2895
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: ../calendar/gui/gnome-cal.c:2904
+#: ../calendar/gui/gnome-cal.c:2940
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Zirkularrak kargatzen %s(e)n"
 
-#: ../calendar/gui/gnome-cal.c:3016
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "%s irekitzen"
 
-#: ../calendar/gui/gnome-cal.c:3984
+#: ../calendar/gui/gnome-cal.c:4012
 msgid "Purging"
 msgstr "Purgatzen"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "apirila"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "abuztua"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "abendua"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "otsaila"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "urtarrila"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "uztaila"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "ekaina"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "martxoa"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "maiatza"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "azaroa"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "urria"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"Urtarrila\n"
+"Otsaila\n"
+"Martxoa\n"
+"Apirila\n"
+"Maiatza\n"
+"Ekaina\n"
+"Uztaila\n"
+"Abuztua\n"
+"Iraila\n"
+"Urria\n"
+"Azaroa\n"
+"Abendua"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "Hautatu data"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "iraila"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Hautatu Gaur"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "Antolatzailea ezarri behar da."
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "Partaide bat behar da gutxienez"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "Gertaera-informazioa"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "Zereginaren informazioa"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
 msgid "Memo information"
 msgstr "Zirkularraren informazioa"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "Libre/okupatuta informazioa"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "Egutegi-informazioa"
 
-#. Translators: This is part of the subject
-#. * line of a meeting request or update email.
-#. * The full subject line would be:
-#. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
-msgctxt "Meeting"
-msgid "Accepted"
-msgstr "Onartua"
-
-#. Translators: This is part of the subject
-#. * line of a meeting request or update email.
-#. * The full subject line would be:
-#. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
-msgctxt "Meeting"
-msgid "Tentatively Accepted"
-msgstr "Oraingoz onartua"
-
-#. Translators: This is part of the subject
-#. * line of a meeting request or update email.
-#. * The full subject line would be:
-#. * "Declined: Meeting Name".
-#. Translators: This is part of the subject line of a
-#. * meeting request or update email.  The full subject
-#. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
-msgctxt "Meeting"
-msgid "Declined"
-msgstr "Ukatua"
-
-#. Translators: This is part of the subject
-#. * line of a meeting request or update email.
-#. * The full subject line would be:
-#. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
-msgctxt "Meeting"
-msgid "Delegated"
-msgstr "Delegatua"
-
-#. Translators: This is part of the subject line of a
-#. * meeting request or update email.  The full subject
-#. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
-msgctxt "Meeting"
-msgid "Updated"
-msgstr "Eguneratuta"
-
-#. Translators: This is part of the subject line of a
-#. * meeting request or update email.  The full subject
-#. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
-msgctxt "Meeting"
-msgid "Cancel"
-msgstr "Utzi"
-
-#. Translators: This is part of the subject line of a
-#. * meeting request or update email.  The full subject
-#. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
-msgctxt "Meeting"
-msgid "Refresh"
-msgstr "Freskatu"
-
-#. Translators: This is part of the subject line of a
-#. * meeting request or update email.  The full subject
-#. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
-msgctxt "Meeting"
-msgid "Counter-proposal"
-msgstr "Kontraproposamena"
-
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Libre/okupatuta informazioa (%s - %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "iCalendar informazioa"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaide izan behar duzu."
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "Zirkularren zerrenda _berria"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "zirkular %d"
 msgstr[1] "%d zirkular"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d hautatuta"
 msgstr[1] "%d hautatuta"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "Huts egin du zirkularrak bertsio-berritzean."
 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Ezin izan da '%s' zirkularren zerrenda ireki gertaerak eta bilerak sortzeko"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "Ez dago egutegirik erabilgarri zirkularrak sortzeko"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "Zirkular-iturburuen hautatzailea"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "Zirkular berria"
 
-#: ../calendar/gui/memos-component.c:1072
-msgctxt "New"
-msgid "Mem_o"
-msgstr "_Zirkularra"
-
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "Sortu zirkular berria"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "Partekatutako zirkular berria"
 
-#: ../calendar/gui/memos-component.c:1080
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "_Partekatutako zirkularra"
-
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "Sortu partekatutako zirkular berria"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "Zirkularren zerrenda berria"
 
-#: ../calendar/gui/memos-component.c:1088
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "Zirkularren _zerrenda"
-
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "Sortu zirkularren zerrenda berria"
 
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "Inprimatu zirkularrak"
 
@@ -8813,297 +7413,274 @@ msgstr ""
 "Itxaron Evolution-ek zure karpetak migratzen dituen bitartean..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Ezin dira ezarpen zaharrak migratu evolution/config.xmldb fitxategitik"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Ezin da '%s' egutegia migratu"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ezin dira '%s' zereginak migratu"
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "Oharrak"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31."
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Ig"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Al"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Ar"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "Az"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "Og"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Or"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "Lr"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "Zeregina"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "Laburpena: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "Partaideak: "
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "Egoera: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "Lehentasuna: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Osatutako ehunekoa: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "URLa: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriak: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "Kontaktuak: "
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "Zeregin-zerrenda _berria"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Zeregin %d"
 msgstr[1] "%d zeregin"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "Huts egin du zereginak bertsio-berritzean."
 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Ezin izan da '%s' zereginen zerrenda ireki gertaerak eta bilerak sortzeko"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "Ez dago egutegirik erabilgarri zereginak sortzeko"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr "Zeregin-iturburu hautatzailea"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1143
-msgctxt "New"
-msgid "_Task"
-msgstr "_Zeregina"
-
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "Esleitutako zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1151
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "_Esleitutako zeregina"
-
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "Sortu esleitutako zeregin berria"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "Zereginen zerrenda berria"
 
-#: ../calendar/gui/tasks-component.c:1159
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "Ze_reginen zerrenda"
-
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "Sortu zereginen zerrenda berria"
 
-#: ../calendar/gui/tasks-control.c:442
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9115,11 +7692,11 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "Inprimatu zereginak"
 
@@ -9136,11 +7713,11 @@ msgstr "Bertan behera utzita"
 msgid "In progress"
 msgstr "Egiten ari da"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "hau baino handiagoa da"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "hau baino txikiagoa da"
 
@@ -9148,37 +7725,37 @@ msgstr "hau baino txikiagoa da"
 msgid "Appointments and Meetings"
 msgstr "Hitzorduak eta bilerak"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "Egutegia irekitzea"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar fitxategiak (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Evolution-en iCalendar inportatzailea"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "Oroitu!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar fitxategiak (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Evolution-en vCalendar inportatzailea"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "Egutegi-gertaerak"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-en egutegiaren inportatzaile adimenduna"
 
@@ -10731,217 +9308,190 @@ msgstr "Pazifikoa/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifikoa/Yap"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "Ezin izan da automatikoki gordetako fitxategia ireki"
-
-#: ../composer/e-composer-autosave.c:280
+#: ../composer/e-composer-autosave.c:445
 msgid "Unable to retrieve message from editor"
 msgstr "Ezin da mezua eskuratu editoretik"
 
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "Txertatu eranskina"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "_Erantsi"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:84
 msgid "Untitled Message"
 msgstr "Mezu izengabea"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "Erantsi fitxategi bat"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "It_xi"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
 msgstr "Itxi uneko fitxategia"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "I_nprimatu..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Inprimatzeko _aurrebista"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
 msgstr "Gorde uneko fitxategia"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "Gorde hone_la..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
 msgstr "Gorde uneko fitxategia beste izen batekin"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
 msgstr "Gorde _zirriborro gisa"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
 msgstr "Gorde zirriborro gisa"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
 msgid "S_end"
 msgstr "_Bidali"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
 msgstr "Bidali mezu hau"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
 msgstr "Txertatu bidaltzeko aukerak"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "_Mezu berria"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "Ireki mezu berriaren leihoa"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "_Karaktere-kodeketa"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "Se_gurtasuna"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PGP _enkriptatzea"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "Enkriptatu mezu hau PGPrekin"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "PGP _sinadura"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "Sinatu mezu hau zure PGP gakoarekin"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
 msgstr "_Eman lehentasuna mezuari"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
 msgstr "Ezarri mezuaren lehentasuna altuenera"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
 msgstr "E_skatu irakurragiriak"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
 msgstr "Lortu bidaltze-jakinarazpena mezu bat irakurtzean"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "S/MIME e_nkriptatzea"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Enkriptatu mezu hau zure S/MIME enkriptatze-ziurtagiriarekin"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "S/MIME s_inadura"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sinatu mezu hau zure S/MIME sinadura-ziurtagiriarekin"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "_Bcc eremua"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC eremua erakutsi edo ezkutatzen du"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "_Cc eremua"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC eremua erakutsi edo ezkutatzen du"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "'Nork' e_remua"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
 msgstr "'Nork' eremua erakutsi edo ezkutatzen du"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "'Bidali _hona' eremua"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "''Bidali hona' eremua erakutsi edo ezkutatzen du"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
 msgstr "'Erant_zun honi' eremua"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "'Erantzun honi' eremua erakutsi edo ezkutatzen du"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "_Gaia eremua"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "Gaia eremua erakusten edo ezkutatzen du"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "'N_ori' eremua"
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "'Nori' eremua erakutsi edo ezkutatzen du"
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:521
 msgid "Save Draft"
 msgstr "Gorde zirriborroa"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header.c:120
+msgid "Show"
+msgstr "Erakutsi"
+
+#: ../composer/e-composer-header.c:123
+msgid "Hide"
+msgstr "Ezkutatu"
+
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10949,39 +9499,53 @@ msgstr ""
 "Idatzi hartzaileen zerrendan agertu gabe mezuaren kopia jasoko dutenen "
 "helbideak."
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "Nor_k:"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+msgid "From"
+msgstr "Nork"
+
+#: ../composer/e-composer-header-table.c:954
 msgid "_Reply-To:"
 msgstr "_Erantzun honi:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:959
 msgid "_To:"
 msgstr "Nor_i:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:965
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
+#: ../composer/e-composer-header-table.c:976
 msgid "_Post To:"
 msgstr "_Bidali hona:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:980
 msgid "S_ubject:"
 msgstr "_Gaia:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:989
 msgid "Si_gnature:"
 msgstr "Si_nadura:"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "Egin klik hemen helbide-liburura joateko"
 
@@ -10997,17 +9561,17 @@ msgstr "Aukeratu talde-mezua bidaltzeko karpetak."
 msgid "Click here to select folders to post to"
 msgstr "Egin klik hemen, talde-mezuak bidaltzeko karpetak hautatzeko"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1557
-msgid "Show _Attachment Bar"
-msgstr "Erakutsi _eranskin-barra"
+#: ../composer/e-composer-private.c:208
+msgid "Save draft"
+msgstr "Gorde zirriborroa"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:807
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ezin da sinatu irteerako mezua: ez dago sinadura-ziurtagiririk kontu "
 "honentzat"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:814
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -11015,23 +9579,11 @@ msgstr ""
 "Ezin da enkriptatu irteerako mezua: sinadura-ziurtagiririk ez dago ezarrita "
 "kontu honentzat"
 
-#: ../composer/e-msg-composer.c:1499 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Eranskina"
-msgstr[1] "Eranskinak"
-
-#: ../composer/e-msg-composer.c:1555
-msgid "Hide _Attachment Bar"
-msgstr "Ezkutatu _eranskin-barra"
-
-#: ../composer/e-msg-composer.c:1572 ../composer/e-msg-composer.c:2797
+#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
 msgid "Compose Message"
 msgstr "Prestatu mezua"
 
-#: ../composer/e-msg-composer.c:4098
+#: ../composer/e-msg-composer.c:3347
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11195,7 +9747,7 @@ msgstr "_Gorde zirriborroa"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution-en posta eta egutegia"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "Talde-lanerako suitea"
 
@@ -11211,6 +9763,40 @@ msgstr "helbide-txartela"
 msgid "calendar information"
 msgstr "egutegi-informazioa"
 
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "Gaur"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Bihar"
+
+#: ../e-util/e-datetime-format.c:202
+msgid "Yesterday"
+msgstr "Atzo"
+
+#: ../e-util/e-datetime-format.c:205
+#, c-format
+msgid "%d days from now"
+msgstr "Hemendik %d egunetara"
+
+#: ../e-util/e-datetime-format.c:207
+#, c-format
+msgid "%d days ago"
+msgstr "duela %d egun"
+
+#: ../e-util/e-datetime-format.c:281 ../e-util/e-datetime-format.c:291
+#: ../e-util/e-datetime-format.c:300
+msgid "Use locale default"
+msgstr "Erabili lokala lehenetsia"
+
+#: ../e-util/e-datetime-format.c:494
+msgid "Format:"
+msgstr "Formatua:"
+
 #: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Evolution errorea"
@@ -11228,7 +9814,7 @@ msgid "Evolution Query"
 msgstr "Evolution-en kontsulta"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Barne-errorea, '%s' errore ezezaguna eskatu da"
@@ -11241,67 +9827,67 @@ msgstr "Osagaia"
 msgid "Name of the component being logged"
 msgstr "Erregistratuko den osagaiaren izena"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "Arazketen egunkaria"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
 msgstr "Erakutsi _erroreak egoera-barran"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "segundotan."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "Egunkariko mezuak:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "Egunkari-maila"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "Ordua"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mezuak"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../e-util/e-non-intrusive-error-dialog.c:301
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Itxi leiho hau"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "Errorea"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "Erroreak"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "Abisuak eta erroreak"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "Araztu"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Error, Warnings and Debug messages"
 msgstr "Erroreak, abisuak eta arazketa-mezuak"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
 msgstr "Gaituta"
 
@@ -11321,6 +9907,10 @@ msgstr "Inprimatzeko sistemak erroreari buruzko honako xehetasunak bidali ditu:"
 msgid "The printing system did not report any additional details about the error."
 msgstr "Inprimatzeko sistemak ez du erroreari buruzko bestelako xehetasunik eman."
 
+#: ../e-util/e-signature.c:690
+msgid "Autogenerated"
+msgstr "Automatikoki sortua"
+
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "Arrazoia: \"{1}\"."
@@ -11349,55 +9939,55 @@ msgstr "Fitxategia gainidatzi?"
 msgid "_Overwrite"
 msgstr "_Gainidatzi"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "Ezin izan da esteka ireki."
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "Ezin izan da Evolution-en laguntza bistaratu."
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "_Garrantzitsua"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "_Lanekoa"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "_Pertsonala"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "_Egitekoa"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "_Geroago"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "Etiketa-_izena:"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "Editatu etiketa"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "Gehitu etiketa"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "Etiketaren izena ezin da hutsa izan."
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:367
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -11405,190 +9995,190 @@ msgstr ""
 "Etiketa honen etiketa badago lehendik ere zerbitzarian. Aldatu zure "
 "etiketaren izena."
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-en errorea: %s"
 
-#: ../e-util/gconf-bridge.c:1231
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "Beste errore guztiak terminalean soilik erakutsi dira."
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "orain dela segundo bat"
 msgstr[1] "orain dela %d segundo"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "etorkizuneko segundo 1"
 msgstr[1] "etorkizuneko %d segundo"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "orain dela minutu bat"
 msgstr[1] "orain dela %d minutu"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "etorkizuneko minutu 1"
 msgstr[1] "etorkizuneko %d minutu"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "orain dela ordubete"
 msgstr[1] "orain dela %d ordu"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "etorkizuneko ordu 1"
 msgstr[1] "etorkizuneko %d ordu"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "orain dela egun bat"
 msgstr[1] "orain dela %d egun"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "etorkizuneko egun 1"
 msgstr[1] "etorkizuneko %d egun"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "orain dela astebete"
 msgstr[1] "orain dela %d aste"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "etorkizuneko aste 1"
 msgstr[1] "etorkizuneko %d aste"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "orain dela hilabete"
 msgstr[1] "orain dela %d hilabete"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "etorkizuneko hilabete 1"
 msgstr[1] "etorkizuneko %d hilabete"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "orain dela urtebete"
 msgstr[1] "orain dela %d urte"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "etorkizuneko urte 1"
 msgstr[1] "etorkizuneko %d urte"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<egin klik hemen data hautatzeko>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "orain"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%Y-%b-%d"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "Hautatu ordua"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "Aukeratu fitxategi bat"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Proba"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:854
 msgid "R_ule name:"
 msgstr "_Arau-izena:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
 msgstr "Bilatu honako baldintzak betetzen dituzten elementuak"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
 msgstr "Gehitu _baldintza"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
 msgstr "Baldintza guztiak betetzen badira"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If any conditions are met"
 msgstr "Baldintzaren bat betetzen bada"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
 msgstr "_Bilatu elementuak:"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "Erlazionatutako guztiak"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "Erantzunak"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "Erantzunak eta gurasoak"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "Erantzunik edo gurasorik ez"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "Hariak _barne"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Sarrerakoa"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Irteerakoa"
 
@@ -11673,54 +10263,50 @@ msgstr ""
 "konparatuko da iragazketa egiten denean."
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "uneko orduarekiko erlatiboa den ordua"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "lehenago"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "etorkizunean"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "hilabete"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "segundo igarotakoan"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"duela\n"
+"etorkizunean"
 
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "uneko ordua"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"segundo\n"
+"minutu\n"
+"ordu\n"
+"egun\n"
+"aste\n"
+"hilabete\n"
+"urte"
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "zuk zehaztutako ordua"
-
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:369
-msgid "weeks"
-msgstr "aste"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "urte"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"uneko ordua\n"
+"zehaztutako ordua\n"
+"uneko orduarekiko ordu erlatiboa"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "Gehitu araua"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "Editatu araua"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Arau-izena"
 
@@ -11774,21 +10360,21 @@ msgstr "Evolution-en postaren hobespenen kontrola"
 msgid "Evolution Network configuration control"
 msgstr "Evolution-en sarea konfiguratzeko kontrola"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Posta"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "Posta-kontuak"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "Posta-hobespenak"
 
@@ -11797,16 +10383,114 @@ msgid "Network Preferences"
 msgstr "Sareko hobespenak"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "_Posta"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "_Birbidali"
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "Erantzun bidal_tzaileari"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+msgid "%d attached messages"
+msgstr "Erantsitako %d mezu"
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Eranskina"
+msgstr[1] "Eranskinak"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "Ikonoen ikuspegia"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "Zerrenda-ikuspegia"
+
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "Bat datozenak: %d"
+
+#: ../mail/e-mail-search-bar.c:520
+msgid "Close the find bar"
+msgstr "Itxi bilaketa-barra"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "_Bilatu:"
+
+#: ../mail/e-mail-search-bar.c:540
+msgid "Clear the search"
+msgstr "Garbitu bilaketa"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "_Aurrekoa"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr "Bilatu esaldiaren aurreko agerraldia"
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "_Hurrengoa"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr "Bilatu esaldiaren hurrengo agerraldia"
+
+#: ../mail/e-mail-search-bar.c:587
+msgid "Mat_ch case"
+msgstr "_Maiuskula/minuskula"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "Orrialdearen behera iritsi da, jarraitu goitik"
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr "Orrialdearen gora iritsi da, jarraitu behetik"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "Enkriptaziorik gabe"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "TLS enkriptazioa"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "SSL enkriptazioa"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s Lizentzia-kontratua"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11819,106 +10503,110 @@ msgstr ""
 "lizentzia-kontratua,\n"
 "eta, onartzeko, hautatu kontrol-laukia.\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "Automatikoki sortua"
+#: ../mail/em-account-editor.c:797
+msgid "Never"
+msgstr "Inoiz ere ez"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:798
+msgid "Always"
+msgstr "Beti"
+
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
 msgstr "Galdetu mezu bakoitzean"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "Identitatea"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "Mezuak jaso"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2200
 msgid "Check for _new messages every"
 msgstr "Begiratu _mezu berririk dagoen"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2208
 msgid "minu_tes"
 msgstr "minuturo"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2398 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2457 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "Lehenespenak"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2523 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "Segurtasuna"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2560 ../mail/em-account-editor.c:2655
 msgid "Receiving Options"
 msgstr "Jasotzeko aukerak"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2561 ../mail/em-account-editor.c:2656
 msgid "Checking for New Messages"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontu-editorea"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[lehenetsia]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "Kontuaren izena"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "Protokoloa"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "Izengabea"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr "Hizkuntza(k)"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr "Gehitu sinaduraren script-a"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr "Sinadura(k)"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Birbidalitako mezua --------"
 
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1585
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "Ez da helburuko helbiderik eman, mezua birbidaltzea bertan behera utzi da."
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1591
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Ez da konturik aurkitu erabiltzeko, mezua birbidaltzea bertan behera utzi da."
 
@@ -11941,7 +10629,7 @@ msgstr ""
 msgid "-----Original Message-----"
 msgstr "-------- Jatorrizko mezua --------"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "_Iragazteko arauak"
 
@@ -11958,18 +10646,10 @@ msgstr "Esleitu kolorea"
 msgid "Assign Score"
 msgstr "Esleitu puntuazioa"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Soinu-seinalea"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Eginda: "
@@ -11987,7 +10667,7 @@ msgid "Date sent"
 msgstr "Bidaltze-data"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../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
@@ -12038,226 +10718,234 @@ msgstr "Adierazpena"
 msgid "Follow Up"
 msgstr "Jarraipena"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "Birbidali: "
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "Garrantzitsua"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "honen ondorengoa da"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "honen aurrekoa da"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "Banderaduna da"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "ez da Banderaduna"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "ez da ezarri"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "ezarri da"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Baztergarriak"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "Mezu baztergarrien proba"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "Etiketa"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "Posta-zerrenda"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "Guztiekin bat etorri"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "Mezuaren gorputza"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "Mezuaren goiburua"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "Mezua baztergarria da"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "Mezua ez da baztergarria"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "Mezuaren kokalekua"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Eraman karpeta honetara"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Kanalizatu programara"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "Jo soinua"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "Irakurrita"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Hartzailea"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "Adierazpen erregularra"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "Erantzunda"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "hau ematen du"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "hau baino handiagoa ematen du"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "hau baino txikiagoa ematen du"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "Exekutatu programa"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Puntuazioa"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Bidaltzailea"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "Bidaltzailea edo hartzaileak"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "Ezarri etiketa"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "Ezarri egoera"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "Tamaina (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "honen antzekoa da"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "Iturburu-kontua"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "Goiburu espezifikoa"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "honela hasten da"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "Utzi prozesatzeari"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "Gaia"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Egoera ezarri gabe"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Gero"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Gehitu _ekintza"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "Sortu bilaketa-karpeta bilaketatik..."
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "Mezu guztiak"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "Irakurri gabeko mezuak"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "Etiketarik ez"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "Irakurri mezuak"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "Azken mezuak"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "Azken 5 egunetako mezuak"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "Mezuak eranskinekin"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "Mezu garrantzitsuak"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "Baztergarriak ez diren mezuak"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1194
 msgid "Account Search"
 msgstr "Kontuaren bilaketa"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1256
 msgid "All Account Search"
 msgstr "Kontu guztien bilaketa"
 
@@ -12287,11 +10975,11 @@ msgid "Quota usage"
 msgstr "Kuotaren erabilera"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Sarrerako ontzia"
 
@@ -12304,369 +10992,317 @@ msgstr "Karpetaren propietateak"
 msgid "<click here to select a folder>"
 msgstr "<egin klik hemen karpeta hautatzeko>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "_Sortu"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "_Karpetaren izena:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "Bilatu karpeta"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "SAILKATU GABEAK"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "Zirriborroa"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Txantiloiak"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "Irteerako ontzia"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "Bidalitakoak"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "Kargatzen..."
 
-#. 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:380
-#, c-format
-msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
-
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "Posta-karpetaren zuhaitza"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s karpeta lekuz aldatzen"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s karpeta kopiatzen"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mezuak %s karpetara eramaten"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Mezuak %s karpetan kopiatzen"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ezin da mezurik ekarri maila goreneko biltegira"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
+msgid "_Move"
+msgstr "_Lekuz aldatu"
+
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr "Bertan behera _utzi arrastatzea"
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "Ireki leiho _berrian"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "Kar_peta berria..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "_Lekuz aldatu..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "_Freskatu"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "_Garbitu irteerako ontzia"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Hustu _zakarrontzia"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
 msgstr "_Irakurri gabekoen bilaketa-karpeta"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "'%s' hemen kopiatzen:  %s"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "K_opiatu"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "'%s' karpeta sortzen"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Sortu karpeta"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Adierazi karpeta non sortu behar den:"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Mezuak ezabatzeak huts egin du"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Ez duzu nahikoa baimen mezu hau ezabatzeko."
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "Erantzun bidal_tzaileari"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "_Birbidali"
-
 #. 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:106
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Eraman karpeta honetara..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Markatu _ez-garrantzitsu gisa"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Markatu _baztergarri gisa"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Markatu _ez baztergarri gisa"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Markatu jarraitasunerako..."
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Etiketa"
 
 #. 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:478
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "_Bat ere ez"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "Etiketa _berria"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Ban_dera osatuta"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "_Garbitu bandera"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
 #. 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 "Bilatu karpeta _gaiaren arabera"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Bilatu karpeta _bidaltzailearen arabera"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Bilatu karpeta _hartzailearen arabera"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Bilatu karpeta po_sta-zerrendaren arabera"
 
 #. 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 "G_aiaren araberako iragazkia"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
 #. 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:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:510
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:593
+#: ../plugins/google-account-setup/google-source.c:764
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "Ezin da mezua eskuratu"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "Mezua eskuratzea..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "_Deitu honi..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
 msgstr "Sortu _bilaketa-karpeta"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "_Helbidetik"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "_Helbidera"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "Egin klik %s bidaltzeko"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "Egin klik %s(r)i deitzeko"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 msgid "Click to hide/unhide addresses"
 msgstr "Egin klik helbideak ezkutatzeko/bistaratzeko"
 
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "Bat datozenak: %d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "_Bilatu:"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "_Aurrekoa"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "_Hurrengoa"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "_Maiuskula/minuskula"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "Sinatu gabe"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:560
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12674,11 +11310,11 @@ msgstr ""
 "Mezu hau ez dago sinatuta. Ez dago inolako bermerik, mezu hau benetakoa dela "
 "bermatzen duenik."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "Baliozko sinadura"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:561
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12686,21 +11322,21 @@ msgstr ""
 "Mezu hau sinatuta dago, eta baliozkoa da; hau da, oso litekeena da mezua "
 "benetakoa izatea."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "Sinadura baliogabea"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:562
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "Mezu honen sinadura ezin da egiaztatu; beharbada bidean aldatuko zen."
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "Baliozko sinadura du, baina ezin da bidaltzailea egiaztatu"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:563
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12708,31 +11344,31 @@ msgstr ""
 "Mezu honek baliozko sinadura du, baina mezuaren bidaltzailea ezin da "
 "egiaztatu."
 
-#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "Sinadura badago, hala ere gako publikoa behar du"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:564
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "Mezu honek sinadura du, baina ez dator bat gako publikoarekin."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "Enkriptatu gabe"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "Mezu hau ez dago enkriptatuta. Edukia bidean ikus daiteke, Interneten."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "Enkriptatuta, ahula"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:572
 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 "
@@ -12742,11 +11378,11 @@ msgstr ""
 "izan arren, litekeena da kanpoko norbaitek mezu honen edukia ikustea, "
 "horretarako denbora hartzen badu."
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "Enkriptatuta"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:573
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12754,11 +11390,11 @@ msgstr ""
 "Mezu hau enkriptatuta dago. Oso zaila da kanpoko norbaitek mezuaren edukia "
 "ikustea."
 
-#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "Enkriptatuta, zorrotza"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:574
 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 "
@@ -12768,87 +11404,58 @@ msgstr ""
 "zaila izango da kanpoko norbaitek mezu honen edukia ikustea, arrazoizko "
 "denbora batean."
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ikusi ziurtagiria"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr "Ziurtagiri hau ez da ikusteko modukoa"
 
-#: ../mail/em-format-html-display.c:1410
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "Osatua: %Y %B %d, %l:%M %p"
+#: ../mail/em-format-html-display.c:980
+msgid "Completed on"
+msgstr "Eginda: "
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr "Atzeratua:"
 
-#: ../mail/em-format-html-display.c:1421
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr " - %Y %B %d, %l:%M %p"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
+msgstr "arabera"
 
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "_Ikusi barnean"
 
-#: ../mail/em-format-html-display.c:1500
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "E_zkutatu"
 
-#: ../mail/em-format-html-display.c:1501
+#: ../mail/em-format-html-display.c:1073
 msgid "_Fit to Width"
 msgstr "_Doitu zabalera"
 
-#: ../mail/em-format-html-display.c:1502
+#: ../mail/em-format-html-display.c:1074
 msgid "Show _Original Size"
 msgstr "Erakutsi jatorrizko ta_maina"
 
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "Gorde eranskina honela"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "Hautatu karpeta eranskin guztiak gordetzeko..."
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "_Gorde hautatutakoa..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "_Eranskin %d"
-msgstr[1] "%d _eranskin"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "_Gorde"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "Gorde _denak"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "Eranskinik ez"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "Ikusi formaturik _gabe"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1577
 msgid "Hide _Unformatted"
 msgstr "Ezkutatu formaturik _gabekoak"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "Ireki _honekin"
 
-#: ../mail/em-format-html-display.c:2668
+#: ../mail/em-format-html-display.c:1711
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12861,245 +11468,238 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "'%s' eskuratzen"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:929
 msgid "Unknown external-body part."
 msgstr "Kanpoko gorputz-zatia ezezaguna."
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr "Kanpoko gorputz-zatia gaizki osatuta dago."
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP gunerako erakuslea (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:978
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:980
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "(%s) fitxategi lokalerako erakuslea"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1001
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "(%s) urruneko datuetarako erakuslea"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr "Mezua formateatzea"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1414
 msgid "Formatting Message..."
 msgstr "Mezua formateatzea..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "Bidalketa-funtzioa"
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
-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:1781
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1917
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Mezu hau <b>%s</b>(e)k bidali du <b>%s</b>(r)en izenean"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "Nork"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:76
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Erantzun honi"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "Berri-taldeak"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "Aurpegia"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s eranskina"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ezin izan da S/MIME mezua analizatu: errore ezezaguna"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Enkriptatze-mota ez onartua multipart/enkriptatuarentzat"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "Ezin izan da PGP/MIME mezua analizatu"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Ezin izan da PGP/MIME mezua analizatu: errore ezezaguna"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "Sinadura-formatu ez onartua"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "Errorea sinadura egiaztatzean"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "Errore ezezaguna sinadura egiaztatzean"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "Ezin izan da PGP mezua analizatu"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Ezin izan da PGP mezua analizatu: errore ezezaguna"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "Beti"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "Egunean behin"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "Astean behin"
 
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "Hilean behin"
 
-#: ../mail/em-mailer-prefs.c:327
+#: ../mail/em-mailer-prefs.c:332
 msgid "Add Custom Junk Header"
 msgstr "Gehitu baztergarrien goiburu pertsonalizatua"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Name:"
 msgstr "Goiburuaren izena:"
 
-#: ../mail/em-mailer-prefs.c:332
+#: ../mail/em-mailer-prefs.c:337
 msgid "Header Value Contains:"
 msgstr "Goiburuaren balioak hau dauka:"
 
-#: ../mail/em-mailer-prefs.c:437
+#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Goiburua"
+
+#: ../mail/em-mailer-prefs.c:442
 msgid "Contains Value"
 msgstr "Balioa du"
 
-#: ../mail/em-mailer-prefs.c:459
+#: ../mail/em-mailer-prefs.c:465
 msgid "Color"
 msgstr "Kolorea"
 
-#: ../mail/em-mailer-prefs.c:462
+#: ../mail/em-mailer-prefs.c:468
 msgid "Tag"
 msgstr "Etiketa"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s plugin-a erabilgarri dago eta bitarra instalatu da."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s plugin-a ez dago erabilgarri. Egiaztatu paketea instalatuta dagoen."
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1092
 msgid "No Junk plugin available"
 msgstr "Ez dago Baztergarrien plugin erabilgarririk"
 
+#: ../mail/em-mailer-prefs.c:1455
+msgid "Date header:"
+msgstr "Dataren goiburua:"
+
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "Egitekoa"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "Geroago"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
 msgstr "Migrazioa"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ezin izan da '%s' karpeta berria sortu: %s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Ezin da kopiatu '%s' karpeta --> '%s': %s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "'%s' ezin da aztertu postontzirik dagoen ikusteko: %s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13111,31 +11711,31 @@ msgstr ""
 "\n"
 "Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Ezin dira ireki '%s' POP zerbitzarian gordetako datu zaharrak: %s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Ezin da ireki '%s' POP3 zerbitzarian gordetzeko datuen direktorioa: %s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Ezin dira kopiatu '%s' POP3 zerbitzarian gordetako datuak: %s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Huts egin du '%s' posta-biltegi lokala sortzean: %s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
 msgstr "Karpetak migratzen"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -13147,12 +11747,12 @@ msgstr ""
 "\n"
 "Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Huts egin du posta lokalaren karpetak sortzean '%s'(e)n: %s"
 
-#: ../mail/em-migrate.c:3075
+#: ../mail/em-migrate.c:2974
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13160,74 +11760,91 @@ msgstr ""
 "Ezin dira irakurri aurreko Evolution-en instalazioko ezarpenak; evolution/"
 "config.xmldb' ez dago, edo hondatuta dago bestela."
 
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "Gorde honela..."
+
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "irudi_izengabea.%s"
+
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Ezarri _atzeko plano gisa"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
 #. make it first item
-#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "_Gehitu helbide-liburuan"
 
-#: ../mail/em-subscribe-editor.c:600
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "Ireki honekin: %s..."
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Biltegi honek ez du onartzen harpidetzarik, edo, bestela, desgaituta daude."
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "Harpidetuta"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "Karpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:839
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "Hautatu zerbitzari bat."
 
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "Ez da zerbitzaririk hautatu"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
 msgstr "_Ez erakutsi mezu hau berriro."
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Posta-iragazkiak"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "mezua"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "Gorde mezua..."
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "Gehitu helbidea"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "Mezu-bidaltzailea: %s"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "Bilatu _karpetak"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "Bilatu karpetaren iturburua"
 
@@ -13452,38 +12069,46 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Hustu zakarrontziko karpeta guztiak Evolution-etik irtetzean."
 
 #: ../mail/evolution-mail.schemas.in.h:47
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"Gaitu irudi animatuak HTML mezuetan. Erabiltzaile askok nazka diote "
+"irudi animatuei, eta nahiago dute irudi estatikoak."
+
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Gaitu kurtsore modua, mezuak irakurtzean kurtsorea ikusteko."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable magic space bar"
 msgstr "Gaitu edo desgaitu 'zuriune magikoa'"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Gonbitea gaitzen/desgaitzen du hainbat mezu markatzen den bitartean."
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
 msgstr "Gaitu edo desgaitu 'bilatu idaztean' funtzioa"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders"
 msgstr "Gaitu bilaketako karpetak"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
 msgstr "Gaitu bilaketako karpetak hasieran."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"Gaitu albo-paneleko bilaketa funtzioa, idazten duzun bitartean bilaketa "
-"interaktiboa abiarazteko. Erabili hau karpeta bat albo-panelean aurkitzeko "
-"karpetaren izena idaztean eta hautapenak automatikoki karpeta horretara "
-"joateko."
+"Gaitu alboko barrako bilaketa eginbidea karpeten izenen bilaketa elkarreragilea "
+"baimentzeko."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13491,42 +12116,43 @@ msgstr ""
 "Hau gaituz Zuriunea tekla erabiliko da mezuaren aurrebistan, mezuen "
 "zerrendan eta karpetetan korritzeko."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable to render message text part of limited size."
 msgstr "Gaitu tamaina mugatutako mezuaren zatia erakustea."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
 msgstr "Gaitu/desgatiu kurtsore modua"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Kodetu fitxategi-izenak Outlook/Gmail moduan"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
 "Kodetu fitxategi-izenak posta-goiburuetan Outlook edo GMail-ek egiten duen "
-"antzera, hauek ulertu ahal izan dezaten Evolution-ek bidalitako fitxategi-"
-"izen lokalizatuak, zeren eta haiek ez baitute RFC 2231 jarraitzen, okerreko "
-"RFC  2047 estandarra baizik."
+"antzera, hauek ongi bistaratu ahal izan dezaten Evolution-ek UTF-8 hizkiekin bidalitako "
+"fitxategi-izenak, zeren eta haiek ez baitute RFC 2231 jarraitzen, okerreko "
+"RFC 2047 estandarra baizik."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane"
 msgstr "Mezu-zerrendaren panelaren altuera"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
 msgstr "Mezu-zerrendaren panelaren altuera."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Karpetaren aurrebista ezkutatu eta hautapena ezabatzen du"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13534,7 +12160,7 @@ msgstr ""
 "Erabiltzaileak 10 mezu edo gehiago irekitzen saiatzen bada aldi berean, "
 "galdetu erabiltzaileari benetan hori egitea nahi duen."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13542,7 +12168,7 @@ msgstr ""
 "\"Aurrebista\" panela aktibatuta egonez gero erakutsi bata bestearen alboan, "
 "bertikalki ordez."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 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 "
@@ -13552,7 +12178,7 @@ msgstr ""
 "GNOMEren MIME moten datu-baseko Bonobo osagaien ikustaile batera mapatutako "
 "zerrendako edozein MIME mota erabil daiteke edukia bistaratzeko."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13560,7 +12186,7 @@ msgstr ""
 "\"Mezuak bidali eta jaso\" leihoaren haiserako altuera. Balioa eguneratu "
 "egiten da erabiltzaileak leihoa bertikalki tamainaz aldatzean."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13574,7 +12200,7 @@ msgstr ""
 "bidali eta jaso\" leihoa ezin delako maximizatu. Gako hau inplementazioaren "
 "xehetasun gisa soilik existitzen da."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13582,11 +12208,7 @@ msgstr ""
 "\"Mezuak bidali eta jaso\" leihoaren haiserako zabalera. Balioa eguneratu "
 "egiten da erabiltzaileak leihoa horizontalki tamainaz aldatzean."
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "Gonbitea gaitzen/desgaitzen du hainbat mezu markatzen den bitartean."
-
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13594,7 +12216,7 @@ msgstr ""
 "Eskaera errepikakorra gaitzen/desgaitzen du lineaz kanpoko sinkronizazioa "
 "behar den galdetzeko lineaz kanpoko moduan sartu aurretik."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 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 "
@@ -13604,31 +12226,31 @@ msgstr ""
 "ezabatzean behin betirako ezabatzen direla (ez direla bilaketako emaitzetik "
 "soilik kentzen) buruzko abisua emateko."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr "Baztergarria hustu zen azken aldia"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr "Zakarrontzia hustu zen azken aldia"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of Labels and their associated colors"
 msgstr "Etiketen zerrenda, eta bakoitzari asoziatutako koloreak"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Bonobo osagaien ikustaileentzat egiaztatu beharreko MIME moten zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accepted licenses"
 msgstr "Onartutako lizentzien zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of accounts"
 msgstr "Kontuen zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13636,15 +12258,15 @@ msgstr ""
 "Evolution-en posta-osagaiak ezagutzen dituen kontuen zerrenda. Zerrendak /"
 "apps/evolution/mail/accounts-eko azpiderektorioen izenen kateak ditu."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of custom headers and whether they are enabled."
 msgstr "Goiburu pertsonalizatuen zerrenda, gaituta dauden edo ez zehaztuta."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Hiztegien hizkuntzen kodeen zerrenda zuzentzaile ortografikoan erabiltzeko."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 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."
@@ -13653,15 +12275,15 @@ msgstr ""
 "kolorea duten kateak ditu, eta koloreak HTML kodeketa hamaseitarra "
 "erabiltzen du."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lizentzia onartu zaien protokolo-izenen zerrenda."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Load images for HTML messages over HTTP"
 msgstr "Kargatu HTML mezuen irudiak HTTP bidez"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 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 "
@@ -13671,103 +12293,103 @@ msgstr ""
 "kargatu irudiak saretik kanpo \"1\" - Kargatu irudiak kontaktuen mezuetan \"2"
 "\" - Beti kargatu irudiak saretik."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr "Iragazki-ekintzen egunkaria"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr "Erregistratu iragazki-ekintzak zehaztutako egunkari-fitxategian."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markatu aipuak mezuaren \"Aurrebistan\""
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markatu aipuak mezuaren \"Aurrebistan\"."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
 msgstr "Mezuen leihoaren altuera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
 msgstr "Mezuen leihoaren zabalera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Mezuak bistaratzeko estiloa (\"normala\", \"goiburu osoak\", \"iturburua\")"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Irtetzean baztergarria husteko gutxieneko egun-kopurua"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Irtetzean zakarrontzia husteko gutxieneko egun-kopurua"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Irtetzean baztergarria husteko gutxieneko denbora (egunetan)."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Irtetzean zakarrontzia husteko gutxieneko denbora (egunetan)."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Helbide-kopurua Nori/CC/BCC eremuetan erakusteko"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr "Abisatu gaia hutsik badago"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Abisatu erabiltzaileari, karpeta bat betiko ezabatu aurretik."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Abisatu erabiltzaileari, mezu bat gairik gabe bidaltzen saiatzen denean."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Galdetu erabiltzaileak lineaz kanpo berehala egotea nahi duen egiaztatzeko"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when deleting messages in search folder"
 msgstr "Abisatu mezuak bilaketako karpetatik ezabatzean"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr "Abisatu erabiltzaileak betiko borratzean"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr "Abisatu erabiltzaileak Bcc bakarrik betetzen duenean"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Abisatu erabiltzaileak 10 mezu edo gehiago aldi berean irekitzen saiatzean"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13775,75 +12397,159 @@ msgstr ""
 "Abisatu HTML mezuak bidali aurretik beharbada HTML mezurik jaso nahi ez "
 "duten erabiltzaileei."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Abisatu Nori edo Cc hartzailerik gabeko mezu bat bidali aurretik."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Abisatu HTMLrik nahi ez duenari HTML mezua bidali aurretik"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Prompt while marking multiple messages"
 msgstr "Gonbitea hainbat mezu markatzean"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr "Jarri sinadura pertsonalizatuak erantzunen goian"
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Put the cursor at the bottom of replies"
+msgstr "Jarri kurtsorea erantzunen behean"
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Ezagutu aurpegierak testuan, eta ordeztu irudiekin."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr "Ezagutu testuko estekak, eta ordeztu."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Run junk test on incoming mail."
 msgstr "Exekutatu mezu baztergarrien proba sarrerako mezuetan."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "Gorde direktorioa"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
 msgstr "Bilatu bidaltzailearen argazkia lokaleko helbide-liburuan"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr "Bidali HTML mezuak lehenespenez"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr "Bidali HTML mezuak lehenespenez."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Sender email-address column in the message list"
 msgstr "Bidaltzailearen helb.elek. zutabea mezuen zerrendan"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Server synchronization interval"
 msgstr "Zerbitzariaren sinkronizazio tartea"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "Erakutsi \"Bcc\" eremua mezu bat bidaltzean"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "Erakutsi \"Cc\" eremua mezu bat bidaltzean"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "Erakutsi \"Nork\" eremua mezu bat bidaltzean berri-talde bati"
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr "Erakutsi \"Nork\" eremua mezu bat bidaltzean"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "Erakutsi \"Erantzun honi\" eremua mezua bidaltzean berri-talde bati"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Erakutsi \"Erantzun honi\" eremua mezua bidaltzean"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
 msgstr "Erakutsi animazioak"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
 msgstr "Erakutsi irudi-animazioak animazio gisa."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Erakutsi ezabatutako mezuak (marratuta) mezuen zerrendan."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
 msgstr "Erakutsi ezabatutako mezuak mezuen zerrendan"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Show image animations"
+msgstr "Erakutsi irudi animatuak"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Show photo of the sender"
 msgstr "Erakutsi bidaltzailearen argazkia"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Erakutsi \"Bcc\" eremua mezua bidaltzean. Hau 'Ikusi' "
+"menutik kontrolatzen da posta-kontu bat aukeratzean."
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Erakutsi \"Cc\" eremua mezua bidaltzean. Hau 'Ikusi' "
+"menutik kontrolatzen da posta-kontu bat aukeratzean."
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"Erakutsi \"Nork\" eremua mezua bidaltzean berri-talde bati. Hau 'Ikusi' "
+"menutik kontrolatzen da posta-kontu bat aukeratzean."
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Erakutsi \"Nork\" eremua mezua bidaltzean. Hau 'Ikusi' "
+"menutik kontrolatzen da posta-kontu bat aukeratzean."
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"Erakutsi \"Erantzun honi\" eremua mezua bidaltzean berri-talde bati. Hau 'Ikusi' "
+"menutik kontrolatzen da posta-kontu bat aukeratzean."
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+"Erakutsi \"Erantzun honi\" eremua mezua bidaltzean. Hau 'Ikusi' "
+"menutik kontrolatzen da posta-kontu bat aukeratzean."
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13851,59 +12557,59 @@ msgstr ""
 "Erakutsi bidaltzailearen helbide elektronikoa bereiztutako zutabean mezuen "
 "zerrendan."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Erakutsi bidaltzailearen argazkia mezuak irakurtzeko panelean."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
 msgstr "Ortografia-egiaztapena barnean"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Spell checking color"
 msgstr "Ortografia-egiaztapenaren kolorea"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Spell checking languages"
 msgstr "Ortografia-egiaztapenaren hizkuntzak"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
 msgstr "Harpidetzen elkarrizketa-koadroaren altuera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
 msgstr "Harpidetzen elkarrizketa-koadroaren zabalera lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
 msgstr "Terminaleko letra-tipoa"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Text message part limit"
 msgstr "Mezuaren testu-zatiaren muga"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr "Baztergarrientzako plugin lehenetsia"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Baztergarria hustu zen azken aldia, garaiaren hasieratik iragandako egunetan."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Zakarrontzia hustu zen azken aldia, garaiaren hasieratik iragandako egunetan."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "The terminal font for mail display."
 msgstr "Mezuak bistaratzeko erabiliko den terminaleko letra-tipoa."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "The variable width font for mail display."
 msgstr "Mezuak bistaratzeko erabiliko den zabalera aldakorreko letra-tipoa."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -13911,7 +12617,7 @@ msgstr ""
 "Honako balio erabilgarriak daude: \"0\" - erroreak. \"1\" - abisuak. \"2\" - "
 "mezuen arazketa."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:159
 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 in terms of KB."
@@ -13919,7 +12625,7 @@ msgstr ""
 "Testu-zatiaren gehiengo tamaina zehazten du Evolution-ek formatu emateko. "
 "Lehenetsia 4MB/4096 KB da, KB unitatean zehaztuz."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:160
 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 "
@@ -13929,7 +12635,7 @@ msgstr ""
 "egon. Zerrendatutako plugin lehenetsia desgaitzen bada, ez ditu beste plugin "
 "erabilgarririk erabiliko."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:161
 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."
@@ -13938,7 +12644,7 @@ msgstr ""
 "berrezartzen da irakurri ostean. Mezua desautatzen du zerrendatik eta "
 "karpetako aurrebista ezabatzen du."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 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;"
@@ -13950,7 +12656,7 @@ msgstr ""
 "egitura - &lt;header enabled&gt; - gaituta ezartzen da, goiburua mezuen "
 "ikuspegian bistaratuko bada."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -13960,11 +12666,11 @@ msgstr ""
 "iragazkitik kontaktu ezagunak kanpo gelditzeko lokaleko helbide-liburuan "
 "bilaketa landuko den ala ez zehazteko erabiltzen da."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr "Aukera honek mezuak jasotzeko abiadura hobetzen lagun dezake."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13972,7 +12678,7 @@ msgstr ""
 "Honek helbide-kopurua ezartzen du mezuaren zerrendako ikuspegi lehenetsian "
 "erakusteko, eta harutzago '...' erakutsiko da."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13980,7 +12686,7 @@ msgstr ""
 "Ezarpen honek hariak zabaltzeko edo biltzeko egoeran lehenetsi gisa egon "
 "behar duten zehazten du. Evolution berrabiaraztea eskatzen du."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 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 "
@@ -13990,117 +12696,91 @@ msgstr ""
 "oinarrituko den zehazten du, mezuaren dataren araberaren ordez. Evolution "
 "berrabiaraztea eskatzen du"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Thread the message list."
 msgstr "Sartu harian mezuen zerrenda."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Thread the message-list"
 msgstr "Sartu harian mezuen zerrenda"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Thread the message-list based on Subject"
 msgstr "Sartu harian mezuen zerrenda, Gaiaren arabera"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Timeout for marking message as seen"
 msgstr "Mezua Ikusitako gisa markatzeko denbora-muga"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Timeout for marking message as seen."
 msgstr "Mezua Ikusitako gisa markatzeko denbora-muga."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "UID string of the default account."
 msgstr "Kontu lehenetsiaren UID katea."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Azpimarraren kolorea akastun hitzetan (lineako zuzentzaile ortografikoa "
 "erabiltzean)."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr "Erabili SpamAssassin daemon-a eta bezeroa"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Erabili SpamaAssassin daemon-a eta bezeroa (spamc/spamd)."
+msgstr "Erabili SpamAssassin daemon-a eta bezeroa (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
 msgstr "Erabili letra-tipo pertsonalizatuak"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Use custom fonts for displaying mail."
 msgstr "Erabili letra-tipo pertsonalizatuak mezuak bistaratzeko."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr "Spam-proba lokalak bakarrik erabili."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Spam-proba lokalak bakarrik erabili (DNSkorik ez)."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
 msgstr "Erabili diseinu handia edo 'alboz albokoa'"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Variable width font"
-msgstr "Zabalera aldakorreko letra-tipoa"
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "Ikusi/Bcc menu-elementua hautatuta dago"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "Ikusi/Bcc menu-elementua hautatuta dago."
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "Ikusi/Cc menu-elementua hautatuta dago"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "Ikusi/Cc menu-elementua hautatuta dago."
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "Ikusi/Nork menu-elementua hautatuta dago"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "Ikusi/Nork menu-elementua hautatuta dago."
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "Ikusi/Bidali hona menu-elementua hautatuta dago"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "Ikusi/Bidali hona menu-elementua hautatuta dago."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr "Erabiltzaileak sutu egiten dira mezu bati erantzutean kurtsorea non jarri ez badakite. Honek kurtsorea mezuaren gainean edo azpian kokatuko den zehazten du."
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "Ikusi/Erantzun honi menu-elementua hautatuta dago"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr "Erabiltzaileak sutu egiten dira mezu bati erantzutean sinadura non jarri ez badakite. Honek sinadura mezuaren gainean edo azpian kokatuko den zehazten du."
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "Ikusi/Erantzun honi menu-elementua hautatuta dago."
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Variable width font"
+msgstr "Zabalera aldakorreko letra-tipoa"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Irakurragiriaren eskaera mezu bakoitzari gehitu lehenetsi gisa edo ez."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Karpeten izenen elipsia albo-barran desgaituko den ala ez adierazten du."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -14108,15 +12788,15 @@ msgstr ""
 "Gaikako harian sartzera itzuli nahi duzun edo ez, mezuek ez daukatenean "
 "'Erantzun honi' edo 'Erreferentzia' goibururik."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Hari bateko azken mezuen arabera hariek ordenatu behar diren ala ez."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Width of the message-list pane"
 msgstr "Mezu-zerrendaren panelaren zabalera"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Width of the message-list pane."
 msgstr "Mezu-zerrendaren panelaren zabalera."
 
@@ -14133,12 +12813,12 @@ msgid "Import mail from Elm."
 msgstr "Inportatu posta Elm-etik."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "Helburuko karpeta:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "Hautatu inportazioetarako karpeta"
 
@@ -14156,8 +12836,8 @@ msgstr "Postontzia inportatzen"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' inportatzen"
@@ -14184,152 +12864,138 @@ msgstr "Inportatu posta Pine-tik."
 msgid "Mail to %s"
 msgstr "Mezu-hartzailea: %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "Mezu-bidaltzailea: %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "Gaia: %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s posta-zerrenda"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Gehitu iragazteko araua"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d hautatuta, "
 msgstr[1] "%d hautatuta, "
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ezabatuta"
 msgstr[1] "%d ezabatuta"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "baztergarri %d"
 msgstr[1] "%d baztergarri"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "zirriborro %d"
 msgstr[1] "%d zirriborro"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d bidalita"
 msgstr[1] "%d bidalita"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d bidali gabe"
 msgstr[1] "%d bidali gabe"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d irakurri gabe, "
 msgstr[1] "%d irakurri gabe, "
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d guztira"
 msgstr[1] "%d guztira"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: ../mail/mail-component.c:928
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "_Mezua"
-
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr "Prestatu posta-mezu berria"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr "Mezu berrien karpeta"
 
-#: ../mail/mail-component.c:936
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "Posta _karpeta"
-
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr "Sortu posta-karpeta berria"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Huts egin du Postaren ezarpenak edo karpetak bertsio-berritzean."
 
 #: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr " _Begiratu zein mota onartzen diren "
-
-#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
 msgstr "(Oharra: aplikazioa berrabiarazi egin behar da)"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL ez da onartzen evolution-en bertsio honetan</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>Bidaltzailearen argazkia</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>S_inadurak</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Mezuaren goiburuan erantzuteko aukera</b> (ez da gomendatzen)"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Hizkuntzak</b>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Kontu-informazioa</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentifikazioa</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Mezuak prestatzea</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfigurazioa</span>"
 
@@ -14450,59 +13116,82 @@ msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 msgid "Always request rea_d receipt"
 msgstr "Eskatu beti _irakurragiriak"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"Eranskina\n"
+"Barnean\n"
+"Aipua"
+
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"Eranskina\n"
+"Barnean (Outlook estiloa)\n"
+"Aipua\n"
+"Aipurik ez"
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "Automatikoki txertatu _aurpegieren irudiak"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltikokoa (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltikokoa (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "_Karaktere-jokoa:"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
-msgstr "_Begiratu zein mota onartzen diren "
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
+msgstr " _Begiratu zein mota onartzen diren"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
 msgstr "_Begiratu baztergarrien aurkako goiburu pertsonalizatuak"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
 msgstr "Begiratu _sarreran mezurik baztertzeko dagoen"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "_Egiaztatu ortografia idatzi ahala"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sarrerako mezuak baztergarriak diren egiaztatzen du"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "_Garbitu"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "Ga_rbitu"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "_Ortografia-akatsa duten hitzen kolorea:"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "Berretsi ka_rpeta betiko borratu aurretik"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14518,153 +13207,149 @@ msgstr ""
 "\n"
 "Ezarpenak gordetzeko, egin klik \"Aplikatu\" botoian."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "Le_henetsi"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "Karaktere-kodeketa _lehenetsia:"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
 msgstr "Ezabatu mezu baztergarriak i_rtetzean"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Sinatu digitalki irteerako mezuak (lehenespenez)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Ez eman formatu mezuari testu-_tamaina hau gainditzean: "
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "_Ez markatu mezuak baztergarri gisa bidaltzailea nire helbide-liburuan badago"
 
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "Ez jarri komatxorik"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "Eginda"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "Z_irriborroen karpeta:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "Posta-kontuak"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "_Helbide elektronikoa:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "Hustu zakarrontziko karpetak _irtetzean"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "Gaitu _zuriune magikoa"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
 msgstr "Gaitu _bilaketako karpetak"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "E_nkriptatze-ziurtagiria:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "Sinatu digitalki _irteerako mezuak (lehenespenez)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "_Zabalera-finkoa:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "_Zabalera-finkodun letra-tipoa:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "Letra-tipoen propietateak"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "Eman _HTML formatua mezuei"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "_Izen-abizenak:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "HTML mezuak"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "_HTTP proxy-a:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "Goiburua"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "_Aipamenak nabarmentzeko erabili"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "Barnean"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "Linean (Outlook estiloa)"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr ""
+"Zerbitzariak ataka ez-estandar bat erabiltzen badu, zehaztu zerbitzariaren "
+"helbidea \"zerbitzari-izena:ataka-zenbakia\" gisa."
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiketak"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "Hizkuntzen taula"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "Posta-konfigurazioa"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "Posta-goiburuen taula"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "Postontziaren kokalekua"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "Mezu-prestatzailea"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "Proxy-rik ez honentzako:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:112
 msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Oharra: etiketaren izenean agertzen den azpimarra identifikatzaile "
 "mnemotekniko gisa erabiltzen da menuan."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14672,33 +13357,37 @@ msgstr ""
 "Oharra: ez dizu pasahitzik eskatuko, harik eta lehen aldiz konektatzen zaren "
 "arte"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Aukera honi ezikusi egingo zaio baztergarrien goiburu pertsonalizatu batekin "
 "bat datorrela aurkituz gero."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "E_rakundea:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/_GPG gakoaren IDa:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "_Pasahitza:"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Please configure the following account settings."
+msgstr "Konfiguratu honako kontuen ezarpenak."
+
+#: ../mail/mail-config.glade.h:120
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
-"Idatzi kontu honen izen deskribatzailea azpiko tartean.\n"
+"Idatzi kontu honen izen deskribatzailea azpiko tartean. "
 "Izen hau bistaratzeko soilik erabiliko da."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14706,7 +13395,7 @@ msgstr ""
 "Idatzi posta bidaltzeko erabiliko duzun bidearen datuak. Ziur ez bazaude, "
 "galdetu sistema-administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 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 "
@@ -14716,58 +13405,42 @@ msgstr ""
 "eremuak ez dira nahitaez bete beharrekoak. Datu horiek zuk bidaltzen dituzun "
 "mezuetan agertzea nahi baduzu bakarrik bete behar dituzu."
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "Hautatu ondorengo aukeretako bat"
-
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "Ataka:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "Aipamen gisa"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "_Gogoratu pasahitza"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "Erant_zun honi:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "Gogoratu p_asahitza"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "_SOCKS ostalaria:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
 msgstr "_Bilatu bidaltzailearen argazkia lokaleko helbide-liburuetan soilik"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "_Hautatu..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "B_idali mezuaren irakurragiria:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "_Letra-tipo estandarra:"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "Hautatu zirriborroen karpeta"
-
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Hautatu HTML zabalera finkoko letra-tipoa"
@@ -14784,71 +13457,66 @@ msgstr "Hautatu HTML zabalera aldakorreko letra-tipoa"
 msgid "Select HTML variable width font for printing"
 msgstr "Hautatu HTML zabalera aldakorreko letra-tipoa inprimatzeko"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "Hautatu bidalitako mezuen karpeta"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Mezuak bidali"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Bi_dalitako mezuen karpeta:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
-msgstr "_Zerbitzari-mota: "
+#: ../mail/mail-config.glade.h:142
+msgid "Server _Type:"
+msgstr "_Zerbitzari mota:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Sinatze-ziur_tagiria:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "Si_nadura:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Sinadurak"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Sinaduren taula"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Ortografia-egiaztapena"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "Hasi _idazten behean erantzutean"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
+#: ../mail/mail-config.glade.h:149
+msgid "T_ype:"
 msgstr "_Mota:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Hiztegia instalatuta daukaten hizkuntzak bakarrik azaltzen dira zerrendan."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:151
 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. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "Script honen irteera zure sinadura gisa\n"
-"erabiliko da. Idazten duzun izena bistaratzeko\n"
-"bakarrik erabiliko da. "
+"erabiliko da. Idazten duzun izena bistaratzeko "
+"bakarrik erabiliko da."
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14856,156 +13524,156 @@ msgstr ""
 "Idatzi kontu honentzat erabili nahi duzun izena.\n"
 "Adibidez: \"Lanekoa\" edo \"Nirea\""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "_Erabiltzaile-izena:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "Erabili _autentifikazioa"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:615
-#: ../plugins/google-account-setup/google-contacts-source.c:316
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:681
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "_Zabalera aldakorra:"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin. "
+"Click \"Forward\" to begin."
 msgstr ""
 "Ongi etorri Evolution-en posta konfiguratzeko morroira.\n"
 "\n"
-"Hasteko, egin klik \"Aurrera\"n. "
+"Hasteko, egin klik \"Aurrera\"n."
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "_Gehitu sinadura"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "_Beti kargatu irudiak Internetetik"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "Proxy-aren konfigurazio automatikoaren URLa:"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "Baztergarrien plugin _lehenetsia:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "Interneterako _zuzeneko konexioa"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Ez sinatu bilera-eskaerak (Outlook-ekin bateragarria izateko)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "_Birbidaltzeko estiloa:"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Mantendu sinadura jatorrizko mezuaren gainean erantzutean"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Kargatu irudiak mezuan kontaktuetatik"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "_Begiratu lokaleko helbide-liburuetan soilik"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_Lehenetsi kontu hau"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "Proxy-aren _eskuzko konfigurazioa:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Inoiz ez kargatu irudirik Internetetik"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "Galdetu _HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Abisatu _mezuak gairik gabe bidali aurretik"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "_Erantzuteko estiloa:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_Script-a:"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "HTTP seguruaren proxy-a:"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "_Hautatu..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Erakutsi animazioak"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Erakutsi bidaltzailearen argazkia mezuaren aurrebistan"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Txikitu Nori / Cc / Bcc goiburukoak hona"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "E_rabili konexio segurua:"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "_Erabili sistemako lehenetsiak"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Erabili beste aplikazioetako letra-tipo berak"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "helbideak"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "kolorea"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "azalpena"
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "segundo igarotakoan"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "      "
@@ -15035,50 +13703,34 @@ msgid "All local folders"
 msgstr "Karpeta lokal guztiak"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "_Maiuskula/Minuskula"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "_Eginda"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "_Bilatu:"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "Bilatu mezuan"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "Markatu jarraipena egiteko"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "Karpeta-harpidetzak"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "Lizentzia-kontratua"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "Ez da bat ere hautatu"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "_Zerbitzaria:"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "Segurtasun-informazioa"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "Zehaztutako karpetak"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15086,19 +13738,19 @@ msgstr ""
 "Jarraitzeko hautatutako mezuak beheko zerrendan agertzen dira.\n"
 "Hautatu jarraitze-ekintza bat \"Bandera\" menuan."
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "_Onartu lizentzia"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "_Noizko:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "_Bandera:"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "_Markatu hau lizentzia-kontratua onartzeko"
 
@@ -15107,21 +13759,21 @@ msgstr "_Markatu hau lizentzia-kontratua onartzeko"
 msgid "Pinging %s"
 msgstr "%s(e)n ping egiten"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "Hautatutako mezuak iragaztea"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Huts egin du irteerako iragazkiak aplikatzean: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15130,123 +13782,123 @@ msgstr ""
 "Huts egin du %s(r)i eranstean: %s\n"
 "Horren ordez, Bidalitakoen karpeta lokalean gehituko da."
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Huts egin du 'Bidalitakoen' karpeta lokalean eranstean: %s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Huts egin du mezuak bidaltzean: %d / %d "
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "Bertan behera utzita."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "Osatuta."
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "%s karpetaren kuotaren informazioa eskuratzen"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "'%s' kontua betiko ezabatzen eta biltegiratzen"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' kontua biltegiratzen"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "Karpeta betiko ezabatzen"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' zakarrontzia husten"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua eskuratzen"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Mezu %d eskuratzen"
 msgstr[1] "%d mezu eskuratzen"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Mezu %d gordetzen"
 msgstr[1] "%d mezu gordetzen"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15255,11 +13907,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15268,27 +13920,27 @@ msgstr ""
 "Ezin da irteera-fitxategia sortu: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s -- deskonektatzen"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s -- berriro konektatzen"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' kontua prestatzen lineaz kanpo erabiltzeko"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "Zerbitzua egiaztatzen"
 
@@ -15312,43 +13964,43 @@ msgstr "Eguneratzen..."
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:814
 #, c-format
 msgid "Checking for new mail"
 msgstr "Mezu berriak ote dauden begiratzen"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Idatzi %s(r)en pasaesaldia"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "Idatzi pasaesaldia"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: ../mail/mail-signature-editor.c:201
+#: ../mail/mail-signature-editor.c:202
 msgid "_Save and Close"
 msgstr "_Gorde eta itxi"
 
-#: ../mail/mail-signature-editor.c:355
+#: ../mail/mail-signature-editor.c:356
 msgid "Edit Signature"
 msgstr "Editatu sinadura"
 
-#: ../mail/mail-signature-editor.c:370
+#: ../mail/mail-signature-editor.c:371
 msgid "_Signature Name:"
 msgstr "_Sinaduraren izena:"
 
@@ -15381,21 +14033,21 @@ msgstr "Karpeta baliogabea: '%s'"
 msgid "Setting up Search Folder: %s"
 msgstr "Bilaketa-karpeta konfiguratzen: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Bilaketa-karpeta eguneratzen - '%s:%s'"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Bilaketa-karpetak eguneratzen - '%s'"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "Editatu bilaketa-karpeta"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Bilaketa berrien karpeta"
 
@@ -16011,79 +14663,78 @@ msgstr "_Ezabatu betiko"
 msgid "_Open Messages"
 msgstr "_Ireki mezuak"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Ikusita"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Birbidalita"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Txikia"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Handia"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "Handiena"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:70
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4450
+#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
-#: ../mail/message-list.c:4289
+#: ../mail/message-list.c:4299
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -16091,7 +14742,15 @@ msgstr ""
 "Ez dago mezurik bilaketako irizpideekin bat datorrenik. Garbitu  (Bilatu -> "
 "Garbitu menua erabiliz) edo aldatu bilaketa."
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4301
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr ""
+"Ezkutuko mezuak daude soilik karpeta honetan. Erabili 'Ikusi -> Erakutsi "
+"ezkutuko mezuak' menua hauek erakusteko."
+
+#: ../mail/message-list.c:4303
 msgid "There are no messages in this folder."
 msgstr "Ez dago mezurik karpeta honetan."
 
@@ -16121,6 +14780,7 @@ msgstr "Bidalitako mezuak"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "Tamaina"
 
@@ -16128,39 +14788,39 @@ msgstr "Tamaina"
 msgid "Subject - Trimmed"
 msgstr "Gaia - moztuta"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Deitu"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Ez birbidali"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "Egin jarraipena"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "Informazio gisa"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Birbidali"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "Ez da beharrezkoa erantzutea"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "Erantzun"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "Erantzun denei"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "Berrikusi"
 
@@ -16185,20 +14845,24 @@ msgid "Subject contains"
 msgstr "gaiak hau dauka"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Addresses contains"
+msgstr "Gaiak edo Helbideak hau dauka"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Recipients contains"
 msgstr "Gaiak edo Bidaltzaileak hau dauka"
 
-#: ../mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "Gaiak edo Bidaltzaileak hau dauka"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Helbide-liburu lokalak"
+msgid "Add local address books to Evolution."
+msgstr "Gehitu helbide-liburu lokalak Evolution-i."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "Helbide-liburu lokaleko funtzionalitate-motorra eskaintzen du."
+msgid "Local Address Books"
+msgstr "Helbide-liburu lokalak"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -16216,8 +14880,8 @@ msgstr ""
 "Aztarnen zerrenda eranskinen ohartarazlearen plugin-ak mezuaren gorputzean "
 "begiratzeko."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "Gako-hitzak"
 
@@ -16227,12 +14891,8 @@ msgid "Attachment Reminder"
 msgstr "Eranskin ohartarazlea"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr ""
-"Begiratu mezuan eranskinei buruzko aztarnarik dagoen eta abisatu eranskina "
-"falta bada"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "Mezu bati eranskina gehitzea ahaztu zaizula gogorarazten dizu."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -16246,23 +14906,23 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Mezuak ez du eranskinik"
 
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "_Gehitu eranskina..."
+
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_Editatu mezua"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"Formatu emateko plugina lineako audioko eranskinak bistaratu eta zuzenean "
-"Evolution-etik erreproduzitzeko."
+msgid "Audio Inline"
+msgstr "Barneko audioa"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "Lineako audio plugin-a"
+msgid "Play audio attachments directly from Evolution."
+msgstr "Audioko eranskinak zuzenean Evolution-etik erreproduzitzen ditu."
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "Hautatu Evolution-en babeskopiaren izena"
 
@@ -16285,139 +14945,138 @@ msgstr "Leheneratu babeskopiatik"
 #: ../plugins/backup-restore/backup-restore.c:289
 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."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
-"Evolution babeskopiatik leheneratu dezakezu. Posta, Egutegi, Kontaktu, "
-"Zirkular eta Helbide-liburu guztiak berreskura ditzake.\n"
-"Ezarpen pertsonalak, mezu iragazki eta bestelako guztiak berreskura ditzake "
-"ere."
+"Evolution babeskopiatik leheneratu dezakezu. Posta, Egutegi, "
+"Kontaktu, Zirkular eta Helbide-liburu guztiak berreskura "
+"ditzake. Ezarpen pertsonalak, mezu iragazki eta bestelako "
+"guztiak berreskura ditzake ere."
 
-#: ../plugins/backup-restore/backup-restore.c:295
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "_Leheneratu Evolution babeskopiako fitxategitik"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Hautatu Evolution-en artxiboa leheneratzeko:"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Aukeratu fitxategia leheneratzeko"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "Egin Evolution direktorioaren babeskopia"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "Leheneratu Evolution-en direktorioa"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "Egiaztatu Evolution-en babeskopia"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "Berrabiatu Evolution"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "Interfaze grafikoarekin"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "Evolution ixten"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "Egin Evolution-en datuen eta ezarpenen babeskopia"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Egin Evolution-en datuen (Posta, Kontaktuak, Egutegia, Zereginak, "
 "Zirkularrak) babeskopia"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "Babeskopia osatuta"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "Evolution berrabiatzen"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "Egin uneko Evolution-en datuen babeskopia"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "Fitxategiak babeskopiatik erauzten"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "Evolution-en ezarpenak kargatzen"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "Aldi baterako babeseko fitxategiak ezabatzen"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "Iturburu lokalak ziurtatzen"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Babeskopia %s karpetan gordetzen"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s karpetatik leheneratzen"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Evolution-en babeskopia"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Evolution leheneratzea"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "Evolution-en datuen babeskopia egiten"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Itxaron Evolution-ek zure datuen babeskopia egiten duen bitartean."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "Evolution-eko datuak berreskuratzen"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Itxaron Evolution-ek zure datuak berreskuratzen dituen bitartean."
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Honek nahikoa iraun dezake zure kontuko datu kopuruaren arabera."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr ""
-"Plugin-a babeskopia egiteko eta Evolution-en datuak eta ezarpenak "
-"leheneratzeko."
-
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Backup and Restore"
+msgstr "Babeskopia eta leheneratu"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "Babeskopia egiteko eta leheneratzeko plugin-a"
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Egin babeskopia eta leheneratu Evolution-en datuak eta ezarpenak."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16484,76 +15143,80 @@ msgstr "_Leheneratu ezarpenak..."
 msgid "_Backup Settings..."
 msgstr "Egin ezarpenen _babeskopia..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Kontaktu automatikoak"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr "_Automatikoki sortutako sarrerak helbide-liburuan mezuei erantzutean"
+#: ../plugins/bbdb/bbdb.c:646
+msgid "Create _address book entries when sending mails"
+msgstr "Sortu helbide-liburuko sarrerak mezuei erantzutean"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "Hautatu kontaktu automatikoen helbide-liburua"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "Berehalako mezularitzako kontaktuak"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sinkronizatu aldizka kontaktuen datuak eta irudiak Pidgin-eko lagunen "
 "zerrendatik"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Hautatu Pidgin-eko lagunen zerrendaren helbide-liburua"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr "Sinkronizatu _lagunen zerrendarekin"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
+"Zure helbide-liburua kudeatzeaz arduratzen da.\n"
+"\n"
 "Automatikoki helbide-liburua betetzen du mezuei erantzuten diezun izen eta "
 "helbideekin. Berehalako Mezularitzako kontaktuak ere betetzen ditu lagunen "
 "zerrendatik."
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-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:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Errorea gertatu da '%s' sortzean: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter-ren ume prozesuak ez du erantzuten. Hiltzen..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Itxaron Bogofilter-en ume prozetzeko itxoiten, amaitzen...ten arte"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Huts egin du Bogofilter-ekin kanalizatzean. Errorearen kodea: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "Bihurtu mezuaren testua _Unicode"
 
@@ -16570,73 +15233,109 @@ msgstr ""
 "dituzten token mezu normalen/baztergarrien tokenak bateratzeko."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter-en aukerak"
+msgid "Bogofilter Junk Filter"
+msgstr "Baztergarriak iragazteko Bogofilter plugina"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Baztergarriak iragazteko Bogofilter plugina"
+msgid "Bogofilter Options"
+msgstr "Bogofilter-en aukerak"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using Bogofilter."
 msgstr "Mezu baztergarriak iragazten ditu Bogofilter erabiliz."
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URLa:"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:339
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Erabili _SSL"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:632
-#: ../plugins/google-account-setup/google-contacts-source.c:358
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:267
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "_Freskatu:"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:289
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:723
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "aste"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDav egutegiaren iturburuak"
+msgid "Add CalDAV support to Evolution."
+msgstr "Gehitu CalDAV euskarria Evolution-i."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV-en iturburuak"
+msgid "CalDAV Support"
+msgstr "CalDAV euskarria"
+
+#: ../plugins/calendar-file/calendar-file.c:204
+msgid "_Customize options"
+msgstr "_Pertsonalizatu aukerak"
+
+#: ../plugins/calendar-file/calendar-file.c:224
+msgid "File _name:"
+msgstr "_Fitxategi-izena:"
+
+#: ../plugins/calendar-file/calendar-file.c:228
+msgid "Choose calendar file"
+msgstr "Aukeratu egutegi-fitxategia"
+
+#: ../plugins/calendar-file/calendar-file.c:272
+msgid "On open"
+msgstr "Irekitzean"
+
+#: ../plugins/calendar-file/calendar-file.c:273
+msgid "On file change"
+msgstr "Fitxategia aldatzean"
+
+#: ../plugins/calendar-file/calendar-file.c:274
+msgid "Periodically"
+msgstr "Aldiro"
+
+#: ../plugins/calendar-file/calendar-file.c:301
+msgid "Force read _only"
+msgstr "Derrigortu irakurtzea _soilik"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Egutegi lokalak"
+msgid "Add local calendars to Evolution."
+msgstr "Gehitu  egutegi lokalak Evolution-i."
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "Egutegi lokaleko funtzionalitate-motorra eskaintzen du."
+msgid "Local Calendars"
+msgstr "Egutegi lokalak"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "Konexio _segurua"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "_Erabiltzaile-izena:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP egutegiak"
+msgid "Add web calendars to Evolution."
+msgstr "Gehitu web egutegiak Evolution-i."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "Webcal eta HTTP egutegientzako funtzionalitate-motorra eskaintzen du."
+msgid "Web Calendars"
+msgstr "Web egutegiak"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -16678,35 +15377,33 @@ msgstr "Eguraldia: trumoi-ekaitza"
 msgid "Select a location"
 msgstr "Hautatu kokaleku bat"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "_Unitateak:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metrikoa (Celsius, zm, e.a.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Inperiala (Fahrenheit, hatzak, e.a.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "Eguraldi-egutegien funtzionalitatearen motorra eskaintzen du."
+msgid "Add weather calendars to Evolution."
+msgstr "Gehitu eguraldiaren egutegiak Evolution-i."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Eguraldi-egutegiak"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr "Probako plugin-a lastermenua agertarazten duena gauzak arbelean kopiatzeko."
+msgid "Copy Tool"
+msgstr "Kopiatzeko tresna"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "Kopiatzeko tresna"
+msgid "Copy things to the clipboard."
+msgstr "Kopiatu GAUZAK arbelean."
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16719,11 +15416,11 @@ msgstr ""
 "edo ez."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "Begiratu Evolution posta-bezeroa den abiaratzean."
+msgid "Check whether Evolution is the default mail client on startup."
+msgstr "Begiratu Evolution posta-bezero lehenetsia den abiaratzean."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
+msgid "Default Mail Client"
 msgstr "Posta-bezero lehenetsia"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
@@ -16731,23 +15428,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Evolution posta-bezero lehenetsia izatea nahi duzu?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "Markatu helbide-liburu _lehenetsi gisa"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "Markatu egutegi _lehenetsi gisa"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "Markatu zereginen zerrenda _lehenetsi gisa"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "Markatu zirkularren zerrenda _lehenetsi gisa"
 
@@ -16756,34 +15453,30 @@ msgid "Default Sources"
 msgstr "Iturburu lehenetsiak"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
-msgstr ""
-"Egutegia edo helbide-liburua lehenetsi gisa egiteko funtzionalitatea "
-"eskaintzen du."
+msgid "Mark your preferred address book and calendar as default."
+msgstr "Markatu zure helbide-liburu eta egutegi hobetsiak lehenetsi gisa."
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "Segurtasuna:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
 msgstr "Sailkatu gabe"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "Babestua"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "Ezkutukoa"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "Ezkutu gorenekoa"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "_Goiburu pertsonalizatuak"
 
@@ -16792,7 +15485,7 @@ msgid "Key"
 msgstr "Gakoa"
 
 #: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:396
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "Balioak"
 
@@ -16812,7 +15505,7 @@ msgstr "Helb. el.-aren goiburu pertsonalizatua"
 
 #. 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."
+msgid "Add custom headers to outgoing mail messages."
 msgstr "Gehitu goiburu pertsonalizatua irteerako mezuetan."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
@@ -16876,11 +15569,11 @@ msgstr ""
 "Aukera honek Exchange zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "Bulegotik kanpo"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 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."
@@ -16888,90 +15581,93 @@ msgstr ""
 "Behean idatzitako mezua automatikoki bidaliko zaie bulegoan ez zaudenean \n"
 "mezu bat bidaltzen dizuten guztiei."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "Orain bulegotik kanpo nago"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "Orain bulegoan nago"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "Aldatu Exchange kontuaren pasahitza"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Aldatu pasahitza"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Kudeatu Exchange kontuaren delegatze-ezarpenak"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "Delegatzeko laguntzailea"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "Hainbat"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "Ikusi Exchange-ko karpeta guztien tamaina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "Karpeten tamaina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange-ren ezarpenak"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA URLa:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "A_utentifikatu"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "_Zehaztu postontziaren izena"
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr "Postakutxaren izena erabiltzaile-izenaren _desberdina da"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "_Postontzia:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "_Autentifikazio mota:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr " _Begiratu zein mota onartzen diren"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "Tamaina:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -17012,38 +15708,35 @@ msgstr "Pasahitz berria:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Uneko pasahitza iraungitu egin da. Aldatu pasahitza orain."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Pasahitza %d egunetara iraungituko da."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "Pertsonalizatu"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "Argitaratzailea (irakurri, sortu, editatu)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "Egilea (irakurri, sortu)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "Gainbegiratzailea (irakurtzeko soilik)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "Delegatu baimenak"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s(r)en baimenak"
@@ -17051,7 +15744,7 @@ msgstr "%s(r)en baimenak"
 #. 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:343
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 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."
@@ -17062,84 +15755,96 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "Nire karpeten gainean honako baimenak dituzu:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "Gainera nire elementu pribatuak ikusteko baimena duzu."
 
 #. 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:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr "Hala ere ez duzu baimenik nire elementu pribatuak ikusteko."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "%s(r)en delegatu gisa izendatu zaituzte"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "Delegatu:"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Kendu %s delegatua?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Ezin izan da Active Direktoriora sartu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Ezin izan da Active Direktorio bera aurkitu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Ezin izan da %s delegatua Active Direktorioan aurkitu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Ezin izan da %s delegatua kendu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Ezin izan da delegatuen zerrenda eguneratu."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Ezin izan da %s delegatua gehitu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "Errorea delegatuen zerrenda irakurtzean."
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "_Egutegia:"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "_Kontaktuak:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "Delegatuak"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"Bat ere ez\n"
+"Ikuslea (irakurri soilik)\n"
+"Egilea (irakurri, sortu)\n"
+"Argitaratzailea (irakurri, sortu, editatu)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "Baimenak:"
 
@@ -17166,6 +15871,7 @@ msgstr "_Laburtu baimenak"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "_Zereginak:"
 
@@ -17183,11 +15889,11 @@ msgid "Folder Size"
 msgstr "Karpetaren tamaina"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "Erabiltzailea"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Harpidetu beste erabiltzaileen karpetan"
@@ -17196,20 +15902,20 @@ msgstr "Harpidetu beste erabiltzaileen karpetan"
 msgid "Exchange Folder Tree"
 msgstr "Exchange-ren karpeta-zuhaitza"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "Kendu karpetaren harpidetza..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "\"%s\" karpetaren harpidetza kentzea nahi duzu?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
@@ -17274,18 +15980,18 @@ msgstr "Zure pasahitza 7 egunetan iraungituko da..."
 msgid "_Change Password"
 msgstr "_Aldatu pasahitza"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Baimena ukatuta)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "Erabiltzaile denak:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "Gehitu erabiltzailea"
 
@@ -17403,11 +16109,11 @@ msgstr "_Sentikortasuna:"
 msgid "_User"
 msgstr "_Erabiltzailea"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "Hautatu erabiltzailea"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "Helbide-liburua..."
 
@@ -17420,12 +16126,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Harpidetu beste erabiltzaileen egutegira"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr ""
-"Exchange kontuaren eragiketa eta funzionalitate espezifikoen bilduma "
-"kudeatzeko plugina."
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "Evolution-Exchange hedapenaren paketea aktibatzen du."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17571,7 +16273,7 @@ msgid "Folder offline"
 msgstr "Karpeta lineaz kanpo"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "Errore generikoa"
 
@@ -17690,7 +16392,9 @@ msgid "Unknown error looking up {0}"
 msgstr "Errore ezezaguna {0} bilatzean"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
 msgstr "Errore ezezaguna."
 
@@ -17771,35 +16475,39 @@ msgid "Check folder permissions"
 msgstr "Begiratu karpetaren baimenak"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr "Automatikoki abiarazten du editorea mezu-prestatzailean tekla sakatzean"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr "Automatikoki abiarazi mezu berri bat editatzen denean"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "Kanpoko editore lehenetsia"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "Komando lehenetsia editore gisa erabiltzeko."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr ""
-"Kanpoko editore bat mezu-prestatzaile gisa erabiltzeko plugin-a. Testu "
-"soileko mezuak bakarrik bidal ditzakezu."
-
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "Kanpoko editorea"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "Erabili kanpoko editore bat testu soileko mezuak prestatzeko."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "Ezin da sortu aldi baterako fitxategia"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "Editorea ezin da abiarazi"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -17807,7 +16515,19 @@ msgstr ""
 "Evolution-ek ezin du aldi baterako fitxategia sortu zure posta gordetzeko. "
 "Saiatu beranduago."
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr "Kanpoko editorea oraindik exekutatzen dago"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+"Kanpoko editorea oraindik exekutatzen dago. Mezu-prestatzailearen leihoa "
+"ezin da itxi editorea aktibo dagoen bitartean."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
@@ -17815,25 +16535,22 @@ msgstr ""
 "Pluginen hobespenetan zehaztutako kanpoko editorea ezin da abiarazi. Saiatu "
 "beste editore batekin."
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "Prestatu _kanpoko editorean"
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "Idatzi mezuak kanpoko editore bat erabiliz"
-
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "Exekutatuko den komandoa (editorea abiarazteko):"
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Emacs-entzako erabili \"xemacs\"\n"
-"VI-rentzako erabili \"gvim\""
+"VI-rentzako erabili \"gvim -f\""
+
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+msgid "Compose in External Editor"
+msgstr "Prestatu kanpoko editorean"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
@@ -17849,40 +16566,51 @@ msgstr "_Aurpegia"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
-"Erantsi aurpegiaren goiburukoa irteerako mezuetan. Aurreneko aldiz "
-"erabiltzaileak 48*48 png tamainako irudia konfiguratu behar du. Base64 "
-"kodeketan oinarrituta dago eta honako lekuan gordetzen da: ~/.evolution/"
-"faces. Hemendik aurrera bidaltzen diren mezuetan erabiliko da."
+"Erantsi aurpegiaren goiburukoa irteerako mezuetan.\n"
+"\n"
+"Aurreneko aldiz erabiltzaileak 48*48 png tamainako irudia "
+"konfiguratu behar du. Base64 kodeketan oinarrituta dago eta "
+"honako lekuan gordetzen da: ~/.evolution/faces. "
+"Hemendik aurrera bidaltzen diren mezuetan erabiliko da."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr "Baimendu posta-karpeten harpidetza kentzea albo-barrako testuinguruko menuan."
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "Kendu karpeten harpidetza"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr ""
+"Kendu harpidetza IMAP karpeta batetik saguaren eskuineko "
+"botoiarekin klik eginez karpeten zuhaitzean"
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "Harpidetza _kendu"
 
-#: ../plugins/google-account-setup/google-source.c:421
+#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:499
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Sartu %s erabiltzailearen pasahitza harpidetutako egutegien zerrendak "
 "atzitzeko."
 
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:604
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17891,45 +16619,40 @@ msgstr ""
 "Ezin da daturik irakurri Google-ren zerbitzaritik.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:739
 msgid "Cal_endar:"
 msgstr "_Egutegia:"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:774
 msgid "Retrieve _list"
 msgstr "Eskuratu _zerrenda"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:306
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>Zerbitzaria</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "Goolgle-ren egutegia eta kontaktuak konfiguratzeko plugina."
+msgid "Add Google Calendars to Evolution."
+msgstr "Gehitu Google-ren egutegiak Evolution-i."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Google-ren iturburuak"
+msgid "Google Calendars"
+msgstr "Google egutegiak"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "Egiaztapen-zerrenda"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "GroupWise-ko egutegien eta kontaktuen iturburua konfiguratzeko plugina."
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "Gehitu Novell-en GroupWise euskarria Evolution-i."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "GroupWise kontuaren konfigurazioa"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17954,11 +16677,11 @@ msgstr ""
 "Egin klik 'Aurrera' botoian partekatutako karpeta instalatzeko\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "Instalatu karpeta partekatua"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "Karpeta partekatuaren instalazioa"
 
@@ -17996,11 +16719,11 @@ msgstr "_Gaitu"
 msgid "_Junk List"
 msgstr "_Baztergarrien zerrenda"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "Mezua zuzendu"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
@@ -18008,11 +16731,11 @@ msgstr ""
 "Mezua zuzentzeak hartzailearen postontzitik kenduko dela adierazten du. Ziur "
 "zaude hori egitea nahi duzula?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "Mezua ongi zuzendu da"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "Zuzendu mezua"
 
@@ -18021,89 +16744,121 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "Gehitu Bidaltzeko aukerak GroupWise-ko mezuei"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "GroupWise-ko kontuetako funtzioen plugin-a"
+msgid "Fine-tune your GroupWise accounts."
+msgstr "Doitu zure GroupWise-ko kontuak."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "GroupWise-ren eginbideak"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "Huts egin du mezua zuzentzean"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "Zerbitzariak ez du baimentzen hautatutako mezua zuzentzea."
 
-#: ../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
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "&quot;{0}&quot; izeneko kontua badago. Egiaztatu zure karpeten zuhaitza."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "Kontua badago lehendik ere"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "Erabiltzaile baliogabea"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"Proxy-ko saio-hasierak &quot;{0}&quot; gisa ez du arrakastarik izan. "
+"Egiaztatu zure helb. elektronikoa eta saiatu berriro."
+
 #. 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/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Ezin zaio proxy-aren sarbidetza eman &quot;{0}&quot; erabiltzaileari"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "Zehaztu erabiltzailea"
 
 #. 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/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "Jadanik eman dizkiozu proxy-aren baimenak erabiltzaile honi."
 
 #. 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/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "Baliozko erabiltzaile-izena zehaztu behar duzu proxy-aren baimenak emateko."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "&quot;{0}&quot; izeneko kontua badago. Egiaztatu zure karpeten zuhaitza."
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Ezin duzu karpeta partekatu zehaztutako &quot;{0}&quot; erabiltzailearekin"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "Kontua badago lehendik ere"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "Erabiltzaile-izen bat zehaztu behar duzu zerrendari gehitzeko"
 
-#: ../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 ""
-"Proxy-ko saio-hasierak &quot;{0}&quot; gisa ez du arrakastarik izan. "
-"Egiaztatu zure helb. elektronikoa eta saiatu berriro."
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+msgid "Do you want to resend the meeting ?"
+msgstr "Bilera berriro bidaltzea nahi duzu?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "Bilera errepikakorra berriro bidaltzea nahi duzu?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+msgid "Do you want to retract the original item ?"
+msgstr "Jatorriko elementua zuzendu nahi duzu?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "Jatorrizkoa kendu egingo da hartzailearen postontzitik."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 msgid "This is a recurring meeting"
 msgstr "Hau gertaera errepikakorra da"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr "Bilera berri bat sortuko du existitzen den bileraren xehetasunak erabiliz."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+"Bilera berri bat sortuko du existitzen den bileraren xehetasunak erabiliz. "
+"Errepikapenen araua berriro sartu behar da."
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 msgid "Would you like to accept it?"
 msgstr "Nahi duzu hau onartzea?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 msgid "Would you like to decline it?"
 msgstr "Nahi duzu hau ukatzea?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "Ezin duzu karpeta partekatu zehaztutako &quot;{0}&quot; erabiltzailearekin"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "Erabiltzaile-izen bat zehaztu behar duzu zerrendari gehitzeko"
-
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "Onartu behin-behinekoa"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+msgid "Rese_nd Meeting..."
+msgstr "_Birbidali bilera..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Erabiltzaileak:</b>"
@@ -18117,7 +16872,7 @@ msgid "Con_tacts..."
 msgstr "_Kontaktuak..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "Mezua"
 
@@ -18200,10 +16955,10 @@ msgstr "<b>Kontuaren izena</b>"
 msgid "Proxy Login"
 msgstr "Proxy-aren saio-hasiera"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
@@ -18211,17 +16966,17 @@ msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
 #. 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:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "_Proxy-aren saio-hasiera..."
 
 #. 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.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Proxy fitxa eskuragarri egongo da kontua konektatutakoan soilik."
 
 #. 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.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proxy fitxa kontua gaitutakoan soilik egongo da eskuragarri."
 
@@ -18229,101 +16984,101 @@ msgstr "Proxy fitxa kontua gaitutakoan soilik egongo da eskuragarri."
 msgid "Advanced send options"
 msgstr "Bidaltzeko aukera aurreratuak"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "Sartu erabiltzaileak eta ezarri baimenak"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "Partekatutako _karpeta berria..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Partekatzea"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "Jakinarazpen pertsonalizatua"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "Gehitu   "
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "Aldatu"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "Mezuaren egoera"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "Nork:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "Sorrera-data:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "Banatuta: "
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "Irekita: "
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "Onartua: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "Ezabatuta: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "Ukatua: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "Eginda: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "Banatu gabea: "
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "Jarraitu mezuaren egoera..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "Hula egutegi-iturburua konfiguratzeko plugin-a"
+msgid "Add Hula support to Evolution."
+msgstr "Gehitu Hula euskarria Evolution-i."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Hula kontuaren konfigurazioa"
+msgid "Hula Support"
+msgstr "Hula euskarria"
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "Goiburu pertsonalizatuak"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "IMAP goiburuak"
 
@@ -18340,10 +17095,6 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "Oinarrizko eta _posta-zerrenden goiburuak (lehenetsia)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "Jaso goiburu _guztiak"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18353,7 +17104,7 @@ msgstr ""
 "jasotzeko.\n"
 "Honi ez ikus egin dezaiokezu \"Goiburu guztiak\" aukeratzen baduzu."
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18361,7 +17112,7 @@ msgstr ""
 "Hautatu IMAP goiburuaren hobespenak.\n"
 "Zenbat eta goiburu gehiago eduki denbora gehiago beharko du deskargatzeko."
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18369,53 +17120,23 @@ msgstr ""
 "_Oinarrizko goiburuak - (azkarrena)\n"
 "Erabili hau posta-zerrendetan oinarritutako iragazkirik ez baduzu nahi."
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+msgid "_Fetch All Headers"
+msgstr "_Jaso goiburu guztiak"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "IMAP-eko kontuetako funtzioen plugin-a"
+msgid "Fine-tune your IMAP accounts."
+msgstr "Doitu zure IMAP kontuak."
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP funtzioak"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "_Inportatu egutegira"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "_Inportatu zereginetara"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "Inportatu ICS"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "Hautatu zeregin-zerrenda"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "Hautatu egutegia"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "_Inportatu"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "Inportatu egutegira"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "ICS eranskinak inportatzen ditu egutegira."
-
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "HAL (Hardware Abstraction Layer) ez da kargatu"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18424,7 +17145,7 @@ msgstr ""
 "zerbitzua eta berrabiarazi programa hau, edo jar zaitez sistemako "
 "administratzailearekin harremanetan."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "iPod-a bilatzeak huts egin du"
 
@@ -18442,155 +17163,157 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar formatua (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr ""
-"Sinkronizatu hautatutako zeregina/zirkularra/egutegia/helbide-liburua Apple "
-"iPod-arekin"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
 msgstr "Sinkronizatu iPod-arekin"
 
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize your data with your Apple iPod."
+msgstr "Sinkronizatu zure datuak zure Apple iPod-arekin."
+
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod sinkronizatzea"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Huts egin du '%s' egutegia kargatzean."
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "'%s' egutegiko hitzordu bat bilera honekin gatazka du."
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Hitzordua '%s' egutegian aurkitu da"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
 msgstr "Ezin da egutegirik aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ezin da bilera hau egutegietan aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr "Ezin da zeregin hau zereginen zerrendetan aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr "Ezin da zirkular hau zirkularren zerrendetan aurkitu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+msgid "Opening the calendar. Please wait.."
+msgstr "Egutegia irekitzen. Itxaron..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr "Hitzorduaren existitzen den bertsioa bilatzen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "Ezin da elementua analizatu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Ezin da bidali elementua '%s' egutegira. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Bidali '%s' egutegira onartuta bezala"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Bidali '%s' egutegira saialdi gisa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Bidali '%s' egutegira baztertua bezala"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' egutegira bertan behera utzita bezala bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Antolatzaileak %s delegatua kendu du"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Bertan behera uztearen mezua delegatuari bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Ezin izan da bertan behera uztearen oharra delegatuari bidali"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Partaide-egoera ezin da eguneratu egoera baliogabea delako"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ezin da partaideak eguneratu. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "Partaide-egoera eguneratu da"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "Bileraren informazioa bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
 msgstr "Zereginaren informazioa bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "Zirkularraren informazioa bidalita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ezin da bileraren informazioa bidali. Bilera ez da existitzen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "Unable to send task information, the task does not exist"
 msgstr "Ezin da zereginaren informazioa bidali. Zeregina ez da existitzen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Ezin da zirkularraren informazioa bidali. Zirkularra ez da existitzen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "Erantsitako egutegia ez da baliozkoa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "Mezuak egutegi bat duela dio, baina egutegia ez da baliozko iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr "Egutegiko elementua ez da baliozkoa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18598,11 +17321,11 @@ msgstr ""
 "Mezuak egutegi bat du, baina egutegiak ez du gertaerarik, zereginik edo "
 "libre/okupatuta informaziorik"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "Erantsitako egutegiak hainbat elementu ditu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18610,40 +17333,34 @@ msgstr ""
 "Fitxategia gorde eta egutegia inportatu behar da elementu guzti horiek "
 "prozesatzeko"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "This meeting recurs"
 msgstr "Bilera hau errepikatu egiten da"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
 msgstr "Zeregin hau errepikatu egiten da"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "This memo recurs"
 msgstr "Zirkular hau errepikatu egiten da"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "_Ezabatu mezua ekin ondoren"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "Gatazka bilaketan"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Hautatu egutegiak bileren arteko gatazkak bilatzeko"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "Gaur"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
@@ -18662,11 +17379,6 @@ msgstr "Gaur %H:%M:%S"
 msgid "Today %l:%M:%S %p"
 msgstr "Gaur %l:%M:%S %p"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "Bihar"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -19008,110 +17720,107 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b>(e)k partekatutako zirkular hau bertan behera utzi du:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "_Ireki egutegia"
 
-#: ../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
-msgid "_Decline"
-msgstr "_Ukatu"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "_Ukatu"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "_Onartu"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "_Ukatu denak"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "_Behin-behinekoak denak"
 
-#: ../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:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "_Behin-behinekoa"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "_Onartu denak"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "_Bidali informazioa"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "_Eguneratu partaidearen egoera"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "_Eguneratu"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "Hasiera:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "Amaiera:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "Iruzkina"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "Bidali _eguneraketak partaideei"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "_Aplikatu instantzia guztiak"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "Erakutsi ordua _libre gisa"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "_Mantendu nire oroigarria"
 
-#: ../plugins/itip-formatter/itip-view.c:1157
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1160
 msgid "_Inherit reminder"
 msgstr "_Heredatu oroigarria"
 
-#: ../plugins/itip-formatter/itip-view.c:1911
-msgid "_Tasks :"
-msgstr "_Zereginak:"
-
-#: ../plugins/itip-formatter/itip-view.c:1913
-msgid "Memos :"
-msgstr "Zirkularrak :"
+#: ../plugins/itip-formatter/itip-view.c:1914
+msgid "_Memos:"
+msgstr "_Zirkularrak:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "Testuen/Egutegien zatiak mezuetan bistaratzen ditu"
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Bistaratu \"testuen/egutegien\" MIME zatiak mezuetan."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -19138,13 +17847,13 @@ msgid "Proxy _Logout"
 msgstr "_Irten proxy-aren saiotik"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "Baimendu kontuak desgaitzea."
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "Desgaitu kontua"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr "Desgaitu kontu bat saguaren eskuineko botoiarekin klik eginez karpeten zuhaitzean."
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Egin 'biip' edo erreproduzitu soinu-fitxategia."
@@ -19219,20 +17928,20 @@ msgstr "Ikonoa keinuka agertu behar duen ala ez."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Mezu berrien jakinarazpena sarrerako ontzian soilik erakutsi ala ez."
 
-#: ../plugins/mail-notification/mail-notification.c:256
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "Sortu _D-Bus mezua"
 
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "Evolution-en mezu-jakinarazpena"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:389
 msgid "Mail Notification Properties"
 msgstr "Mezu-jakinarazpenaren propietateak"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19247,91 +17956,186 @@ msgstr[1] ""
 "%d mezu berri jaso dituzu\n"
 "%s(e)n."
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:503
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Mezu berri %d jaso duzu."
 msgstr[1] "%d mezu berri jaso dituzu."
 
-#: ../plugins/mail-notification/mail-notification.c:501
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "Mezu berria"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:588
 msgid "Show icon in _notification area"
 msgstr "Erakutsi ikonoa jakinarazpen-arean"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "B_link icon in notification area"
 msgstr "Ikono _keinukaria jakinarazpen-arean"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr "Bistaratu _mezua ikonoarekin bat."
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:774
 msgid "_Play sound when new messages arrive"
 msgstr "_Erreproduzitu soinua mezu berriak iristean."
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "_Soinu-seinalea"
 
-#: ../plugins/mail-notification/mail-notification.c:759
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "Erreproduzitu _soinu-fitxategia"
 
-#: ../plugins/mail-notification/mail-notification.c:770
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
 msgstr "Zehaztu _fitxategi-izena:"
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
 msgstr "Hautatu soinu-fitxategia"
 
-#: ../plugins/mail-notification/mail-notification.c:772
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "E_rreproduzitu"
 
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
 msgstr "Jakinarazi _sarrerako ontziko mezu berriak soilik"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Mezuaren jakinarazpena"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "Jakinaraziko zaitu mezu berriak iristean."
+
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
 msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr ""
-"D-Bus mezua sortzen du edo erabiltzailea jakinarazten du ikono batekin "
-"jakinarazpeneko arean eta jakinarazpeneko mezu batekin mezu berri bat "
-"iristean."
+"Hautatutako egutegiak badu '%s' gertaera jadanik. Gertaera zaharra editatzea "
+"nahi duzu?"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid "Mail Notification"
-msgstr "Mezuaren jakinarazpena"
+#: ../plugins/mail-to-task/mail-to-task.c:379
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+"Hautatutako zereginen-zerrendak badu '%s' zeregina jadanik. Zeregin zaharra editatzea "
+"nahi duzu?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:382
+#, c-format
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+"Hautatutako zirkularren zerrendak badu '%s' zirkularra jadanik. Zirkular zaharra editatzea "
+"nahi duzu?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:399
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr "Posta batetik bilerak sortzeko plugin-a"
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
+"Hautatutako egutegiak baditu jadanik gertaera batzuk emandako mezuentzako. "
+"Dena den, gertaera berriak sortzea nahi dituzu?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "_Bihurtu bileran"
+#: ../plugins/mail-to-task/mail-to-task.c:402
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr ""
+"Hautatutako zereginen zerrendak baditu jadanik zeregin batzuk emandako mezuentzako. "
+"Dena den, zeregin berriak sortzea nahi dituzu?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "Posta - Bilera"
+#: ../plugins/mail-to-task/mail-to-task.c:405
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
+"Hautatutako zirkularren zerrendak baditu jadanik zirkular batzuk emandako mezuentzako. "
+"Dena den, zirkular berriak sortzea nahi dituzu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
+"Hautatutako egutegiak badu jadanik gertaera bat emandako mezuarentzako. "
+"Gertaera berria sortzea nahi duzu?"
+msgstr[1] ""
+"Hautatutako egutegiak badu jadanik zeregin batzuk emandako mezuentzako. "
+"Gertaera berria sortzea nahi duzu?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:429
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+"Hautatutako zereginen zerrendak badu jadanik zeregin bat emandako mezuarentzako. "
+"Zeregin berria sortzea nahi duzu?"
+msgstr[1] ""
+"Hautatutako zereginen zerrendak badu jadanik zeregin batzuk emandako mezuentzako. "
+"Zeregin berria sortzea nahi duzu?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:435
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+"Hautatutako zirkularren zerrendak badu jadanik zirkular bat emandako mezuarentzako. "
+"Zirkular berria sortzea nahi duzu?"
+msgstr[1] ""
+"Hautatutako zirkularren zerrendak badu jadanik zirkular batzuk emandako mezuentzako. "
+"Zirkular berria sortzea nahi duzu?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:494
+msgid "[No Summary]"
+msgstr "[Laburpenik ez]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:505
+msgid "Invalid object returned from a server"
+msgstr "Zerbitzariak objektu baliogabea itzuli du"
+
+#: ../plugins/mail-to-task/mail-to-task.c:570
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "Errorea gertatu da prozesatzean: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ezin da egutegia ireki. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:292
+#: ../plugins/mail-to-task/mail-to-task.c:606
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr ""
+"Hautatutako iturburua irakurtzeko soilik denez, leku horretan ezin da "
+"gertaerarik sortu. Hautatu beste iturburu bat."
+
+#: ../plugins/mail-to-task/mail-to-task.c:609
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19339,24 +18143,62 @@ msgstr ""
 "Hautatutako iturburua irakurtzeko soilik denez, leku horretan ezin da "
 "zereginik sortu. Hautatu beste iturburu bat."
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:612
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr "Posta batetik zereginak sortzeko plugin-a"
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+msgstr ""
+"Hautatutako iturburua irakurtzeko soilik denez, leku horretan ezin da "
+"zirkularrik sortu. Hautatu beste iturburu bat."
+
+#: ../plugins/mail-to-task/mail-to-task.c:821
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "Ezin da iturburuko zerrenda lortu. %s."
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "Bihurtu mezu bat zeregin batean."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "Bihurtu _zereginean"
+msgid "Create a Mem_o"
+msgstr "Sortu _zirkularra"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Create a _Meeting"
+msgstr "Sortu _bilera"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+msgid "Create a _Task"
+msgstr "Sortu z_eeregina"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+msgid "Create an _Event"
+msgstr "Sortu _gertaera"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+msgid "Mail-to-Task"
 msgstr "Posta - zeregina"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "Bihurtu hautatutako mezua zeregin berri batean"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+msgid "Create a new event from the selected message"
+msgstr "Sortu gertaera berri bat hautatutako mezutik"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+msgid "Create a new meeting from the selected message"
+msgstr "Sortu bilera berri bat hautatutako mezutik"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+msgid "Create a new memo from the selected message"
+msgstr "Sortu zirkular berri bat hautatutako mezutik"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+msgid "Create a new task from the selected message"
+msgstr "Sortu zeregin berri bat hautatutako mezutik"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -19380,10 +18222,10 @@ msgid "Mailing _List"
 msgstr "Posta-_zerrenda"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
-"Posta-zerrendako komandoen ekintzak eskaintzen ditu (harpidetu, kendu "
-"harpidetza,...)"
+"Posta-zerrendako komandoen ekintzak lantzen ditu (harpidetu, kendu "
+"harpidetza, e.a.)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -19535,12 +18377,12 @@ msgstr ""
 "Uneko karpetako mezuak soilikm irakurritako gisa markatzea nahi duzu, edo "
 "uneko karpetan eta haren azpikarpeta guztietan ere bai?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
+#: ../plugins/mark-all-read/mark-all-read.c:166
+msgid "In Current Folder and _Subfolders"
 msgstr "Uneko karpetan eta _azpikarpetetan"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
+#: ../plugins/mark-all-read/mark-all-read.c:180
+msgid "In Current _Folder Only"
 msgstr "Uneko _karpetan soilik"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
@@ -19552,20 +18394,20 @@ msgid "Mark Me_ssages as Read"
 msgstr "Markatu _mezuak irakurritako gisa"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "Karpetako mezu guztiak irakurrita bezala markatzeko erabiltzen da"
+msgid "Mark all messages in a folder as read."
+msgstr "Markatu karpetako mezu guztiak irakurrita gisa."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "Mono plugin-ak inplementatzeko plugin-a."
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Mono kargatzailea"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr "Onartu Mono-n garatutako pluginak."
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "Plugin-ak kudeatzeko (gaitzeko edo desgaitzeko) plugin-a"
+msgid "Manage your Evolution plugins."
+msgstr "Kudeatu Evolution-en pluginak."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -19602,27 +18444,19 @@ msgstr "Aurkezpen orokorra"
 msgid "Plugin"
 msgstr "Plugin-a"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"Probak egiteko plugin-a, HTML motako mezuak desgaitzea utziko dizun plugin "
-"formateatzailea.\n"
-"\n"
-"Plugin hau egiaztatu gabeko demostrazioak egiteko kodea bakarrik da.\n"
-
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "Testu soileko modua"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
 msgstr "Lehenetsi testu soila"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "Ikusi mezuak testu soil gisa, nahiz eta HTML edukiak izan."
+
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Erakutsi HTML egonez gero"
@@ -19644,8 +18478,8 @@ msgid "Evolution Profiler"
 msgstr "Evolution Profilatzailea"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "Profil-datuen gertaeren egunkaria idazten du."
+msgid "Profile data events in Evolution (for developers only)."
+msgstr "Profilaren datuen gertaerak Evolution-en (garatzaileentzako soilik)."
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19660,44 +18494,74 @@ msgid "Outlook personal folders (.pst)"
 msgstr "Outlook karpeta pertsonalak (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
 msgstr "_Helbide-liburua"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
 msgstr "_Hitzorduak"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:334
 msgid "_Journal entries"
 msgstr "_Egunkari-sarrerak"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
 msgstr "Outlook-eko datuak inportatzen"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "Egutegiak web guneetan argitaratzea baimentzen du"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "Egutegia argitaratzea"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Helbideak"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "Argitaratu egutegiak webguneetan."
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "_Argitaratu egutegiaren informazioa"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, c-format
+msgid "Could not open %s:"
+msgstr "Ezin izan da %s ireki:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "Ezin izan da %s ireki: errore ezezaguna"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "Errore bat gertatu da %s(e)n argitaratzean:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "%s(e)n ongi argitaratu da"
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "Huts egin du %s muntatzean:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:624
 msgid "Are you sure you want to remove this location?"
 msgstr "Ziur zaude kokaleku hau kendu nahi duzula?"
 
+#: ../plugins/publish-calendar/publish-calendar.c:788
+msgid "Could not create publish thread."
+msgstr "Ezin izan da argitalpenaren haria sortu."
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">Kokalekua</span>"
@@ -19754,27 +18618,41 @@ msgstr ""
 msgid "Service _type:"
 msgstr "Zerbitzu _mota:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "Time _duration:"
+msgstr "_Iraupena:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "_Fitxategia:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "_Pasahitza"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "Argitaratu _honela:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "_Gogoratu pasahitza"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "_Erabiltzaile-izena:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"egun\n"
+"aste\n"
+"hilabete"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19782,11 +18660,17 @@ msgstr ""
 "iCal\n"
 "Libre/okupatuta"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "Ezin izan da egutegia argitaratu: egutegiaren motorra ez da gehiago existituko"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "Kokaleku berria"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "Editatu kokalekua"
 
@@ -19814,179 +18698,137 @@ msgstr "Python-en garatutako plugin bat beste pluginak kargatzeko."
 msgid "Python Loader"
 msgstr "Python kargatzailea"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (inkorporatua)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ez da aurkitu. Kodea: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Huts egin du kanalizazioa sortzean: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Errorea sardetu  ondoren: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin-en ume prozesuak ez du erantzuten. Hiltzen..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Spamassassin-en ume prozesua eten arte itxoiten. Amaitzen..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Huts egin du SpamAssasin-en kanalizazioak. Errorearen kodea: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin ez dago erabilgarri."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr ""
 "SpamAssassin fidagarritasun handiagoa edukitzea eragingo du, baita motelagoa "
 "izatea ere"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "_Sartu urruneko probak"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"Mezu baztergarriak iragazten ditu SpamAssassin erabiliz. Plugin honek "
-"SpamAssassin instalatuta egotea eskatzen du."
+msgid "Filter junk messages using SpamAssassin."
+msgstr "Mezu baztergarriak iragazten ditu SpamAssassin erabiliz."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin-en aukerak"
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin, baztergarrien iragazkia"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin, baztergarriak iragazteko osagaia"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "Eranskin guztiak edo mezuen zatiak aldi berean gordetzeko plugin-a"
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "Gorde eranskinak"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "Gorde eranskinak..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "Gorde eranskin guztiak"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "Hautatu oinarrizko izena gordetzeko"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "MIME mota"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "Gorde"
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin-en aukerak"
 
 #.
 #. * 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:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%Y %B"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UIDa"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "Azalpenen zerrenda"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "Kategorien zerrenda"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "Iruzkinen zerrenda"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "Sortuta"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "Kontaktuen zerrenda"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "Hasi"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "Amaitu"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "Osatutako ehunekoa:"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "URLa"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "Partaideen zerrenda"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "Aldatua"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "CSV formatuaren aukera aurreratuak"
+#: ../plugins/save-calendar/csv-format.c:523
+msgid "A_dvanced options for the CSV format"
+msgstr "CSV formatuaren aukera _aurreratuak"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "Gehitu goiburua aurrean"
+#: ../plugins/save-calendar/csv-format.c:530
+msgid "Prepend a _header"
+msgstr "Gehitu _goiburua aurrean"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "Balioaren mugatzailea:"
+#: ../plugins/save-calendar/csv-format.c:539
+msgid "_Value delimiter:"
+msgstr "_Balioaren mugatzailea:"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "Erregistroaren mugatzailea:"
+#: ../plugins/save-calendar/csv-format.c:546
+msgid "_Record delimiter:"
+msgstr "_Erregistroaren mugatzailea:"
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "Kapsulatu balioak:"
+#: ../plugins/save-calendar/csv-format.c:553
+msgid "_Encapsulate values with:"
+msgstr "Kapsulatu _balioak:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr "Komaz bereiztutako balio formatua (.csv)"
 
@@ -19995,7 +18837,7 @@ msgid "Save Selected"
 msgstr "Gorde hautatutakoa"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
+msgid "Save a calendar or task list to disk."
 msgstr "Gorde hautatutako egutegi edo zereginen zerrenda diskoan."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
@@ -20011,21 +18853,25 @@ msgstr "Gorde _diskoan"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF formatua (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:104
+msgid "_Format:"
+msgstr "_Formatua:"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
 msgstr "Hautatu helburuko fitxategia"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "Hautatu iturburu bat"
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "Hautatu azkar egutegi edo zereginen zerrenda ikusteko."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "Hautatu egutegi bakuna edo zereginen iturburua ikusteko."
+msgid "Select One Source"
+msgstr "Hautatu iturburu bat"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -20047,15 +18893,15 @@ msgstr "Hasierako kontua konfiguratzeko lagunduko zaitu."
 msgid "Setup Assistant"
 msgstr "Konfigurazioaren morroia"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Evolution konfiguratzeko laguntzailea"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Ongi etorri"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -20068,35 +18914,35 @@ msgstr ""
 "\n"
 "Jarraitzeko, egin klik \"Aurrera\" botoian. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
 msgstr "Inportatu fitxategiak"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
 msgstr "Hautatu inportatu nahi duzun informazioa:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
 #, c-format
 msgid "Importing data."
 msgstr "Datuak inportatzen."
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
 msgstr "Itxaron"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "Mezuaren haria gaiaren arabera egin behar den adierazten du."
+msgid "Sort mail message threads by subject."
+msgstr "Ordenatu mezuen hariak gaiaren arabera."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -20119,15 +18965,15 @@ msgstr ""
 "Gakoa/balioa tuplen zerrenda txantiloien pluginarentzako mezuaren gorputzean "
 "ordezteko."
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
 msgstr "Titulurik ez"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "Gorde _txantiloi gisa"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "Gorde txantiloi gisa"
 
@@ -20136,31 +18982,62 @@ msgid "Drafts based template plugin"
 msgstr "Zirriborroak (txantiloien pluginean oinarrituta)"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "yTNEF erabiltzen duen plugin bakuna TNEF motako eranskinak dekodetzeko."
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "Dekodetu TNEF (winmail.dat) eranskinak Microsoft Outlook-etik."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "TNEF eranskinen dekodetzailea"
+msgid "TNEF Decoder"
+msgstr "TNEF dekodetzailea"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+msgid "Inline vCards"
+msgstr "Lineako vCard-ak"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "Erakutsi vCard-ak zuzenean mezuetan."
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "Erakutsi vCard osoa"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "Erakutsi vCard trinkoa"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+msgid "There is one other contact."
+msgstr "Beste kontaktu bat dago."
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Bste kontaktu %d dago."
+msgstr[1] "Bste %d kontaktu daude."
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+msgid "Save in Address Book"
+msgstr "Gorde helbide-liburuan"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "WebDAV kontaktuak konfiguratzeko plugina."
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Gehitu WebDAV kontaktuak Evolution-en."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV kontaktuak"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URLa:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Saihestu IfMatch (Apache < 2.2.8 bertsioan behar da)"
 
@@ -20245,42 +19122,62 @@ msgstr ""
 "keyring edo ~/.gnome2_private/Evolution pasahitzen fitxategitik."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid "Initial attachment view"
+msgstr "Hasierako eranskinaren ikuspegia"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "Initial file chooser folder"
+msgstr "Hasierako fitxategi-hautatzailearen karpeta"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "Hasierako karpeta GtkFileChooser elkarrizketa-koadroarentzako."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+"Hasierako ikuspegia eranskinen barraren trepetarentzako. \"0\" ikonoen ikuspegia, "
+"\"1\" zerrendaren ikuspegia."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr "Azken bertsio-berritutako konfigurazio-bertsioa"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Lineaz kanpo erabiltzeko, diskora sinkronizatzeko karpeten bideen zerrenda"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
 msgstr "Ez-proxy ostalariak"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Pasahitza HTTP proxy-an autentifikatzean erabiltzeko."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "Proxy-aren konfigurazio modua"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "SOCKS proxy-aren ostalari-izena"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "SOCKS proxy-aren ataka"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "HTTP Seguruaren proxy-aren ostalari-izena"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
 msgstr "HTTP Seguruaren proxy-aren ataka"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20292,23 +19189,23 @@ msgstr ""
 "eskuzko konfigurazioa\" eta \"erabili auto-konfigurazioko urlak emandako "
 "proxy-aren konfigurazioa\" hurrenez hurren)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "Albo-panela ikusgai dago"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "Saltatu garapen-abisuaren elkarrizketa-koadroa"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "Egoera-barra ikusgai dago"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20316,19 +19213,19 @@ msgstr ""
 "Evolution-en konfigurazio-bertsioa, konfigurazio maila altuarekin/baxuarekin "
 "(\"2.6.0\" adibidez)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr "Leiho nagusiaren altuera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr "Leiho nagusiaren zabalera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
 msgstr "Albo-panelaren zabalera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20336,19 +19233,19 @@ msgstr ""
 "Azken bertsio-berritutako Evolution-en konfigurazio-bertsioa, konfigurazio "
 "maila altuarekin/baxuarekin (\"2.6.0\" adibidez)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "Ordenagailuaren izena HTTP proxy-a egiteko."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Ordenagailuaren izena HTTP Seguruaren proxy-a egiteko."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "Ordenagailuaren izena SOCKSen proxy-a egiteko."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20356,7 +19253,7 @@ msgstr ""
 "\"/apps/evolution/shell/network_config/http_host\" fitxategian definitutako "
 "ordenagailuaren ataka proxy-a egiteko."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20364,7 +19261,7 @@ msgstr ""
 "\"/apps/evolution/shell/network_config/secure_host\" fitxategian "
 "definitutako ordenagailuaren ataka proxy-a egiteko."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20372,7 +19269,7 @@ msgstr ""
 "\"/apps/evolution/shell/network_config/socks_host\" fitxategian definitutako "
 "ordenagailuaren ataka proxy-a egiteko."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20382,7 +19279,7 @@ msgstr ""
 "izan daiteke. \"Tresna-barra\" ezartzen bada botoien estiloa GNOMEko tresna-"
 "barraren ezarpenak zehaztuko du."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 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 "
@@ -20395,55 +19292,55 @@ msgstr ""
 "IPv4 bai IPv6) eta sareko helbideak maskarekin (192.168.0.0/24 antzeko "
 "zerbait) izan daiteke."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "Tresna-barra ikusgai dago"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "Proxy-aren konfigurazioko balioak eskaintzen dituen URLa."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "Erabili HTTP proxy-a"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Erabiltzaile-izena HTTP proxy-a egitean autentifikatzeko."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution lineaz kanpoko moduan abiarazi behar den edo ez"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "Leihoa maximizatu behar den edo ez"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr "Alboko panela ikusgai izango den edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "Egoera-barra ikusgai izango den edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "Tresna-barra ikusgai izango den edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Garapen-abisuaren elkarrizketa-koadroa saltatu behar den edo ez"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Leihoko botoiak ikusgai egongo diren edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "Leihoko botoi-estiloa"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Leihoko botoiak ikusgai daude"
 
@@ -20459,11 +19356,11 @@ msgstr "Konexio aktiboak"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klik egin 'Ados'en konexio hauek ixteko eta lineaz kanpo geratzeko"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "Aukeratu inportatzailearen mota:"
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -20471,11 +19368,11 @@ msgstr ""
 "Aukeratu Evolution-era inportatu nahi duzun fitxategia, eta hautatu "
 "fitxategiaren mota zerrendan."
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "Aukeratu helburua hau inportatzeko"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20487,80 +19384,84 @@ msgstr ""
 "Ez du inportatzeko moduko ezarpenik aurkitu. Berriro saiatu\n"
 "nahi baduzu, sakatu \"Atzera\" botoia.\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "_Fitxategi-izena:"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "Fitxategi-_mota:"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "Inportatu programa _zaharretako datuak eta ezarpenak"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "Inportatu fitxategi _bakarra"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:743
+msgid "_Import"
+msgstr "_Inportatu"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "Evolution-en hobespenak"
 
 #. 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:47 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
 
-#: ../shell/e-shell-window-commands.c:83
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
-msgid "Error executing %s."
-msgstr "Errorea %s exekutatzean."
+msgid "Error executing %s. (%s)"
+msgstr "Errorea %s exekutatzean. (%s)"
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy ez dago instalatuta."
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "Ezin izan da Bug Buddy exekutatu."
 
 #. 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:942
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr ""
 "Hizkuntza Politikarako Sailburuordetza <hizpol ej-gv es>\n"
 "Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>"
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "Evolution-en web gunea"
 
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20568,11 +19469,11 @@ msgstr ""
 "Evolution linean dago.\n"
 "Egin klik botoi honetan lineaz kanpo lan egiteko."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20580,52 +19481,47 @@ msgstr ""
 "Evolution lineaz kanpo dago.\n"
 "Egin klik botoi honetan linean lan egiteko."
 
-#: ../shell/e-shell-window.c:787
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "Aldatu hona: %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "Sistemako errore ezezaguna."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "Ados"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "Argumentu baliogabeak"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "Ezin da OAFen erregistratu"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: ../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:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "Berria"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "Proba berria"
 
-#: ../shell/test/evolution-test-component.c:106
-msgctxt "New"
-msgid "_Test"
-msgstr "_Proba"
-
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "Sortu probako elementu berria"
 
@@ -20668,7 +19564,7 @@ msgstr ""
 "inportatzeko prozesuan zehar gidatuko zaitu."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20705,7 +19601,7 @@ msgstr ""
 "Gogor lan egin dugu, eta espero dugu emaitza zure gustukoa izango\n"
 "dela eta zure ekarpena egitera animatuko zarela!\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20713,43 +19609,43 @@ msgstr ""
 "Eskerrik asko\n"
 "Evolution taldea\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "Ez esan berriro"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "Abiarazi Evolution zehaztutako osagaia aktibatuz"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "Behartu Evolution-en osagai guztiak ixtea"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Behartu Evolution 1.4etik migratzera"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: ../shell/main.c:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "Desgaitu edozein plugin kargatzea."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desgaitu mezuen, kontaktuen eta zereginen aurrebisten panela."
 
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM  eta posta-bezeroa"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20907,7 +19803,7 @@ msgstr ""
 "\n"
 "Editatu fidagarritasun-ezarpenak:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20916,7 +19812,7 @@ msgstr ""
 "Ziurtagiria bidali duenaren ZEaz fidatzen zarenez, besterik esan ezean "
 "ziurtagiriaren autentifikazioaz fidatzen zara."
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20925,51 +19821,51 @@ msgstr ""
 "Ziurtagiria bidali duenaren ZEaz fidatzen ez zarenez, besterik esan ezean "
 "ziurtagiriaren autentifikazioaz ez zara fidatzen."
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:380
-#: ../smime/gui/certificate-manager.c:604
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "Hautatu ziurtatigira inportatzeko..."
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:145
 msgid "All PKCS12 files"
 msgstr "PKCS12 fitxategi guztiak"
 
 #: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:394
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../smime/gui/certificate-manager.c:271
-#: ../smime/gui/certificate-manager.c:480
-#: ../smime/gui/certificate-manager.c:702
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "Ziurtagiri-izena"
 
-#: ../smime/gui/certificate-manager.c:280
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr "Xedeak"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "Serie-zenbakia"
 
-#: ../smime/gui/certificate-manager.c:297
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "Iraungitze-data"
 
-#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "Posta elektronikoko ziurtagiri-fitxategi guztiak"
 
-#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "Helbide elektronikoa"
 
-#: ../smime/gui/certificate-manager.c:613
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "ZE ziurtagiri-fitxategi guztiak"
 
@@ -21071,7 +19967,7 @@ msgstr ""
 "Ziurtagiri-emaile honetaz edozein xedetarako fidatu aurretik, bere politika, "
 "prozedurak eta ziurtagiria aztertu beharko zenituzke (erabilgarri badaude)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "Ziurtagiria"
 
@@ -21147,11 +20043,11 @@ msgstr "Erakundeko Saila (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 hatz-marka"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL bezero-ziurtagiria"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL zerbitzari-ziurtagiria"
 
@@ -21196,7 +20092,7 @@ msgid "_Edit CA Trust"
 msgstr "_Editatu ziurtagiri-emailearen fidagarritasuna"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "Ziurtagiria badago lehendik"
 
@@ -21205,161 +20101,161 @@ msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "Sinatu"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "Enkriptatu"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "Bertsioa"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "1. bertsioa"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "2. bertsioa"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "3. bertsioa"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 - RSA enkriptazioarekin"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 RSA enkriptazioarekin"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA enkriptazioarekin"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA enkriptazioarekin"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "Ziurtagiri-gakoen erabilera"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Netscape-ren ziurtagiri-mota"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Ziurtagiri-emailearen gako-identifikatzailea"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektu-identifikatzailea (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "Algoritmo-identifikatzailea"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "Algoritmo-parametroak"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "Subjektuaren gako publikoaren informazioa"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "Subjektuaren gako publikoaren algoritmoa"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "Subjektuaren gako publikoa"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "Errorea: ezin da luzapena prozesatu"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Objektu-sinatzailea"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL ziurtagiri-emailea"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "Posta elektronikoko ziurtagiri-emailea"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "Sinatzea"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "Errefusatzerik ez"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "Gako-zifraketa"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "Datu-zifraketa"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "Gako-hitzarmena"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "Ziurtagiri-sinatzailea"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL sinatzailea"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "Kritikoa"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "Ez kritikoa"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "Luzapenak"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s - %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Ziurtagiriaren sinaduraren algoritmoa"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "Jaulkitzailea"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "Jaulkitzailearen ID esklusiboa"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "Subjektuaren ID esklusiboa"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "Ziurtagiriaren sinaduraren balioa"
 
@@ -21507,7 +20403,7 @@ msgstr "Gorde hautatutako kontaktuak VCard gisa"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Gorde hautatutako karpetako kontaktuak VCard gisa."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "Hautatu denak"
 
@@ -21641,7 +20537,7 @@ msgid "Month"
 msgstr "_Hilabetea"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Hurrengoa"
 
@@ -21649,8 +20545,8 @@ msgstr "Hurrengoa"
 msgid "Previews the calendar to be printed"
 msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Aurrekoa"
 
@@ -21959,7 +20855,7 @@ msgstr "Harian sartutako mezu-zerrenda"
 msgid "_Group By Threads"
 msgstr "_Elkartu harien arabera"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Mezua"
@@ -22214,199 +21110,183 @@ msgid "Paste messages from the clipboard"
 msgstr "Itsatsi mezuak arbeletik"
 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "_Bidali mezu berria karpetara"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "Bidali era_ntzuna"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "Bidali mezua karpeta publiko batera"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "Bidali mezu baten erantzuna karpeta publiko batera"
-
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "Aurreko _mezu garrantzitsua"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "Inprimatuko den mezuaren aurrebista eskaintzen du"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "Inprimatu mezu hau"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "Birbi_deratu"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Birbideratu (errebotatu) hautatutako mezua norbaiti"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "Testua jatorrizko tamainan berrezartzen du"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "Gorde hautatutako mezuak testu-fitxategi gisa"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "_Posta-zerrendaren bilaketa-karpeta..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "Hartzailearen bilaketa-karpeta..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "_Gaiaren bilaketa-karpeta..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "_Bidaltzailearen bilaketa-karpeta..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "Hautatu testu _osoa"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "Hautatu mezuko testu osoa"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Konfiguratu orrialde-ezarpenak uneko inprimagailuarentzat"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Erakutsi kurtsore keinukaria bistaratutako mezuen gorputzean"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "Erakutsi mezuak posta-goiburu guztiekin"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Erakutsi mezu-iturburua formatu gabe"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "Desezabatu hautatutako mezuak"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "Ez-garrantzitsua"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "_Txikiagotu"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "_Erantsita"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "Kurtsore _modua"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "_Garbitu bandera"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "_Ezabatu mezua"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "_Bilatu mezuan..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "Ban_dera osatuta"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Joan hona"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "_Garrantzitsua"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "_Barnean"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "_Baztergarria"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "Kargatu iru_diak"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "_Mezuaren iturburua"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "_Hurrengo mezua"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "_Tamaina normala"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "E_z-baztergarria"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "Ireki leiho _berrian"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "_Aurreko mezua"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "_Irakurri"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "_Gorde mezua..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "_Berreskuratu mezua"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "_Irakurri gabea"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "_Zooma"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "_Handiagotu"
 
@@ -22767,11 +21647,11 @@ msgid "With _Status"
 msgstr "Eg_oerarekin"
 
 #. 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
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
@@ -22801,19 +21681,19 @@ msgstr ""
 "ordu-zona.\n"
 "Erabili saguaren eskuineko botoia area txikiagotzeko."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Bilduma"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definitu %s(r)en ikuspegiak..."
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "Definitu ikuspegiak"
 
@@ -22823,17 +21703,16 @@ msgid "Define Views for \"%s\""
 msgstr "Definitu \"%s\"(r)en ikuspegiak..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Taula"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "Instantzia"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "Gorde uneko ikuspegia"
 
@@ -22846,17 +21725,17 @@ msgid "_Replace existing view"
 msgstr "_Ordeztu dagoen ikuspegia"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "Ikuspegi pertsonalizatua"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "Gorde ikuspegi pertsonalizatua"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "Definitu ikuspegiak..."
 
@@ -22864,33 +21743,33 @@ msgstr "Definitu ikuspegiak..."
 msgid "C_urrent View"
 msgstr "_Uneko ikuspegia"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "Hautatu ikuspegia: %s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "Uneko ikuspegia ikuspegi pertsonalizatua da"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "Gorde ikuspegi pertsonalizatua..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "Gorde uneko ikuspegi pertsonalizatua"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "Sortu edo editatu ikuspegiak"
 
 #
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "Fabrika"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "Definitu ikuspegi berria"
 
@@ -22906,64 +21785,166 @@ msgstr "Ikuspegi-mota"
 msgid "Type of view:"
 msgstr "Ikuspegi-mota:"
 
-#: ../widgets/misc/e-attachment-bar.c:1132
-msgid "Attachment Bar"
-msgstr "Eranskin-barra"
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
+msgstr "Erantsitako mezua"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:636
+msgid "attachment.dat"
+msgstr "eranskina.dat"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "Kargatzeko eragiketa lantzen ari da."
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "Gordetzeko eragiketa lantzen ari da."
+
+#: ../widgets/misc/e-attachment.c:1923
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Ezin da %s fitxategia erantsi: %s"
+msgid "Could not load '%s'"
+msgstr "Ezin izan da '%s' kargatu"
+
+#: ../widgets/misc/e-attachment.c:1926
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Ezin izan da eranskina kargatu"
+
+#: ../widgets/misc/e-attachment.c:2190
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Ezin izan da '%s' ireki"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Ezin izan da eranskina ireki"
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr "Eranskinaren edukia ez da kargatu"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:2712
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Ezin da %s fitxategia erantsi: ez da fitxategi erregularra"
+msgid "Could not save '%s'"
+msgstr "Ezin izan da '%s' gorde"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.c:2715
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Ezin izan da eranskina gorde"
+
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Eranskinaren propietateak"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Fitxategi-izena:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+msgid "_Filename:"
+msgstr "_Fitxategi-izena:"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
+#: ../widgets/misc/e-attachment-dialog.c:363
+msgid "MIME Type:"
 msgstr "MIME mota:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Proposatu eranskina automatikoki bistaratzea"
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr "Ezin izan da atzeko plano gisa ezarri"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Ezin izan da eranskina bidali"
+msgstr[1] "Ezin izan dira eranskinak bidali"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "_Bidali honi..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+msgid "Send the selected attachments somewhere"
+msgstr "Bidali hautatutako eranskinak nonbaitera"
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "Kargatzen"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "Gordetzen"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "Ezkutatu _eranskin-barra"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "Erakutsi _eranskin-barra"
+
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "Add Attachment"
+msgstr "Gehitu eranskina"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "_Erantsi"
+
+#: ../widgets/misc/e-attachment-store.c:607
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Gorde eranskina"
+msgstr[1] "Gorde eranskinak"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "Gorde _denak"
+
+#: ../widgets/misc/e-attachment-view.c:326
+msgid "A_dd Attachment..."
+msgstr "_Gehitu eranskina..."
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+msgid "Open with \"%s\""
+msgstr "Ireki honekin: %s"
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Ireki eranskina '%s(r)ekin"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "Hileko egutegia"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
-#: ../widgets/text/e-text.c:3645
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "Betetze-kolorea"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
-#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
-#: ../widgets/text/e-text.c:3660
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "GDK betetze-kolorea"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
-#: ../widgets/text/e-text.c:3667
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "Betetze-puntua"
 
@@ -22987,26 +21968,25 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:999
-#: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:649
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Gutxieneko zabalera"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1000
-#: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Gutxieneko zabalera"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "Tartea"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "Orain"
 
@@ -23015,7 +21995,7 @@ msgstr "Orain"
 msgid "The time must be in the format: %s"
 msgstr "Ordua formatu honetan idatzi behar da: %s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Ehunekoaren balioak 0 eta 100 bitartekoa izan behar du (biak barne)."
 
@@ -23114,146 +22094,90 @@ msgstr "Besterik..."
 msgid "Ch_aracter Encoding"
 msgstr "_Karaktere-kodeketa"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "Data eta ordua"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "Testu sarrera data txertatzeko"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "Egin klik botoian egutegia erakusteko"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "Goiti-beherako konbinazio-koadroa ordua hautatzeko"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "_Orain"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "_Gaur"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "Baliogabeko data balioa"
 
-#: ../widgets/misc/e-dateedit.c:1664
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "Baliogabeko ordu balioa"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "Zabalduta"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "Zabaltzailea zabalduko den edo ez"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "Zabaltzailearen etiketako testua"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "Erabili azpimarra"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"Ezartzen bada, testuko azpimarrak adierazten du hurrengo karakterea tekla "
-"bizkortzaile mnemoteknikorako erabili behar dela."
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "Etiketaren eta umearen artean jarri beharreko tartea"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "Etiketa-trepeta"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "Ohiko zabaltzaile-etiketaren ordez bistaratu beharreko trepeta"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "Zabaltzailearen tamaina"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "Zabaltzailearen geziaren tamaina"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "Adierazlearen tartea"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "Zabaltzailearen geziaren inguruko tartea"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "Gorde bilaketa"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "_Bilaketak"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "Bilaketak"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_Gorde bilaketa..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "_Editatu gordetako bilaketak..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "Bilaketa _aurreratua..."
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "Kontu guztiak"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "Uneko kontua"
 
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "Uneko karpeta"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "Uneko mezua"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "Aukeratu irudia"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Munduaren mapa"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -23269,103 +22193,102 @@ msgstr "Linean"
 msgid "The button state is online"
 msgstr "Botoiaren egoera linean dago"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "Sinkronizatu honekin:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "Sinkronizatu erregistro pribatuak:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "Sinkronizatu kategoriak:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "Mezu _hutsa"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "Ordezte-modeloa"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "Zutabe-zabalera"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
 msgid "Click here to change the search type"
 msgstr "Egin klik bilaketa mota aldatzeko"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 msgstr "_Bilatu"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "_Bilatu orain"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "_Garbitu"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
 msgstr "Elementuaren IDa"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
-#: ../widgets/text/e-text.c:3567
+#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "Testua"
 
 #. 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:1003
+#: ../widgets/misc/e-search-bar.c:1053
 msgid "Sho_w: "
 msgstr "_Erakutsi: "
 
-#. 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:1020
+#: ../widgets/misc/e-search-bar.c:1072
 msgid "Sear_ch: "
 msgstr "_Bilatu: "
 
 #. 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:1032
+#: ../widgets/misc/e-search-bar.c:1088
 msgid " i_n "
 msgstr " hemen: "
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "Kurtsore-errenkada"
 
 #
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "Kurtsore-zutabea"
 
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "Ordenatzailea"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "Hautapen mota"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "Kurtsore modua"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "_Ezabatzean:"
 
@@ -23389,19 +22312,19 @@ msgstr "<b>Egoeraren jarraipena</b>"
 msgid "A_uto-delete sent item"
 msgstr "Ezabatu automatikoki bidalitako elementua"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
 msgstr "_Sortu bidalitako elementua informazioaren jarraipena egiteko"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "Banatuta eta irekita"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "Aukera _orokorrak"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23409,7 +22332,7 @@ msgstr ""
 "Bat ere ez\n"
 "Posta-agiria"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23425,15 +22348,15 @@ msgstr ""
 "Sekretu altua\n"
 "Zuretzako soilik"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "_Erantzutea eskatu da"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "_Egoeraren jarraipena"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23445,30 +22368,34 @@ msgstr ""
 "Estandarra\n"
 "Baxua"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "_Onartzean:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "Osatzean:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "Ba_ztertzean:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "_Barruan"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "O_ndoren:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "_Informazioa guztia"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Classification:"
+msgstr "_Sailkapena:"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23495,46 +22422,26 @@ msgid "_When opened:"
 msgstr "_Irekitzean:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
+#: ../widgets/misc/e-task-widget.c:251
 #, 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:258
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "Egin klik hemen URLra joateko"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "Editatu Kategoria-zerrenda nagusia..."
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "Elementua(k) kategoria hauetakoa d(ir)a:"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "Dauden _kategoriak:"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "kategoriak"
-
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "Zerrenda laster-leihoan"
 
-#: ../widgets/table/e-cell-date.c:62
-msgid "%l:%M %p"
-msgstr "%I:%M %p"
-
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Hautatutako zutabea"
@@ -23547,25 +22454,25 @@ msgstr "Enfokatutako zutabea"
 msgid "Unselected Column"
 msgstr "Desautatutako zutabea"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "Zutabe marratua"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "Azpimarratu zutabea"
 
 #
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "Zutabe lodia"
 
 #
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "Zutabe koloreduna"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "Atzeko planoaren koloreko zutabea"
 
@@ -23589,12 +22496,12 @@ msgstr "Ordenatu gabe"
 msgid "No grouping"
 msgstr "Elkartu gabe"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Erakutsi eremuak"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "Eremu eskuragarriak"
 
@@ -23603,7 +22510,7 @@ msgid "A_vailable Fields:"
 msgstr "Dauden eremuak:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "Gorantz"
 
@@ -23616,7 +22523,7 @@ msgid "Clear _All"
 msgstr "Garbitu _dena"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "Beherantz"
 
@@ -23676,21 +22583,7 @@ msgstr "_Erakutsi eremuak ordenean:"
 msgid "_Sort..."
 msgstr "_Ordenatu..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "DnD kodea"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "Goiburu osoak"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "Gehitu zutabea..."
 
@@ -23706,306 +22599,308 @@ msgstr ""
 "Taulan zutabe bat gehitzeko arrastatu zutabea\n"
 "agertzea nahi duzun kokalekura."
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (elementu %d)"
 msgstr[1] "%s : %s (%d elementu)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (elementu %d)"
 msgstr[1] "%s (%d elementu)"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-leaf.c:586
+#: ../widgets/table/e-table-group-leaf.c:587
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Errenkada-kolore txandakatuak"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-leaf.c:593
+#: ../widgets/table/e-table-group-leaf.c:594
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Marrazteko sareta horizontala"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-leaf.c:600
+#: ../widgets/table/e-table-group-leaf.c:601
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Marrazteko sareta bertikala"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-leaf.c:607
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "Marraztu fokua"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-leaf.c:614
+#: ../widgets/table/e-table-group-leaf.c:615
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Kurtsore-modua"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-leaf.c:628
+#: ../widgets/table/e-table-group-leaf.c:629
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Hautapen modeloa"
 
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-leaf.c:621
+#: ../widgets/table/e-table-group-leaf.c:622
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "Luzera-muga"
 
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-leaf.c:658
-#: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:663
+#: ../widgets/table/e-table-group-leaf.c:664
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "Errenkada-altuera uniformea"
 
-#: ../widgets/table/e-table-group-container.c:978
-#: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-group-leaf.c:652
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-leaf.c:656
+#: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Izoztua"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "Pertsonalizatu uneko ikuspegia"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "Ordenatu g_orantz"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "Ordenatu _beherantz"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "Ordenatu _gabe"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "Elkartu _eremu honen arabera"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "Taldekatu _koadroaren arabera"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "Kendu _zutabe hau"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "Gehitu z_utabea..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "_Lerrokadura"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "_Egokiena"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "Eman formatu zu_tabeei..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "_Pertsonalizatu uneko ikuspegia..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "_Ordenatu honen arabera"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "_Pertsonalizatu"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "Letra-tipoaren azalpena"
-
-#
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "Ordenatu informazioa"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Zuhaitza"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Taulako goiburua"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Taulako eredua"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Kurtsore-zutabea"
 
-#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Ordenatu informazioa"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Bilatu beti"
 
-#: ../widgets/table/e-table.c:3347
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "Erabili 'egin klik' gehitzeko"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "Zuhaitza"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "Etree taulako egokitzailea"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "Zahar itxura"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "Marraztu marrak eta +/- zabaltzaileak."
 
-#: ../widgets/text/e-text.c:2736
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "Zabaltzailearen tamaina"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "Zabaltzailearen geziaren tamaina"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "Sarrerako metodoak"
 
-#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "Prozesadorearen gertaera"
 
-#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Lodia"
 
-#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "Marratua"
 
-#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "Ainguratu"
 
-#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "Justifikazioa"
 
-#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "Klip-zabalera"
 
-#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "Klip-altuera"
 
-#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "Klip-a"
 
-#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "Bete klip-aren laukizuzena"
 
-#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X desplazamendua"
 
-#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y desplazamendua"
 
-#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "Testuaren zabalera"
 
-#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Testuaren altuera"
 
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "Erabili elipsia"
 
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "Elipsia"
 
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "Lerroa itzulbiratu"
 
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "Hautsi karaktereak"
 
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "Gehien. lerroak"
 
-#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "Marraztu ertzak"
 
-#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "Onartu lerro berriak"
 
-#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "Marraztu atzeko planoa"
 
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "Marraztu botoia"
 
-#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "Kurtsorearen posizioa"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "BM testuingurua"
 
-#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "Kudeatu laster-leihoa"
 



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