File evolution-po-update.patch of Package evolution

Overview Repositories Revisions Requests Users Attributes Meta

File evolution-po-update.patch of Package evolution (Revision 3e76e621bdea67b3559dc0b1c5e92832)

Currently displaying revision 3e76e621bdea67b3559dc0b1c5e92832 , Show latest

Index: po/cs.po
===================================================================
--- po/cs.po	(revision 35318)
+++ po/cs.po	(working copy)
@@ -1,5 +1,5 @@
 # Czech translation of evolution.
-# Copyright (C) 2002, 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2006, 2007, 2008 the authors of evolution.
 # Copyright (C) 2004, 2005, 2006 Miloslav Trmac <mitr@volny.cz>.
 # Copyright (C) 2006 Lukas Novotny <lukasnov@cvs.gnome.org>.
 # This file is distributed under the same license as the evolution package.
@@ -16,8 +16,8 @@
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-10 02:24+0100\n"
-"PO-Revision-Date: 2008-03-10 01:12+0100\n"
+"POT-Creation-Date: 2008-04-07 23:06+0200\n"
+"PO-Revision-Date: 2008-04-07 23:02+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -731,7 +731,7 @@
 msgstr "_Zkopírovat obsah adresáře lokálně pro práci při odpojení"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
@@ -757,7 +757,7 @@
 msgstr "Autentizace"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Podrobnosti"
@@ -772,7 +772,7 @@
 msgstr "Stahování"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Vlastnosti adresáře"
 
@@ -978,105 +978,97 @@
 msgstr "Autentizace"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "Display"
-msgstr "Zobrazení"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Downloading"
 msgstr "Stahování"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Searching"
 msgstr "Hledání"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Server Information"
-msgstr "Informace o serveru"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Přidat adresář"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 #: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "Vždy"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonymně"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "Základní"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "E-mailová adresa"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution bude používat tuto e-mailovou adresu k vaší autentizaci u serveru."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "Hledat možné základy vyhledávání"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "_Přihlášení:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "Nikdy"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../mail/em-account-editor.c:304
 msgid "No encryption"
 msgstr "Bez šifrování"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "Jeden"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:312
 msgid "SSL encryption"
 msgstr "SSL šifrování"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "Filtr hledání"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Základ _vyhledávání:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "_Filtr hledání:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "Filtr hledání"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by default search will be performed on "
@@ -1086,7 +1078,7 @@
 "upravovány, vyhledávání bude prováděno s pomocí výchozí typu objectclass "
 "\"person\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1094,7 +1086,7 @@
 "Po výběru této volby se Evolution k serveru LDAP připojí pouze tehdy, pokud "
 "LDAP server podporuje SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1102,7 +1094,7 @@
 "Po výběru této volby se Evolution k serveru LDAP připojí pouze tehdy, pokud "
 "LDAP server podporuje TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1112,23 +1104,23 @@
 "že vaše spojení nebude zabezpečené a můžete se stát terčem bezpečnostního "
 "útoku."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Podporované základy vyhledávání"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 #: ../mail/em-account-editor.c:308
 msgid "TLS encryption"
 msgstr "TLS šifrování"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1138,7 +1130,7 @@
 "hledání. Pokud je ponecháte prázdné, prohledávání začne v kořeni "
 "adresářového stromu."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1150,14 +1142,14 @@
 "Rozsah vyhledávání \"jeden\" zahrnuje záznamy jednu úroveň pod základem "
 "vyhledávání."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Toto je plný název vašeho LDAP serveru. Například \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1165,7 +1157,7 @@
 "Toto je maximální počet stahovaných položek. Pokud nastavíte toto číslo "
 "příliš vysoké, zpomalí se váš adresář."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you. Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1175,7 +1167,7 @@
 "že použití volby \"E-mailová adresa\" vyžaduje anonymní přístup k vašemu "
 "serveru ldap."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1183,7 +1175,7 @@
 "Toto je jméno pro tento server, které se objeví ve vašem seznamu složek "
 "Evolution. Je pouze pro zobrazování. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1193,35 +1185,35 @@
 "standardních portů je předvyplněn. Váš správce systému vám sdělí, které "
 "číslo portu máte zadat."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Použít distinguished name (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Použít e-mailovou adresu"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "Kdykoliv je možné"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "_Přidat adresář"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Omezení stahování:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "_Hledat možné základy vyhledávání"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "_Metoda přihlašování:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 #: ../calendar/gui/dialogs/calendar-setup.c:229
 #: ../mail/mail-config.glade.h:164
 #: ../plugins/groupwise-features/properties.glade.h:11
@@ -1229,33 +1221,33 @@
 msgid "_Name:"
 msgstr "_Název:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "_Rozsah vyhledávání:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 #: ../mail/mail-config.glade.h:172
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "Č_asový limit:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "Používat za_bezpečené připojení:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "karty"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
@@ -6984,7 +6976,7 @@
 msgid "_Save Selected"
 msgstr "_Uložit vybrané"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:796
 #, c-format
 msgid "Open in %s..."
 msgstr "Otevřít v %s..."
@@ -10178,39 +10170,39 @@
 msgstr "Kliknutím sem vyberte složky, kam uložit"
 
 #. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
+#: ../composer/e-msg-composer-hdrs.c:236
 msgid "Si_gnature:"
 msgstr "_Podpis:"
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-msg-composer-hdrs.c:341
 msgid "Fr_om:"
 msgstr "_Od:"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-msg-composer-hdrs.c:347
 msgid "_Reply-To:"
 msgstr "O_dpovědět-komu:"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-msg-composer-hdrs.c:353
 msgid "_To:"
 msgstr "_Komu:"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-msg-composer-hdrs.c:355
 msgid "Enter the recipients of the message"
 msgstr "Vyplnit příjemce zprávy"
 
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-msg-composer-hdrs.c:361
 msgid "_Cc:"
 msgstr "Ko_pie:"
 
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-msg-composer-hdrs.c:363
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Vyplňte adresy, které obdrží kopii této zprávy"
 
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-msg-composer-hdrs.c:370
 msgid "_Bcc:"
 msgstr "_Skrytá kopie:"
 
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../composer/e-msg-composer-hdrs.c:372
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10218,11 +10210,11 @@
 "Vyplňte adresy, které obdrží kopii, aniž by se objevily v seznamu příjemců "
 "zprávy"
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-msg-composer-hdrs.c:380
 msgid "_Post To:"
 msgstr "_Uložit do:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-msg-composer-hdrs.c:386
 msgid "S_ubject:"
 msgstr "_Předmět:"
 
@@ -11387,7 +11379,7 @@
 #. and now for the action area
 #: ../mail/em-filter-rule.c:489
 msgid "Then"
-msgstr "Dále"
+msgstr "Potom"
 
 #: ../mail/em-filter-rule.c:517
 msgid "Add Ac_tion"
@@ -11419,7 +11411,7 @@
 
 #: ../mail/em-folder-browser.c:226
 msgid "Last 5 Days' Messages"
-msgstr "Zpráva za posledních 5 dní"
+msgstr "Zprávy za posledních 5 dní"
 
 #: ../mail/em-folder-browser.c:227
 msgid "Messages with Attachments"
@@ -11431,7 +11423,7 @@
 
 #: ../mail/em-folder-browser.c:229
 msgid "Messages Not Junk"
-msgstr "Zprávy nejsou nevyžádané"
+msgstr "Zprávy nepatřící mezi nevyžádané"
 
 #: ../mail/em-folder-browser.c:1123
 msgid "Account Search"
@@ -12549,7 +12541,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid "Empty Junk folders on exit"
-msgstr "Vyprázdňovat složky Koš při ukončení"
+msgstr "Vyprazdňovat složky typu Koš při ukončení"
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Empty Trash folders on exit"
@@ -12783,19 +12775,19 @@
 
 #: ../mail/evolution-mail.schemas.in.h:81
 msgid "Minimum days between emptying the junk on exit"
-msgstr "Minimum dní mezi vyprázdňováním koše při ukončení"
+msgstr "Minimum dní mezi vyprazdňováním koše při ukončení"
 
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid "Minimum days between emptying the trash on exit"
-msgstr "Minimum dní mezi vyprázdňováním koše při ukončení"
+msgstr "Minimum dní mezi vyprazdňováním koše při ukončení"
 
 #: ../mail/evolution-mail.schemas.in.h:83
 msgid "Minimum time between emptying the junk on exit, in days."
-msgstr "Minimum dní mezi vyprázdňováním koše při ukončení ve dnech."
+msgstr "Minimum dní mezi vyprazdňováním koše při ukončení ve dnech."
 
 #: ../mail/evolution-mail.schemas.in.h:84
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "Minimum dní mezi vyprázdňováním koše při ukončení ve dnech."
+msgstr "Minimum dní mezi vyprazdňováním koše při ukončení ve dnech."
 
 #: ../mail/evolution-mail.schemas.in.h:85
 msgid "Number of addresses to display in TO/CC/BCC"
@@ -12959,12 +12951,12 @@
 #: ../mail/evolution-mail.schemas.in.h:123
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
-"Datum, kdy bylo naposledy spuštěno vyprázdňování koše ve dnech od epoch."
+"Datum, kdy bylo naposledy spuštěno vyprazdňování koše ve dnech od epoch."
 
 #: ../mail/evolution-mail.schemas.in.h:124
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
-"Datum, kdy bylo naposledy spuštěno vyprázdňování koše ve dnech od epoch."
+"Datum, kdy bylo naposledy spuštěno vyprazdňování koše ve dnech od epoch."
 
 #: ../mail/evolution-mail.schemas.in.h:125
 msgid "The terminal font for mail display."
@@ -14148,7 +14140,7 @@
 msgid "_Tick this to accept the license agreement"
 msgstr "Zaškrtnutím _tohoto přijmete licenční smlouvu"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:831
 #, c-format
 msgid "Pinging %s"
 msgstr "Kontaktuji %s"
@@ -15125,7 +15117,7 @@
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3849
+#: ../mail/message-list.c:3838
 msgid "Generating message list"
 msgstr "Generuji seznam zpráv"
 
@@ -15551,6 +15543,10 @@
 msgstr "Možnosti Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Zásuvný modul Bogofilter"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtry nevyžádané pošty používají Bogofilter."
 
@@ -16926,11 +16922,11 @@
 msgid "_Proxy Login..."
 msgstr "_Přihlásit se k proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Záložka Proxy bude dostupná, jen když je účet online."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:708
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Záložka Proxy bude dostupná, jen když je účet povolen."
 
@@ -20093,7 +20089,7 @@
 
 #: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
 msgid "_New"
-msgstr "_Nový"
+msgstr "_Nová"
 
 #: ../ui/evolution-addressbook.xml.h:60
 msgid "_Rename"
@@ -20578,11 +20574,11 @@
 
 #: ../ui/evolution-mail-list.xml.h:3
 msgid "Collapse All _Threads"
-msgstr "S_eskupovat podle vláken"
+msgstr "S_balit všechna vlákna"
 
 #: ../ui/evolution-mail-list.xml.h:4
 msgid "Collapse all message threads"
-msgstr "Sbalit všechny vlákna zpráv"
+msgstr "Sbalit všechna vlákna zpráv"
 
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
@@ -21939,13 +21935,13 @@
 msgid "Attachment Bar"
 msgstr "Lišta příloh"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:317 ../widgets/misc/e-attachment.c:332
+#: ../widgets/misc/e-attachment.c:533 ../widgets/misc/e-attachment.c:550
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nemohu přiložit soubor %s: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:325 ../widgets/misc/e-attachment.c:542
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nemohu přiložit soubor %s: není to normální soubor"
Index: po/pt_BR.po
===================================================================
--- po/pt_BR.po	(revision 35318)
+++ po/pt_BR.po	(working copy)
@@ -2,18 +2,19 @@
 # Copyright (C) 2000-2007 Free Software Foundation, Inc.
 # Gustavo Maciel Dias Vieira <gustavo@sagui.org>, 2000-2004.
 # Afonso Celso Medina <afmedina@uol.com.br>, 2004, 2005.
-# Washington Lins <washington-lins@uol.com.br>, 2007.
+# Washington Lins <washington-lins@uol.com.br>, 2007, 2008.
 # Guilherme de S. Pastore <gpastore@gnome.org>, 2007.
 # Raul Pereira <contato@raulpereira.com>, 2007.
 # Rodrigo Flores <rodrigomarquesflores@gmail.com>, 2007.
+# Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-27 08:39-0300\n"
-"PO-Revision-Date: 2008-02-26 21:56-0400\n"
-"Last-Translator: Washington Lins <washington-lins@uol.com.br>\n"
+"POT-Creation-Date: 2008-04-14 20:56-0300\n"
+"PO-Revision-Date: 2008-04-14 21:31-0300\n"
+"Last-Translator: Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -349,7 +350,7 @@
 "'{0}' is a read-only address book source. Switch to Contacts View and "
 "highlight an address book that can accept contacts."
 msgstr ""
-"\"{0}\" é um catálogo de endereços somente de leitura. Alterne para para a "
+"\"{0}\" é um catálogo de endereços somente de leitura. Alterne para a "
 "Visão de Contatos e selecione um livro de endereços que aceite contatos."
 
 #: ../addressbook/addressbook.error.xml.h:3
@@ -732,7 +733,7 @@
 "Copiar o conteúdo do _catálogo localmente para funcionamento desconectado"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
@@ -758,7 +759,7 @@
 msgstr "Autenticação"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalhes"
@@ -773,7 +774,7 @@
 msgstr "Baixando"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propriedades do Catálogo de Endereços"
 
@@ -870,7 +871,7 @@
 #: ../calendar/gui/e-calendar-table.c:1387
 #: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
 #: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1346
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -981,105 +982,97 @@
 msgstr "Autenticação"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "Display"
-msgstr "Exibição"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Downloading"
 msgstr "Baixando"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Searching"
 msgstr "Pesquisando"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Server Information"
-msgstr "Informação do Servidor"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Adicionar Catálogo de Endereços"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 #: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "Sempre"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonimamente"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "Básico"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "Distinguished name (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "O Evolution usará este endereço de e-mail para autenticá-lo com o servidor."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "Localizar Bases de Pesquisa Possíveis"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "Nunca"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../mail/em-account-editor.c:304
 msgid "No encryption"
 msgstr "Sem criptografia"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "Um"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:312
 msgid "SSL encryption"
 msgstr "Criptografia SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "Filtro de Pesquisa"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "_Base de pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "_Filtro de pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "Filtro de pesquisa"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by default search will be performed on "
@@ -1089,7 +1082,7 @@
 "pesquisa é feita. Se não for modificado, o padrão é procurar no objectclass "
 "do tipo \"pessoa\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1097,7 +1090,7 @@
 "A seleção desta opção significa que o Evolution apenas se conectará ao seu "
 "servidor LDAP se este suportar SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1105,7 +1098,7 @@
 "A seleção desta opção significa que o Evolution apenas se conectará ao seu "
 "servidor LDAP se este suportar TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1115,23 +1108,23 @@
 "TLS. Isto significa que a sua conexão será insegura e que você estará "
 "vulnerável a falhas de segurança."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Bases de Pesquisa com Suporte"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 #: ../mail/em-account-editor.c:308
 msgid "TLS encryption"
 msgstr "Encriptação TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1141,7 +1134,7 @@
 "suas pesquisas começarão. Se você deixar este campo vazio as pesquisas "
 "começarão na raiz da árvore do diretório."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1154,7 +1147,7 @@
 "pesquisa de \"um\" incluirá apenas as entradas que estão um nível abaixo da "
 "sua base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1162,7 +1155,7 @@
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap."
 "minhaempresa.com.br\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1170,7 +1163,7 @@
 "Este é o número máximo de entradas a serem baixadas. Atribuir um valor muito "
 "grande a este número diminuirá a velocidade de seu catálogo de endereços."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you. Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1179,7 +1172,7 @@
 "Este é o método que o Evolution usará para autenticá-lo. Note que a opção "
 "\"Endereço de E-mail\" requer acesso anônimo ao seu servidor LDAP."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1187,7 +1180,7 @@
 "Este é o nome deste servidor que aparecerá na lista de pastas do Evolution. "
 "Ele é usado apenas para exibição. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1197,35 +1190,35 @@
 "lista de portas padrão foi fornecida. Pergunte ao seu administrador de "
 "sistemas qual porta você deve escolher."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Usando distinguished name (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Usando endereço de e-mail"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "Quando Possível"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "_Adicionar Catálogo de Endereços"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Limite de transferência:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "Localizar Bases de Pesquisa _Possíveis"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "Método de _login:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 #: ../calendar/gui/dialogs/calendar-setup.c:229
 #: ../mail/mail-config.glade.h:164
 #: ../plugins/groupwise-features/properties.glade.h:11
@@ -1233,33 +1226,33 @@
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "_Escopo da pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 #: ../mail/mail-config.glade.h:172
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "_Tempo limite:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "_Usar conexão segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "cartões"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
@@ -3015,7 +3008,7 @@
 #: ../calendar/gui/dialogs/comp-editor.c:457
 #: ../calendar/gui/e-calendar-table.c:1373
 #: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
+#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:996
 #: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
@@ -3601,12 +3594,12 @@
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
 msgstr ""
-"A esta consulta corresponderam mais cartões do que a configuração do\n"
-"servidor permite enviar ou do que a configuração do Evolution permite "
-"exibir.\n"
-"Por favor, torne a sua pesquisa mais específica ou aumente o limite de\n"
-"resultados nas preferências do servidor de diretório para este\n"
-"catálogo de endereços."
+"A esta consulta corresponderam mais cartões do que a configuração\n"
+"do servidor permite enviar ou do que a configuração do Evolution\n"
+"permite exibir.\n"
+"Por favor, torne a sua pesquisa mais específica ou aumente o \n"
+"limite de resultados nas preferências do servidor de diretório para\n"
+"este catálogo de endereços."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:158
 msgid ""
@@ -5330,14 +5323,14 @@
 
 #: ../calendar/gui/calendar-component.c:606
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2085
 msgid "_Copy..."
 msgstr "_Copiar..."
 
 #: ../calendar/gui/calendar-component.c:612
 #: ../calendar/gui/dialogs/comp-editor.c:1130
 #: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
+#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2099
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propriedades"
@@ -5965,13 +5958,13 @@
 msgstr[1] "%d mensagens anexas"
 
 #: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
 #: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
 msgid "_Move"
 msgstr "_Mover"
 
 #: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2068
 msgid "Cancel _Drag"
 msgstr "Cancelar _Arraste"
 
@@ -6164,6 +6157,7 @@
 msgid "Recurrence"
 msgstr "Recorrência"
 
+# Consistência com outras traduções "This even has..."
 #: ../calendar/gui/dialogs/event-page.c:826
 #: ../calendar/gui/dialogs/event-page.c:2835
 msgid "This event has alarms"
@@ -6995,7 +6989,7 @@
 msgid "_Save Selected"
 msgstr "_Salvar Selecionado"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:796
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir com %s..."
@@ -7258,7 +7252,7 @@
 #: ../calendar/gui/e-calendar-view.c:2262
 #, c-format
 msgid "Time: %s %s"
-msgstr "Data: %s %s de "
+msgstr "Data: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: ../calendar/gui/e-cell-date-edit-text.c:116
@@ -8488,7 +8482,7 @@
 
 #: ../calendar/gui/print.c:2490
 msgid "Attendees: "
-msgstr "Participantes:"
+msgstr "Participantes: "
 
 #: ../calendar/gui/print.c:2530
 #, c-format
@@ -10191,39 +10185,39 @@
 msgstr "Clique aqui para selecionar as pastas onde publicar"
 
 #. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
+#: ../composer/e-msg-composer-hdrs.c:236
 msgid "Si_gnature:"
 msgstr "Assi_natura:"
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-msg-composer-hdrs.c:341
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-msg-composer-hdrs.c:347
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-msg-composer-hdrs.c:353
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-msg-composer-hdrs.c:355
 msgid "Enter the recipients of the message"
 msgstr "Digite os destinatários da mensagem"
 
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-msg-composer-hdrs.c:361
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-msg-composer-hdrs.c:363
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Digite os endereços que receberão uma cópia da mensagem"
 
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-msg-composer-hdrs.c:370
 msgid "_Bcc:"
 msgstr "CC_O:"
 
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../composer/e-msg-composer-hdrs.c:372
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10231,11 +10225,11 @@
 "Digite os endereços que receberão uma cópia da mensagem sem aparecer na "
 "lista de destinatários da mensagem."
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-msg-composer-hdrs.c:380
 msgid "_Post To:"
 msgstr "_Publicar Em:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-msg-composer-hdrs.c:386
 msgid "S_ubject:"
 msgstr "Ass_unto:"
 
@@ -10453,7 +10447,7 @@
 msgid "_Do not Recover"
 msgstr "Não _Recuperar"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
 msgid "_Recover"
 msgstr "_Recuperar"
 
@@ -10465,7 +10459,7 @@
 msgid "Evolution Mail and Calendar"
 msgstr "Correio e Agenda do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
 msgid "Groupware Suite"
 msgstr "Suíte de Groupware"
 
@@ -10575,7 +10569,7 @@
 
 #: ../e-util/e-util-labels.c:339
 msgid "Add Label"
-msgstr "adcionar Rótulo"
+msgstr "Adicionar Rótulo"
 
 #: ../e-util/e-util-labels.c:357
 msgid "Label name cannot be empty."
@@ -11492,14 +11486,14 @@
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
-msgstr "NÃO CASADO"
+msgstr "SEM OCORRÊNCIA"
 
 #: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
 msgid "Drafts"
 msgstr "Rascunhos"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
+#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2535
 #: ../mail/mail-component.c:156
 #: ../plugins/exchange-operations/exchange-delegates-user.c:88
 #: ../plugins/exchange-operations/exchange-folder.c:593
@@ -11566,20 +11560,20 @@
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Não foi possível depositar mensagem(ns) no repositório topo"
 
-#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copiar para Pasta"
 
-#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Mover para Pasta"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
@@ -11587,32 +11581,32 @@
 msgid "_View"
 msgstr "_Ver"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2078
 msgid "Open in _New Window"
 msgstr "Abrir em uma _Nova Janela"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2083
 msgid "_New Folder..."
 msgstr "_Nova Pasta..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2086
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2094
 msgid "Re_fresh"
 msgstr "Atuali_zar"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2095
 msgid "Fl_ush Outbox"
 msgstr "Limpar Cai_xa de saída"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Es_vaziar Lixeira"
 
@@ -11903,7 +11897,7 @@
 "public key."
 msgstr ""
 "Esta mensagem está assinada com uma assinatura, mas não há chave pública "
-"correspondente"
+"correspondente."
 
 #: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
 msgid "Unencrypted"
@@ -12123,12 +12117,12 @@
 #. translators: strftime format for local time equivalent in Date header display, with day
 #: ../mail/em-format-html.c:1733
 msgid " (%a, %R %Z)"
-msgstr "(%a, %R %Z)"
+msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
 #: ../mail/em-format-html.c:1738
 msgid " (%R %Z)"
-msgstr "(%R %Z)"
+msgstr " (%R %Z)"
 
 #: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
 #: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
@@ -12618,8 +12612,8 @@
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr ""
-"Habilitar isto para usar a tecla Barra de Espaçospara rolar na visualização "
-"de mensagem, lista de mensagens e pastas"
+"Habilite isto para usar a tecla Barra de Espaços para rolar na visualização "
+"de mensagem, lista de mensagens e pastas."
 
 #: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable to render message text part of limited size."
@@ -12756,8 +12750,8 @@
 "Always load images off the net."
 msgstr ""
 "Carregar imagens em mensagens HTML usando http(s). Os valores possíveis são: "
-"0 - Nunca carrega imagens da rede 1 - Carregar imagens se o remetente está "
-"no catálogo de endereços 2 - Sempre carregar imagens da rede"
+"\"0\" (nunca carrega imagens da rede); \"1\" (carrega imagens se o remetente "
+"estiver no catálogo de endereços); e \"2\" (sempre carrega imagens da rede)."
 
 #: ../mail/evolution-mail.schemas.in.h:70
 msgid "Log filter actions"
@@ -12941,13 +12935,13 @@
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
-"Mostrar o e-mail do remetente em uma coluna separada na na lista de "
+"Mostra o e-mail do remetente em uma coluna separada na lista de "
 "mensagens."
 
 #: ../mail/evolution-mail.schemas.in.h:114
 msgid "Show the photo of the sender in the message reading pane."
 msgstr ""
-"Mostrar o e-mail do remetente na coluna de composição de mensagens na lista "
+"Mostra o e-mail do remetente na coluna de composição de mensagens na lista "
 "de mensagens"
 
 #: ../mail/evolution-mail.schemas.in.h:115
@@ -12964,7 +12958,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:117
 msgid "Spell check inline"
-msgstr "Verificação ortográfica durante a digitação"
+msgstr "Verificar ortografia durante a digitação"
 
 #: ../mail/evolution-mail.schemas.in.h:118
 msgid "Subscribe dialog default height"
@@ -13000,15 +12994,15 @@
 
 #: ../mail/evolution-mail.schemas.in.h:126
 msgid "The variable width font for mail display."
-msgstr "A fonte de largura variável para exibição de correio"
+msgstr "A fonte de largura variável para exibição de correio."
 
 #: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
-"Isso admite três valores possíveis. 0 para erros, 1 para aviso e 2 para "
-"mensagens de depuração"
+"Isso admite três valores possíveis: \"0\" para erros, \"1\" para aviso e "
+"\"2\" para mensagens de depuração."
 
 #: ../mail/evolution-mail.schemas.in.h:128
 msgid ""
@@ -13109,7 +13103,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:143
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Usar o daemon e cliente do SpamAssassin (spamc/spamd)"
+msgstr "Usa o daemon e cliente do SpamAssassin (spamc/spamd)."
 
 #: ../mail/evolution-mail.schemas.in.h:144
 msgid "Use custom fonts"
@@ -13117,7 +13111,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:145
 msgid "Use custom fonts for displaying mail."
-msgstr "Usar fontes personalizadas para exibir as mensagens"
+msgstr "Usa fontes personalizadas para exibir as mensagens."
 
 #: ../mail/evolution-mail.schemas.in.h:146
 msgid "Use only local spam tests."
@@ -13125,7 +13119,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:147
 msgid "Use only the local spam tests (no DNS)."
-msgstr "Usar apenas os testes de SPAM locais (sem DNS)."
+msgstr "Usa apenas os testes de SPAM locais (sem DNS)."
 
 #: ../mail/evolution-mail.schemas.in.h:148
 msgid "Use side-by-side or wide layout"
@@ -13281,8 +13275,8 @@
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
-msgstr[0] "%d selecionada,"
-msgstr[1] "%d selecionadas,"
+msgstr[0] "%d selecionada, "
+msgstr[1] "%d selecionadas, "
 
 #: ../mail/mail-component.c:540
 #, c-format
@@ -13323,8 +13317,8 @@
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
-msgstr[0] "%d não lida,"
-msgstr[1] "%d não lidas,"
+msgstr[0] "%d não lida, "
+msgstr[1] "%d não lidas, "
 
 #: ../mail/mail-component.c:556
 #, c-format
@@ -13343,7 +13337,7 @@
 
 #: ../mail/mail-component.c:898
 msgid "Compose a new mail message"
-msgstr "Redigir uma nova mensagem de correio"
+msgstr "Redige uma nova mensagem de correio"
 
 #: ../mail/mail-component.c:904
 msgid "New Mail Folder"
@@ -13355,7 +13349,7 @@
 
 #: ../mail/mail-component.c:906
 msgid "Create a new mail folder"
-msgstr "Criar uma nova pasta de correio"
+msgstr "Cria uma nova pasta de correio"
 
 #: ../mail/mail-component.c:1053
 msgid "Failed upgrading Mail settings or folders."
@@ -13691,7 +13685,7 @@
 
 #: ../mail/mail-config.glade.h:79
 msgid "Enable Magic S_pacebar "
-msgstr "Habilitar Barra de E_spaço Magica"
+msgstr "Habilitar Barra de E_spaço Mágica"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
@@ -14169,7 +14163,7 @@
 msgid "_Tick this to accept the license agreement"
 msgstr "Marque aqui para acei_tar o acordo de licença"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:831
 #, c-format
 msgid "Pinging %s"
 msgstr "Chamando %s"
@@ -14679,7 +14673,7 @@
 
 #: ../mail/mail.error.xml.h:45
 msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "Apagar mensagens na pasta de pesquisa &quot;{0}&quot;??"
+msgstr "Apagar mensagens na pasta de pesquisa &quot;{0}&quot;?"
 
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder?"
@@ -15165,7 +15159,7 @@
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:3849
+#: ../mail/message-list.c:3838
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
@@ -15183,7 +15177,7 @@
 
 #: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr "Marca·de·Lembrete"
+msgstr "Marca de Lembrete"
 
 #: ../mail/message-list.etspec.h:11
 msgid "Received"
@@ -15191,7 +15185,7 @@
 
 #: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
-msgstr " Mensagens Enviadas"
+msgstr "Mensagens Enviadas"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
@@ -15413,7 +15407,7 @@
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Fazendo backup dos dados do Evolution (Mensagens, Contatos, Agenda, Tarefas, "
-"Memorandos) "
+"Memorandos)"
 
 #: ../plugins/backup-restore/backup.c:88
 msgid "Backup complete"
@@ -15498,7 +15492,7 @@
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Please select a valid backup file to restore."
-msgstr "Por favor selecione um arquivo de backup válido para restaurar"
+msgstr "Por favor, selecione um arquivo de backup válido para ser restaurado."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
@@ -15598,9 +15592,13 @@
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
 msgid "Bogofilter Options"
-msgstr "Opções do Bogofilter "
+msgstr "Opções do Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Plug-in de spam Bogofilter"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtra mensagens SPAM usando Bogofilter."
 
@@ -15746,7 +15744,7 @@
 msgstr "Você deseja tornar o Evolution seu cliente padrão de e-mail?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:690
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16192,7 +16190,7 @@
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
-msgstr "Sua senha vencerá em 7 dias...."
+msgstr "Sua senha vencerá em 7 dias..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
@@ -16998,12 +16996,12 @@
 msgid "_Proxy Login..."
 msgstr "Login do _Proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "A aba do Proxy estará disponível somente quando a conta estiver conectada."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:708
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "A aba do Proxy estará disponível somente quando a conta estiver habilitada."
@@ -17080,7 +17078,7 @@
 
 #: ../plugins/groupwise-features/status-track.c:225
 msgid "Undelivered: "
-msgstr "Não Entregue:"
+msgstr "Não Entregue: "
 
 #: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
@@ -18901,7 +18899,7 @@
 msgid "Skip recovery warning dialog"
 msgstr "Pular diálogo de aviso de recuperação"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:576
 msgid "Start in offline mode"
 msgstr "Iniciar no modo desconectado"
 
@@ -19116,32 +19114,34 @@
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:744
 msgid "translator-credits"
 msgstr ""
 "Gustavo Maciel Dias Vieira <gustavo@sagui.org>\n"
 "Afonso Celso Medina <afmedina@uol.com.br>\n"
 "Washington Lins <washington-lins@uol.com.br>\n"
 "Guilherme de S. Pastore <gpastore@gnome.org>\n"
-"Raul Pereira <contato@raulpereira.com>"
+"Raul Pereira <contato@raulpereira.com>\n"
+"Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>"
 
-#: ../shell/e-shell-window-commands.c:674
+
+#: ../shell/e-shell-window-commands.c:755
 msgid "Evolution Website"
 msgstr "WebSite do Evolution"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:773
 msgid "Error opening the FAQ webpage."
-msgstr "Erro ao abrir a página de FAQ"
+msgstr "Erro ao abrir a página de FAQ."
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:970
 msgid "_Work Online"
 msgstr "_Trabalhar Conectado"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "_Trabalhar Desconectado"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:996
 msgid "Work Offline"
 msgstr "Trabalhar Desconectado"
 
@@ -19249,7 +19249,7 @@
 "de arquivos externos para o Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:233
 #, no-c-format
 msgid ""
 "Hi. Thanks for taking the time to download this preview release\n"
@@ -19286,7 +19286,7 @@
 "Nós esperamos que você aprecie os resultados do nosso trabalho\n"
 "duro, e estamos esperando ansiosamente suas contribuições!\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19294,19 +19294,19 @@
 "Obrigado\n"
 "A Equipe do Evolution\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:264
 msgid "Do not tell me again"
 msgstr "Não me diga novamente"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:314
 msgid "Evolution Crash Detection"
 msgstr "Restaurador do Evolution"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:316
 msgid "Ig_nore"
 msgstr "Ig_norar"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:331
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19319,43 +19319,43 @@
 "escondidos.\n"
 " Você pode restauras o painel de visualização a partir do menu Visualizar.\n"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:342
 msgid "_Do not show this message again"
-msgstr "_Não mostrar esta mensagem novamente."
+msgstr "_Não mostrar esta mensagem novamente"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:574
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution ativando o componente especificado"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:578
 msgid "Start in online mode"
 msgstr "Iniciar no modo conectado"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:581
 msgid "Forcibly shut down all Evolution components"
 msgstr "Desligar a força todos os componentes do Evolution"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:585
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Executar novamente a migração do Evolution 1.4"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:588
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída de depuração de todos os componentes para um arquivo."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:590
 msgid "Disable loading of any plugins."
 msgstr "Desabilitar o carregamento de qualquer plug-ins."
 
-#: ../shell/main.c:587
+#: ../shell/main.c:592
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desabilitar o painel de visualização do Correio, Contatos e Tarefas."
 
-#: ../shell/main.c:617
+#: ../shell/main.c:677
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O PIM e Cliente de E-mail Evolution"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20109,11 +20109,11 @@
 
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
-msgstr "Salvar contatos selecionados como um VCard."
+msgstr "Salva os contatos selecionados como um VCard."
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
-msgstr "Salvar contatos da pasta selecionada como VCard."
+msgstr "Salvar os contatos da pasta selecionada como VCard"
 
 #: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
 msgid "Select All"
@@ -21715,7 +21715,7 @@
 
 #: ../ui/evolution.xml.h:21
 msgid "Page Set_up..."
-msgstr "Config_uração de Página:"
+msgstr "Configurar _Página..."
 
 #: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
@@ -22044,13 +22044,13 @@
 msgid "Attachment Bar"
 msgstr "Barra de Anexos"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:317 ../widgets/misc/e-attachment.c:332
+#: ../widgets/misc/e-attachment.c:533 ../widgets/misc/e-attachment.c:550
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Não é possível anexar o arquivo %s: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:325 ../widgets/misc/e-attachment.c:542
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Não é possível anexar o arquivo %s: não é um arquivo comum"
@@ -23129,10 +23129,17 @@
 msgid "Cursor position"
 msgstr "Posição do cursor"
 
+# IM = Input Method
 #: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
 msgid "IM Context"
-msgstr "Contexto do MI"
+msgstr "Contexto do ME"
 
 #: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
 msgid "Handle Popup"
 msgstr "Alça do Popup"
+
+#~ msgid "Display"
+#~ msgstr "Exibição"
+
+#~ msgid "Server Information"
+#~ msgstr "Informação do Servidor"
Index: po/es.po
===================================================================
--- po/es.po	(revision 35318)
+++ po/es.po	(working copy)
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: evolution.gnome-2-22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-19 11:28+0000\n"
-"PO-Revision-Date: 2008-03-19 22:02+0100\n"
+"POT-Creation-Date: 2008-03-27 11:30+0000\n"
+"PO-Revision-Date: 2008-04-07 19:34+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -733,7 +733,7 @@
 msgstr "Copiar la li_breta localmente para trabajar desconectado"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
@@ -759,7 +759,7 @@
 msgstr "Autenticación"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalles"
@@ -774,7 +774,7 @@
 msgstr "Descargando"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
@@ -985,103 +985,95 @@
 msgstr "Autenticación"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "Display"
-msgstr "Pantalla"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Downloading"
 msgstr "Descarga"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Searching"
 msgstr "Búsqueda"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Server Information"
-msgstr "Información del servidor"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Añade una libreta de direcciones"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 #: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "Siempre"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anónimamente"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "Básico"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "Nombre distintivo"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "Dirección de correo-e"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution usará esta dirección de correo-e para autenticarle con el servidor."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "Buscar bases de búsqueda posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "_Inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "Nunca"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../mail/em-account-editor.c:304
 msgid "No encryption"
 msgstr "Sin cifrado"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "Uno"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:312
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "Filtro de búsqueda"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "_Base de búsqueda:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "_Filtro de búsqueda:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "Filtro de búsqueda"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by default search will be performed on "
@@ -1091,7 +1083,7 @@
 "la búsqueda. Si esto no se modifica, la búsqueda por omisión se realizará "
 "sobre la clase de objetos de tipo «person»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1099,7 +1091,7 @@
 "Seleccionar esta opción significa que Evolution sólo conectará con su "
 "servidor LDAP si su servidor LDAP soporta SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1107,7 +1099,7 @@
 "Seleccionar esta opción significa que Evolution sólo conectará con su "
 "servidor LDAP si su servidor LDAP soporta TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1117,23 +1109,23 @@
 "Esto significa que su conexión será insegura, y que usted será vulnerable a "
 "fallos de seguridad."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Bases de búsqueda soportadas"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 #: ../mail/em-account-editor.c:308
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1143,7 +1135,7 @@
 "búsquedas empezarán. Si deja esto en blanco, la búsqueda empezará en la raíz "
 "del árbol de directorios."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1155,7 +1147,7 @@
 "«sub» incluirá todas las entradas por debajo de su base de búsqueda. Un "
 "ámbito de «uno» sólo incluirá las entradas un nivel bajo su base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1163,7 +1155,7 @@
 "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.micompañia."
 "com»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1171,7 +1163,7 @@
 "Este es el máximo número de entradas para descargar. Si pone este número "
 "demasiado alto ralentizará su libreta de direcciones."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you. Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1181,7 +1173,7 @@
 "establecer esto a «Dirección de correo-e» requiere acceso anónimo a su "
 "servidor ldap."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1189,7 +1181,7 @@
 "Este nombre que identificará este servidor en la lista de carpetas de "
 "Evolution. Es sólo para poder mostrarlo en pantalla. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1199,35 +1191,35 @@
 "Se ha proporcionado una lista de puertos estándar. Pregunte a su "
 "administrador del sistema qué puerto debería especificar."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Usando «Nombre Distintivo» (ND)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "_Añadir libreta de direcciones"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "_Buscar bases de búsqueda posibles"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "Método de _inicio de sesión:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 #: ../calendar/gui/dialogs/calendar-setup.c:229
 #: ../mail/mail-config.glade.h:164
 #: ../plugins/groupwise-features/properties.glade.h:11
@@ -1235,33 +1227,33 @@
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "Á_mbito de búsqueda:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 #: ../mail/mail-config.glade.h:172
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "_Tiempo de expiración:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "Usar _conexión segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "tarjetas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
@@ -4039,7 +4031,7 @@
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 msgid "Couldn't get list of addressbooks"
-msgstr "No no pudo obtenerse una lista de libretas de direcciones"
+msgstr "No se pudo obtener una lista de libretas de direcciones"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
@@ -10274,7 +10266,7 @@
 
 #: ../composer/e-msg-composer.c:1533
 msgid "Unable to retrieve message from editor"
-msgstr "No no pudo obtenerse el mensaje del editor"
+msgstr "No se pudo obtener el mensaje del editor"
 
 #: ../composer/e-msg-composer.c:1820
 msgid "Untitled Message"
@@ -10349,7 +10341,7 @@
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
-msgstr "No no pudo obtenerse un mensaje al que adjuntar desde {0}."
+msgstr "No se pudo obtener un mensaje al que adjuntar desde {0}."
 
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not save to autosave file &quot;{0}&quot;."
@@ -11769,7 +11761,7 @@
 
 #: ../mail/em-folder-view.c:2529
 msgid "Unable to retrieve message"
-msgstr "No no pudo obtenerse el mensaje"
+msgstr "No se pudo obtener el mensaje"
 
 #: ../mail/em-folder-view.c:2548
 msgid "Retrieving Message..."
@@ -16933,11 +16925,11 @@
 msgid "_Proxy Login..."
 msgstr "Sesión _proxy…"
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:708
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
 
Index: po/ChangeLog
===================================================================
--- po/ChangeLog	(revision 35318)
+++ po/ChangeLog	(working copy)
@@ -1,3 +1,52 @@
+2008-04-30 Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-04-28 Yair Hershkovitz <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translaion.
+
+2008-04-16 Stanislav Brabec <sbrabec@hammer.suse.cz>
+
+	* cs.po: Typo fix.
+
+2008-04-14 Leonardo Ferreira Fontenelle <leonardof@svn.gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation and made some
+	fixes.
+
+2008-04-12 Yair Hershkovitz <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translaion by Mark Krapivner.
+
+2008-04-09 Yair Hershkovitz <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translaion.
+
+2008-04-09 Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* ja.po: Updated Japanese translation.
+
+2008-04-08 Yair Hershkovitz <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translaion.
+
+2008-04-07 Petr Kovar <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation by Jiri Eischmann.
+
+2008-04-07 Jorge Gonzalez <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation, fixes bug #525068
+
+2008-04-07 Gabor Kelemen <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated
+
+2008-04-05 Åsmund Skjæveland <aasmunds@ulrik.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
 2008-04-03 Philipp Kerling <k.philipp@gmail.com>
 
 	* de.po: Updated German translation.
Index: po/nn.po
===================================================================
--- po/nn.po	(revision 35318)
+++ po/nn.po	(working copy)
@@ -10,15 +10,14 @@
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-04 00:59+0100\n"
-"PO-Revision-Date: 2008-03-04 23:28+0100\n"
+"POT-Creation-Date: 2008-04-05 13:27+0200\n"
+"PO-Revision-Date: 2008-04-01 20:19+0200\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@ulrik.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -62,7 +61,7 @@
 
 #: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
-msgstr "Har alarmar."
+msgstr "Har varslingar."
 
 #: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
@@ -449,8 +448,10 @@
 msgstr "Evolution-adresseboka har avslutta uventa."
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "Biletet du har valt er stort. Vil du endra biletets storleik og lagra det?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"Biletet du har valt er stort. Vil du endra biletets storleik og lagra det?"
 
 #: ../addressbook/addressbook.error.xml.h:24
 msgid ""
@@ -529,7 +530,8 @@
 msgstr "Du har endra denne kontakten. Vil du lagra endringane?"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Kontaktane dine for {0} vil ikkje vera tilgjengelege før Evolution vert "
 "starta på nytt."
@@ -555,7 +557,7 @@
 
 #: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
-msgstr ""
+msgstr "Br_uk som det er"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44
@@ -705,7 +707,8 @@
 
 #: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
-msgstr "Klarte ikkje å oppgradera innstillingane eller mappene til adresseboka."
+msgstr ""
+"Klarte ikkje å oppgradera innstillingane eller mappene til adresseboka."
 
 #: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
@@ -721,7 +724,7 @@
 msgstr "Kopier _bokinnhald lokalt for å arbeida fråkopla"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
@@ -747,7 +750,7 @@
 msgstr "Autentisering"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaljar"
@@ -762,7 +765,7 @@
 msgstr "Lastar ned"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Addressebokeigenskapar"
 
@@ -857,7 +860,7 @@
 #: ../calendar/gui/e-calendar-table.c:1387
 #: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
 #: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1346
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -969,105 +972,98 @@
 msgstr "Autentisering"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "Display"
-msgstr "Vis"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Downloading"
 msgstr "Lastar ned"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Searching"
 msgstr "Søkjer"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Server Information"
-msgstr "Tenarinformasjon"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Type:"
 msgstr "Type:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Legg til adressebok"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 #: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "Alltid"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "Enkel"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "Eintydig namn (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "E-postadresse"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution kjem til å bruka denne e-postaddressa til å autentisera deg mot "
 "tenaren."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "Finn moglege søkjebasar"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "Namn å lo_gga på med:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "Aldri"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../mail/em-account-editor.c:304
 msgid "No encryption"
 msgstr "Inga kryptering"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "Eitt"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:312
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "Søkjefilter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Søkje_base:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "Søkje_filter:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "Søkjefilter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by default search will be performed on "
@@ -1076,7 +1072,7 @@
 "Søkjefilter er typen objekt du vil søkja etter. Dersom denne ikkje vert "
 "endra, vil søket verta gjort på objekt av typen «person»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1084,7 +1080,7 @@
 "Dette valet gjer at Evolution berre vil kopla til LDAP-tenaren dersom denne "
 "støttar SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1092,7 +1088,7 @@
 "Dette valet gjer at Evolution berre vil kopla til LDAP-tenaren dersom denne "
 "støttar TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1102,23 +1098,23 @@
 "tyder at tilkoplinga di ikkje er trygg, og du vil vera sårbar for eventuelle "
 "trygglekshol. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "Under"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Støtta søkjebasar"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 #: ../mail/em-account-editor.c:308
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1128,7 +1124,7 @@
 "starta. Dersom du let denne stå blank, vil søka byrja ved rota på "
 "katalogtreet."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1140,13 +1136,13 @@
 "Dersom du vel «eitt», vil berre oppføringane eitt nivå under søkjebasen din "
 "brukast."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Dette er det fulle namnet på LDAP-tenaren. T.d. «ldap.mittfirma.no»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1154,7 +1150,7 @@
 "Dette er øvre grense for kor mange oppføringar som skal lastast ned. Å setja "
 "dette talet for høgt vil få adresseboka di til å gå sakte."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you. Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1164,7 +1160,7 @@
 "at å setja dette til «e-post-adresse» krev at anonym tilgang til LDAP-"
 "tenaren."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1172,7 +1168,7 @@
 "Dette er det namnet på tenaren som vert vist i Evolution si mappeliste.Det "
 "vert berre brukt til å visast på skjermen. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1182,35 +1178,35 @@
 "liste over standardportar er gitt. Spør systemadministratoren din kva for "
 "ein port du skal bruka."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Oppgje eintydig namn (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Oppgje e-post adresse"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "Når det er mogleg"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "_Legg til adressebok"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Ne_dlastingsgrense:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "_Finn moglege søkjebasar"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "På_loggingsmetode:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 #: ../calendar/gui/dialogs/calendar-setup.c:229
 #: ../mail/mail-config.glade.h:164
 #: ../plugins/groupwise-features/properties.glade.h:11
@@ -1218,33 +1214,33 @@
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "Sø_keområde:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 #: ../mail/mail-config.glade.h:172
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "Te_nar:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "_Tidsavbrot:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "Br_uk trygg tilkopling:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "kort"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
@@ -3010,7 +3006,7 @@
 #: ../calendar/gui/dialogs/comp-editor.c:457
 #: ../calendar/gui/e-calendar-table.c:1373
 #: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
+#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:996
 #: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
@@ -3654,7 +3650,7 @@
 msgstr "Feil ved fjerning av kontakt"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
@@ -3663,9 +3659,13 @@
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
 "Å opna %d kontakt vil óg opna %d nytt vindauge på skjermen.\n"
-"Vil du verkeleg visa denne kontakten?"
+"Vil du verkeleg visa denne kontakten?Å opna %d kontaktar vil óg opna %d nye "
+"vindauge på skjermen.\n"
+"Vil du verkeleg visa alle desse kontaktane?"
 msgstr[1] ""
-"Å opna %d kontaktar vil óg opna %d nye vindauge på skjermen.\n"
+"Å opna %d kontakt vil óg opna %d nytt vindauge på skjermen.\n"
+"Vil du verkeleg visa denne kontakten?Å opna %d kontaktar vil óg opna %d nye "
+"vindauge på skjermen.\n"
 "Vil du verkeleg visa alle desse kontaktane?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:305
@@ -4078,7 +4078,8 @@
 msgstr "TAL"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "Feil i kommandolinjeargumenta. Bruk --help for å sjå ein hjelpetekst."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:116
@@ -4118,7 +4119,8 @@
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
-msgstr "Eit meiningsfullt samandrag vil fortelja mottakarane kva oppgåva handlar om."
+msgstr ""
+"Eit meiningsfullt samandrag vil fortelja mottakarane kva oppgåva handlar om."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid "All information in these memos will be deleted and can not be restored."
@@ -4147,13 +4149,15 @@
 "gjenopprettast."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om denne avtalen vil verta sletta og kan ikkje "
 "gjenopprettast."
 
 #: ../calendar/calendar.error.xml.h:10
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om dette møtet vil verta sletta, og kan ikkje "
 "gjenopprettast."
@@ -4269,7 +4273,8 @@
 "høve til å godta denne oppgåva."
 
 #: ../calendar/calendar.error.xml.h:35
-msgid "Email invitations will be sent to all participants and allow them to reply."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-post-invitasjonar vil verta sendt til alle deltakarane, som óg vil verta "
 "bedne om å svara."
@@ -4448,7 +4453,8 @@
 
 #: ../calendar/calendar.error.xml.h:70
 msgid "Your memos will not be available until Evolution is restarted."
-msgstr "Notata dine vil ikkje vera tilgjengelege før Evolution vert starta på nytt."
+msgstr ""
+"Notata dine vil ikkje vera tilgjengelege før Evolution vert starta på nytt."
 
 #: ../calendar/calendar.error.xml.h:71
 msgid "Your tasks will not be available until Evolution is restarted."
@@ -4608,7 +4614,7 @@
 # TRN: Påminning om ein alarm? Rare greier.
 #: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalender alarmpåminningsteneste"
+msgstr "Evolution kalender varslingsteneste"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
 msgid "minute"
@@ -4648,7 +4654,7 @@
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze _time:"
-msgstr "Tid alarmen skal utsetjast:"
+msgstr "U_tsett varselet:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
@@ -4690,7 +4696,7 @@
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1533
 #, c-format
 msgid "You have %d alarms"
-msgstr "Du har %d alarmar"
+msgstr "Du har %d varsel"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1695
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1723
@@ -4739,7 +4745,7 @@
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
-msgstr "Kan ikkje laga factory for alarmvarslingstenesta, kanskje han alt køyrer."
+msgstr "Kan ikkje laga factory for varselstenesta, kanskje han alt køyrer."
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
@@ -4776,7 +4782,7 @@
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
-msgstr "Alarm-program"
+msgstr "Varslingsprogram"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
@@ -4784,7 +4790,8 @@
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Bakgrunnsfarge på oppgåver som skal vera ferdige i dag, i «#rrggbb»-format."
+msgstr ""
+"Bakgrunnsfarge på oppgåver som skal vera ferdige i dag, i «#rrggbb»-format."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
@@ -4792,10 +4799,11 @@
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
-msgstr "Kalender å køyra alarmar for"
+msgstr "Kalender å varsla for"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "Farge å teikna Marcus Bains-linja i tidslinja (tom for standard)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
@@ -4828,11 +4836,11 @@
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Directory for saving alarm audio files"
-msgstr ""
+msgstr "Katalog å lagra varslingslydfiler i"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Event Gradient"
-msgstr "Grafient på hendingar"
+msgstr "Gradient på hendingar"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Transparency"
@@ -4880,7 +4888,7 @@
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
-msgstr "Førre alarmtid"
+msgstr "Førre varslingstid"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
@@ -4977,11 +4985,11 @@
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
-msgstr "Program som kan køyrast av alarmar."
+msgstr "Program som kan køyrast av varsel."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Save directory for alarm audio"
-msgstr ""
+msgstr "Katalog å lagra varslingslydfiler i"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
@@ -5001,7 +5009,7 @@
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
-msgstr "Vis varslingar i varslingstrau"
+msgstr "Vis varsel i varslingstrau"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
@@ -5060,7 +5068,7 @@
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
-msgstr "Tida alarmen vart køyrt sist"
+msgstr "Tida varslinga vart køyrt sist, i time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 #: ../plugins/startup-wizard/startup-wizard.c:108
@@ -5084,7 +5092,8 @@
 msgstr "Einingar for standard påminnar, «minutt», «timar» eller «dagar»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Einingar for å avgjera når oppgåver skal gøymast, «minutt», «timar» eller "
 "«dagar»"
@@ -5099,7 +5108,7 @@
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Om varslingstrauet skal brukast til alarmar."
+msgstr "Om varslingstrauet skal brukast til å visa tidsvarslingar."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -5126,8 +5135,10 @@
 msgstr "Om sluttidspunkt for avtalar i veke- og månadsframsyning skal visast."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "Om Marcus Bains-linja (linje som markerer «no») skal teiknast i kalenderen."
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+"Om Marcus Bains-linja (linje som markerer «no») skal teiknast i kalenderen."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
@@ -5139,7 +5150,8 @@
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Om svar etterlyst-feltet skal visast i hending/oppgåve/møte-redigeringa"
+msgstr ""
+"Om svar etterlyst-feltet skal visast i hending/oppgåve/møte-redigeringa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
@@ -5154,7 +5166,8 @@
 msgstr "Om statusfeltet skal visast i hending/oppgåve/møte-redigeringa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Om tider skal visast i 24-timarsformat i staden for 12-timarsformat."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
@@ -5224,7 +5237,7 @@
 
 #: ../calendar/gui/cal-search-bar.c:631
 msgid "Next 7 Days' Tasks"
-msgstr ""
+msgstr "Oppgåver dei neste sju dagane"
 
 #: ../calendar/gui/cal-search-bar.c:635
 msgid "Active Tasks"
@@ -5306,14 +5319,14 @@
 
 #: ../calendar/gui/calendar-component.c:606
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2085
 msgid "_Copy..."
 msgstr "_Kopier ..."
 
 #: ../calendar/gui/calendar-component.c:612
 #: ../calendar/gui/dialogs/comp-editor.c:1130
 #: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
+#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2099
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Eigenskapar"
@@ -5427,7 +5440,7 @@
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:616
 msgid "Edit Alarm"
-msgstr "Rediger alarm"
+msgstr "Rediger varsel"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "Alarm"
@@ -5443,7 +5456,7 @@
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
-msgstr "Legg til alarm"
+msgstr "Legg til varsling"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
@@ -5451,7 +5464,7 @@
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
-msgstr "Sjølvvalt alarmlyd"
+msgstr "Sjølvvalt varsellyd"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
@@ -5550,7 +5563,7 @@
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
-msgstr "Alarmar"
+msgstr "Varsel"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
 #: ../composer/e-msg-composer-select-file.c:93
@@ -5563,7 +5576,7 @@
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
 msgid "Selected Calendars for Alarms"
-msgstr "Valde kalendrar for alarmar"
+msgstr "Valde kalendrar for varsel"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid ""
@@ -5581,7 +5594,8 @@
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid "%u and %d will be replaced by user and domain from the email address."
+msgid ""
+"%u and %d will be replaced by user and domain from the email address."
 msgstr "%u og %d vil bytast ut med brukar og domene frå e-post-adressa."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
@@ -5681,7 +5695,7 @@
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Select the calendars for alarm notification"
-msgstr "Vel kalendrar for alarmvarsling"
+msgstr "Vel kalendrar for varsel"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sh_ow a reminder"
@@ -5890,7 +5904,8 @@
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s You have made changes. Forget those changes and update the editor?"
-msgstr "%s Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
+msgstr ""
+"%s Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
@@ -5938,13 +5953,13 @@
 msgstr[1] "%d vedlagte meldingar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
 #: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
 msgid "_Move"
 msgstr "_Flytt"
 
 #: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2068
 msgid "Cancel _Drag"
 msgstr "Avbryt _dra"
 
@@ -6064,7 +6079,8 @@
 
 #: ../calendar/gui/dialogs/delete-comp.c:206
 msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Sletta dette elementet frå alle dei andre mottakarane sine postkassar?"
+msgstr ""
+"_Sletta dette elementet frå alle dei andre mottakarane sine postkassar?"
 
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
@@ -6139,7 +6155,7 @@
 #: ../calendar/gui/dialogs/event-page.c:826
 #: ../calendar/gui/dialogs/event-page.c:2835
 msgid "This event has alarms"
-msgstr "Denne hendinga har alarmar"
+msgstr "Denne hendinga har varslingar"
 
 #: ../calendar/gui/dialogs/event-page.c:906
 #: ../calendar/gui/dialogs/event-page.glade.h:11
@@ -6214,7 +6230,7 @@
 #: ../calendar/gui/dialogs/task-page.c:1928
 #, c-format
 msgid "You are acting on behalf of %s"
-msgstr ""
+msgstr "Du handlar på vegne av %s"
 
 #: ../calendar/gui/dialogs/event-page.c:3053
 #, c-format
@@ -6277,7 +6293,7 @@
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
-msgstr "Sjølvvald alarm:"
+msgstr "Sjølvvald varsel:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "D_escription:"
@@ -6295,7 +6311,7 @@
 
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
-msgstr "_Alarm"
+msgstr "_Varsel"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
@@ -6409,7 +6425,8 @@
 
 #: ../calendar/gui/dialogs/recurrence-page.c:505
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Denne avtalen skal gjenta seg på ein måte som Evolution ikkje kan redigera."
+msgstr ""
+"Denne avtalen skal gjenta seg på ein måte som Evolution ikkje kan redigera."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:826
 msgid "Recurrence date is invalid"
@@ -6516,15 +6533,15 @@
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to modify."
-msgstr ""
+msgstr "Klarte ikkje å finna eit utval å endra."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2216
 msgid "Modify exception"
-msgstr ""
+msgstr "Endra unntak"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2262
 msgid "Could not get a selection to delete."
-msgstr ""
+msgstr "Klarte ikkje å finna eit utval å sletta."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2393
 msgid "Date/Time"
@@ -6964,7 +6981,7 @@
 msgid "_Save Selected"
 msgstr "_Lagra valde"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:796
 #, c-format
 msgid "Open in %s..."
 msgstr "Opna i %s ..."
@@ -7451,7 +7468,8 @@
 msgstr "Møtet er avlyst, men det var ikkje ført opp i kalenderane dine"
 
 #: ../calendar/gui/e-itip-control.c:1268
-msgid "The task has been canceled, however it could not be found in your task lists"
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr "Oppgåva er avlyst, men ho var ikkje ført opp i oppgåvelistene dine"
 
 #: ../calendar/gui/e-itip-control.c:1346
@@ -7609,7 +7627,8 @@
 #: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "%s has replied to a free/busy request."
-msgstr "%s har svart på ein førespurnad etter ledig/oppteken-informasjon."
+msgstr ""
+"%s har svart på ein førespurnad etter ledig/oppteken-informasjon."
 
 #: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Reply"
@@ -7651,7 +7670,8 @@
 
 #: ../calendar/gui/e-itip-control.c:2026
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
+msgstr ""
+"Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
 
 #: ../calendar/gui/e-itip-control.c:2050
 msgid "Attendee status updated\n"
@@ -7660,7 +7680,8 @@
 #: ../calendar/gui/e-itip-control.c:2057
 #: ../plugins/itip-formatter/itip-formatter.c:1251
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
+msgstr ""
+"Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
 
 #: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
 msgid "Item sent!\n"
@@ -10209,7 +10230,8 @@
 msgstr "Sett inn vedlegg"
 
 #: ../composer/e-msg-composer.c:819
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikkje signera utgåande melding. Ingen signeringssertifikat til denne "
 "kontoen"
@@ -10353,10 +10375,12 @@
 "Send options available only for Novell Groupwise and Microsoft Exchange "
 "accounts."
 msgstr ""
+"Alternativ for sending er berre tilgjengeleg for Novell Groupwise- og "
+"Microsoft Exchange-kontoar."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
-msgstr ""
+msgstr "Alternativ for sending er ikkje tilgjengelege."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -10405,7 +10429,7 @@
 msgid "_Do not Recover"
 msgstr "_Ikkje gjenopprett"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
 msgid "_Recover"
 msgstr "_Gjenopprett"
 
@@ -10417,13 +10441,13 @@
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution e-post og kalender"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
 msgid "Groupware Suite"
 msgstr "Gruppevarepakke"
 
 #: ../data/evolution.desktop.in.in.h:3
 msgid "Manage your email, contacts and schedule"
-msgstr ""
+msgstr "Handsama e-post, kontaktar og kalender"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10461,11 +10485,12 @@
 
 #: ../e-util/e-print.c:145
 msgid "The printing system reported the following details about the error:"
-msgstr ""
+msgstr "Utskriftssystemet gav denne meldinga om feilen:"
 
 #: ../e-util/e-print.c:151
-msgid "The printing system did not report any additional details about the error."
-msgstr ""
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr "Utskriftssystemet gav ikkje fleire meldingar om feilen."
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10533,7 +10558,7 @@
 
 #: ../e-util/e-util-labels.c:362
 msgid "Label with same tag already exists. Rename your label please."
-msgstr ""
+msgstr "Merkelapp med det namnet finst frå før. Vel eit anna namn."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -10546,8 +10571,8 @@
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Eitt sekund fram i tid"
+msgstr[1] "%d sekund fram i tid"
 
 #: ../filter/filter-datespec.c:81
 #, c-format
@@ -10560,8 +10585,8 @@
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Eitt minutt fram i tid"
+msgstr[1] "%d minutt fram i tid"
 
 #: ../filter/filter-datespec.c:82
 #, c-format
@@ -10602,8 +10627,8 @@
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ei veke fram i tid"
+msgstr[1] "%d veker fram i tid"
 
 #: ../filter/filter-datespec.c:85
 #, c-format
@@ -10803,7 +10828,7 @@
 
 #: ../filter/filter.glade.h:16
 msgid "in the future"
-msgstr ""
+msgstr "fram i tid"
 
 #: ../filter/filter.glade.h:18
 msgid "months"
@@ -10848,7 +10873,8 @@
 msgstr "Redigeringsinstillingar"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr "Set opp e-postinnstillingar, inkludert tryggleik og meldingsframsyning"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -11067,7 +11093,7 @@
 
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
-msgstr ""
+msgstr "Bcc"
 
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
@@ -11075,7 +11101,7 @@
 
 #: ../mail/em-filter-i18n.h:8
 msgid "CC"
-msgstr ""
+msgstr "Cc"
 
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
@@ -11446,7 +11472,7 @@
 msgstr "Kladd"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
+#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2535
 #: ../mail/mail-component.c:156
 #: ../plugins/exchange-operations/exchange-delegates-user.c:88
 #: ../plugins/exchange-operations/exchange-folder.c:593
@@ -11513,20 +11539,20 @@
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikkje sleppa meldingar i topplageret"
 
-#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar gjennom mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
@@ -11534,32 +11560,32 @@
 msgid "_View"
 msgstr "_Vis"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2078
 msgid "Open in _New Window"
 msgstr "Opna i _nytt vindauge"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2083
 msgid "_New Folder..."
 msgstr "_Ny mappe ..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2086
 msgid "_Move..."
 msgstr "_Flytt ..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Gje nytt namn ..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2094
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2095
 msgid "Fl_ush Outbox"
 msgstr "Tøm _utboks"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Tøm papirkorga"
 
@@ -11598,11 +11624,11 @@
 
 #: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
-msgstr ""
+msgstr "Klarte ikkje sletta e-post"
 
 #: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
-msgstr ""
+msgstr "Du har ikkje løyve til å sletta denne e-posten."
 
 #: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
@@ -11741,7 +11767,7 @@
 
 #: ../mail/em-folder-view.c:2807
 msgid "C_all To..."
-msgstr ""
+msgstr "R_ing til ..."
 
 #: ../mail/em-folder-view.c:2810
 msgid "Create _Search Folder"
@@ -11842,7 +11868,7 @@
 
 #: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
 msgid "Signature exists, but need public key"
-msgstr ""
+msgstr "Har signatur, men treng offentleg nøkkel"
 
 #: ../mail/em-format-html-display.c:996
 msgid ""
@@ -11979,11 +12005,11 @@
 
 #: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
 msgid "View _Unformatted"
-msgstr ""
+msgstr "Vis _uformatert"
 
 #: ../mail/em-format-html-display.c:2509
 msgid "Hide _Unformatted"
-msgstr ""
+msgstr "Gøym _uformatert"
 
 #: ../mail/em-format-html-display.c:2564
 msgid "O_pen With"
@@ -11994,6 +12020,8 @@
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
+"Denne e-posten er for stor til at Evolution klarar å visa han. Du kan sjå "
+"han uformatert eller opna han i eit eksternt tekstredigeringsprogram."
 
 #: ../mail/em-format-html-print.c:156
 #, c-format
@@ -12092,7 +12120,7 @@
 #: ../mail/em-format-html.c:1866
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
-msgstr ""
+msgstr "Denne meldinga vart sendt av %s på vegne av %s"
 
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
@@ -12168,19 +12196,19 @@
 
 #: ../mail/em-mailer-prefs.c:341
 msgid "Add Custom Junk Header"
-msgstr ""
+msgstr "Legg til eigendefinert skrot-meldingshovud"
 
 #: ../mail/em-mailer-prefs.c:345
 msgid "Header Name:"
-msgstr ""
+msgstr "Namn på hovud:"
 
 #: ../mail/em-mailer-prefs.c:346
 msgid "Header Value Contains:"
-msgstr ""
+msgstr "Hovudverdien inneheld:"
 
 #: ../mail/em-mailer-prefs.c:451
 msgid "Contains Value"
-msgstr ""
+msgstr "Inneheld verdien"
 
 #: ../mail/em-mailer-prefs.c:473
 msgid "Color"
@@ -12194,17 +12222,19 @@
 #: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
 #, c-format
 msgid "%s plugin is available and the binary is installed."
-msgstr ""
+msgstr "Tillegget %s er tilgjengeleg og installert."
 
 #. May be a better text
 #: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
 #, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
 msgstr ""
+"Tillegget %s er ikkje tilgjengeleg. Kontroller om pakken er installert."
 
 #: ../mail/em-mailer-prefs.c:1115
 msgid "No Junk plugin available"
-msgstr ""
+msgstr "Ingen skrot-tillegg tilgjengelege"
 
 #. green
 #: ../mail/em-migrate.c:1057
@@ -12348,7 +12378,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "Allows evolution to display text part of limited size"
-msgstr ""
+msgstr "Lar Evolution visa ein tekstdel med avgrensa storleik"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "Always request read receipt"
@@ -12356,7 +12386,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:3
 msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr ""
+msgstr "Kor lang tid, i sekund, feilmeldinga skal visast på statuslinja."
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "Automatic emoticon recognition"
@@ -12388,7 +12418,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:11
 msgid "Composer load/attach directory"
-msgstr ""
+msgstr "Mappe redigeringsprogrammet lastar opp eller ned vedlegg i"
 
 #: ../mail/evolution-mail.schemas.in.h:12
 msgid "Compress display of addresses in TO/CC/BCC"
@@ -12438,7 +12468,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default value for thread expand state"
-msgstr ""
+msgstr "Standardverdi for om trådar er utvida"
 
 #: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default width of the Composer Window."
@@ -12454,7 +12484,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:27
 msgid "Determines whether to lookup in addressbook for sender email"
-msgstr ""
+msgstr "Styrer om avsendaradressa vert slått opp i adresseboka"
 
 #: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
@@ -12463,10 +12493,15 @@
 "can be slow, if remote addressbooks (like ldap) are marked for "
 "autocompletion."
 msgstr ""
+"Styrer om avsendaren vert slått opp i adresseboka. Om han vert funnen, vert "
+"ikkje meldinga rekna som skrot. Funksjonen ser etter i adressebøker som vert "
+"brukt til automatisk fullføring av adresser. Det kan gå tregt dersom "
+"eksterne adressebøker (t.d. ldap) vert brukt til autofullføring."
 
 #: ../mail/evolution-mail.schemas.in.h:29
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
+"Styrer om eigendefinerte meldingshovud skal brukast til å sjå etter skrot"
 
 #: ../mail/evolution-mail.schemas.in.h:30
 msgid ""
@@ -12474,20 +12509,25 @@
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 msgstr ""
+"Styrer om eigendefinerte meldingshovud skal brukast til å sjå etter skrot. "
+"Dersom dette valet er vald og meldingshovuda er nemnde, vil skrotkontrollen "
+"gå raskare."
 
 #: ../mail/evolution-mail.schemas.in.h:31
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
+"Styrer om den same skrifttpyen skal brukast i «Frå»- og «Emne»-linjene i "
+"«Meldingar»-kolonna i den loddrette framsyninga."
 
 #: ../mail/evolution-mail.schemas.in.h:32
 msgid "Directory for loading/attaching files to composer."
-msgstr ""
+msgstr "Mappe å mellomlagra vedlegg i under redigering."
 
 #: ../mail/evolution-mail.schemas.in.h:33
 msgid "Directory for saving mail component files."
-msgstr ""
+msgstr "Mappe å lagra meldingsdelar i."
 
 #: ../mail/evolution-mail.schemas.in.h:34
 msgid "Draw spelling error indicators on words as you type."
@@ -12527,7 +12567,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:43
 msgid "Enable search folders on startup."
-msgstr ""
+msgstr "Slå på søkjemapper ved oppstart."
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
@@ -12545,10 +12585,12 @@
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr ""
+"Slå på dette valet for å bruka mellomromstasten til å rulla i "
+"meldingsførehandsvisinga, meldingslista og mappene."
 
 #: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable to render message text part of limited size."
-msgstr ""
+msgstr "Slå på for å visa ein del av meldingsteksten."
 
 #: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable/disable caret mode"
@@ -12564,7 +12606,7 @@
 
 #: ../mail/evolution-mail.schemas.in.h:50
 msgid "Hides the per-folder preview and removes the selection"
-msgstr ""
+msgstr "Gøymer per-mappe-førehandsframsyninga og fjernar merkinga"
 
 #: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
@@ -12578,7 +12620,8 @@
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
-msgstr "Dersom «førehandsvis»-feltet er på, vis side-ved-side i staden for loddrett."
+msgstr ""
+"Dersom «førehandsvis»-feltet er på, vis side-ved-side i staden for loddrett."
 
 #: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
@@ -12600,6 +12643,8 @@
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
 msgstr ""
+"Det slår av/på gjentatte spørsmål om synkronisering er naudsynt før skifte "
+"til fråkopla modus."
 
 #: ../mail/evolution-mail.schemas.in.h:56
 msgid ""
@@ -12654,7 +12699,8 @@
 
 #: ../mail/evolution-mail.schemas.in.h:66
 msgid "List of mime types to check for bonobo component viewers"
-msgstr "Liste over MIME-typar som skal bruka bonobo-komponent-framsynarar om mogleg"
+msgstr ""
+"Liste over MIME-typar som skal bruka bonobo-komponent-framsynarar om mogleg"
 
 #: ../mail/evolution-mail.schemas.in.h:67
 msgid "List of protocol names whose license has been accepted."
@@ -12720,11 +12766,13 @@
 
 #: ../mail/evolution-mail.schemas.in.h:81
 msgid "Minimum days between emptying the junk on exit"
-msgstr "Minste tal på dagar mellom kvar gong skrotposten vert sletta når du avsluttar"
+msgstr ""
+"Minste tal på dagar mellom kvar gong skrotposten vert sletta når du avsluttar"
 
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid "Minimum days between emptying the trash on exit"
-msgstr "Minste tal på dagar mellom kvar gong papirkorga vert tømt når du avsluttar"
+msgstr ""
+"Minste tal på dagar mellom kvar gong papirkorga vert tømt når du avsluttar"
 
 #: ../mail/evolution-mail.schemas.in.h:83
 msgid "Minimum time between emptying the junk on exit, in days."
@@ -12734,7 +12782,8 @@
 
 #: ../mail/evolution-mail.schemas.in.h:84
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "Minste tid mellom kvar gong papirkorga vert tømt når du avsluttar, i dagar."
+msgstr ""
+"Minste tid mellom kvar gong papirkorga vert tømt når du avsluttar, i dagar."
 
 #: ../mail/evolution-mail.schemas.in.h:85
 msgid "Number of addresses to display in TO/CC/BCC"
@@ -12749,7 +12798,8 @@
 msgstr "Sei ifrå når brukaren tømmer ei av mappe."
 
 #: ../mail/evolution-mail.schemas.in.h:88
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Spør brukaren når han prøver å senda ei melding utan emne."
 
 #: ../mail/evolution-mail.schemas.in.h:89
@@ -12776,7 +12826,8 @@
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr "Spør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slikt."
+msgstr ""
+"Spør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slikt."
 
 #: ../mail/evolution-mail.schemas.in.h:95
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
@@ -13431,7 +13482,6 @@
 msgstr "_Signer alle utgåande meldingar frå denne kontoen"
 
 #: ../mail/mail-config.glade.h:38
-#, fuzzy
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Krypter óg til meg sjølv når eg sender kryptert e-post"
 
@@ -13448,7 +13498,6 @@
 msgstr "S_tol alltid på nøklar i nøkkelringen min ved kryptering"
 
 #: ../mail/mail-config.glade.h:42
-#, fuzzy
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Alltid krypter til _meg sjølv når eg sender e-post"
 
@@ -13477,9 +13526,8 @@
 msgstr "T_eiknsett:"
 
 #: ../mail/mail-config.glade.h:50
-#, fuzzy
 msgid "C_heck custom headers for junk"
-msgstr "Sjå etter skrot i _inngåande post"
+msgstr "Sjå etter skrot i _sjølvvalde meldingshovud"
 
 #: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
@@ -13662,7 +13710,8 @@
 msgstr "Meldingsredigering"
 
 #: ../mail/mail-config.glade.h:105
-msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 
 #: ../mail/mail-config.glade.h:106
@@ -13810,7 +13859,8 @@
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "Denne lista av språk inneheld berre språk du har installert ordliste til."
+msgstr ""
+"Denne lista av språk inneheld berre språk du har installert ordliste til."
 
 #: ../mail/mail-config.glade.h:143
 msgid ""
@@ -13823,7 +13873,8 @@
 "verta brukt til å kjenna att skriptet i Evolution. "
 
 #: ../mail/mail-config.glade.h:146
-msgid "This option will be overridden if a match for custom junk headers is found."
+msgid ""
+"This option will be overridden if a match for custom junk headers is found."
 msgstr ""
 
 #: ../mail/mail-config.glade.h:147
@@ -13867,7 +13918,8 @@
 
 #: ../mail/mail-config.glade.h:157
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "Ikkje signer førespurnader om _møter (for å vera kompatibel med Outlook)"
+msgstr ""
+"Ikkje signer førespurnader om _møter (for å vera kompatibel med Outlook)"
 
 #: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
@@ -13899,7 +13951,8 @@
 
 #: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
+msgstr ""
+"S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
@@ -14046,7 +14099,7 @@
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensavtalen"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:831
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
@@ -14341,11 +14394,13 @@
 msgstr "Ny søkjemappe"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid ""
+"A folder named &quot;{0}&quot; already exists. Please use a different name."
 msgstr "Ei mappe som heiter «{0}» finst frå før. Bruk eit anna namn."
 
 #: ../mail/mail.error.xml.h:2
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "Ei mappe som har namnet «{1}» finst frå før. Bruk eit anna namn."
 
 #: ../mail/mail.error.xml.h:3
@@ -14364,7 +14419,8 @@
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
-msgstr "«{1}» har bede om kvittering på mottak/lesing. Senda kvittering til {0}?"
+msgstr ""
+"«{1}» har bede om kvittering på mottak/lesing. Senda kvittering til {0}?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -14376,7 +14432,8 @@
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
-msgstr "Eit meiningsfullt emne vil fortelja mottakarane kva e-posten din er om."
+msgstr ""
+"Eit meiningsfullt emne vil fortelja mottakarane kva e-posten din er om."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -14387,7 +14444,8 @@
 msgstr "Er du sikker på at du vil sletta denne kontoen?"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Er du sikker på at du vil kopla ut denne kontoen og sletta alle dei "
 "tilhøyrande mellomtenarane?"
@@ -14418,7 +14476,8 @@
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Er du sikker på at du vil senda ein e-post med berre blindkopi-mottakarar?"
+msgstr ""
+"Er du sikker på at du vil senda ein e-post med berre blindkopi-mottakarar?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
@@ -14832,17 +14891,21 @@
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr "Denne meldinga kan ikkje sendast fordi kontoen du sender frå er slått av"
+msgstr ""
+"Denne meldinga kan ikkje sendast fordi kontoen du sender frå er slått av"
 
 #: ../mail/mail.error.xml.h:115
-msgid "This message cannot be sent because you have not specified any recipients"
-msgstr "Denne meldinga kan du ikkje senda. Du har ikkje oppgjeve nokon mottakarar"
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+"Denne meldinga kan du ikkje senda. Du har ikkje oppgjeve nokon mottakarar"
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "SMTP-tenaren «%s» støttar ikkje den etterspurde autentiseringstypen %s."
+msgstr ""
+"SMTP-tenaren «%s» støttar ikkje den etterspurde autentiseringstypen %s."
 
 #: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
@@ -15008,7 +15071,7 @@
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: ../mail/message-list.c:3849
+#: ../mail/message-list.c:3838
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
@@ -15310,7 +15373,8 @@
 msgstr "Er du sikker på at du vil avslutta Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
 "Er du sikker på at du vil gjenoppretta Evolution frå den valde "
 "tryggleikskopien?"
@@ -15363,8 +15427,10 @@
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
-msgid "_Automatically create entries in the addressbook when responding to messages"
-msgstr "Legg _automatisk oppføringar til i adresseboka når du svarar på meldingar"
+msgid ""
+"_Automatically create entries in the addressbook when responding to messages"
+msgstr ""
+"Legg _automatisk oppføringar til i adresseboka når du svarar på meldingar"
 
 #: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
@@ -15379,7 +15445,8 @@
 msgid ""
 "Periodically synchronize contact information and images from Pidgin buddy "
 "list"
-msgstr "Synkroniser kontaktinformasjon og bilete frå kameratlista i Pidgin jamnleg"
+msgstr ""
+"Synkroniser kontaktinformasjon og bilete frå kameratlista i Pidgin jamnleg"
 
 #: ../plugins/bbdb/bbdb.c:607
 msgid "Select Address book for Pidgin buddy list"
@@ -15423,6 +15490,10 @@
 msgstr ""
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr ""
 
@@ -15549,7 +15620,8 @@
 msgstr "Kontroller om Evolution er standard e-post-program"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Kvar gong Evolution startar kontrollerer han om han er standard e-post-"
 "program."
@@ -15567,7 +15639,7 @@
 msgstr "Vil du gjera Evolution til standard e-postlesar?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:690
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -16093,9 +16165,8 @@
 msgstr "Exchange - Sendingsalternativ"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-#, fuzzy
 msgid "I_mportance: "
-msgstr "_Viktig"
+msgstr "_Prioritet: "
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:5
 msgid ""
@@ -16314,7 +16385,8 @@
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
-msgstr "Dersom OWA køyrer langs ein annan sti må du oppgje det i oppsettdialogen."
+msgstr ""
+"Dersom OWA køyrer langs ein annan sti må du oppgje det i oppsettdialogen."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Mailbox for {0} is not on this server."
@@ -16464,7 +16536,8 @@
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
-msgstr "Noverande bruk er: {0} kiB. Du kan ikkje senda eller motta meir e-post no."
+msgstr ""
+"Noverande bruk er: {0} kiB. Du kan ikkje senda eller motta meir e-post no."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
@@ -16736,7 +16809,7 @@
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
 msgid "Subscribe to my _alarms"
-msgstr "_Abonnér på mine _alarmar"
+msgstr "Tinga v_arslingane mine"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
 msgid "Subscribe to my _notifications"
@@ -16778,11 +16851,11 @@
 msgid "_Proxy Login..."
 msgstr "_Mellomtenarinnlogging"
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Mellomtenar-fana vil berre vera tilgjengeleg når kontoen er tilkopla."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:708
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Mellomtenar-fana vil berre vera tilgjengeleg når kontoen er slått på."
 
@@ -16984,7 +17057,8 @@
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
 msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr "Synkroniser den valde oppgåva/notatet/kalenderen/adresseboka med Apple iPod"
+msgstr ""
+"Synkroniser den valde oppgåva/notatet/kalenderen/adresseboka med Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -17147,7 +17221,8 @@
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
-msgstr "For å handsama alle desse elementa bør fila lagrast og kalenderen importerast"
+msgstr ""
+"For å handsama alle desse elementa bør fila lagrast og kalenderen importerast"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
@@ -17378,7 +17453,8 @@
 
 #: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
-msgid "%s wishes to receive the latest information for the following meeting:"
+msgid ""
+"%s wishes to receive the latest information for the following meeting:"
 msgstr "%s ber om å få den nyaste møteinformasjonen om:"
 
 #: ../plugins/itip-formatter/itip-view.c:389
@@ -17474,8 +17550,10 @@
 
 #: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
-msgid "%s through %s has sent back the following assigned task response:"
-msgstr "%s gjennom %s har sendt tilbake eit svar til ei tildelt oppgåve:"
+msgid ""
+"%s through %s has sent back the following assigned task response:"
+msgstr ""
+"%s gjennom %s har sendt tilbake eit svar til ei tildelt oppgåve:"
 
 #: ../plugins/itip-formatter/itip-view.c:479
 #, c-format
@@ -17494,8 +17572,10 @@
 
 #: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
-msgid "%s through %s has proposed the following task assignment changes:"
-msgstr "%s gjennom %s har føreslått desse endringane i oppgåvetildelinga:"
+msgid ""
+"%s through %s has proposed the following task assignment changes:"
+msgstr ""
+"%s gjennom %s har føreslått desse endringane i oppgåvetildelinga:"
 
 #: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
@@ -17655,7 +17735,8 @@
 msgstr "Dette møtet har verte delegert"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Dette svaret er ikkje frå ein aktiv deltakar. Skal vedkommande leggjast til "
 "som deltakar?"
@@ -17693,7 +17774,8 @@
 msgstr "Lagar ei D-Bus-melding når nye meldingar kjem."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "If true, then beep, otherwise will play sound file when new messages arrive."
+msgid ""
+"If true, then beep, otherwise will play sound file when new messages arrive."
 msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -17843,7 +17925,8 @@
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
-msgstr "Eit tillegg som tillet oppretting av oppgåver frå innhaldet i ein e-post."
+msgstr ""
+"Eit tillegg som tillet oppretting av oppgåver frå innhaldet i ein e-post."
 
 #: ../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
@@ -17880,7 +17963,8 @@
 msgstr "E-post_liste"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid ""
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr "Vanlege kommandoar for e-postlister (tinga, sei opp tinging, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
@@ -17962,7 +18046,8 @@
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr "Denne meldinga inneheld ikkje hovudinformasjonen som denne handlinga krev."
+msgstr ""
+"Denne meldinga inneheld ikkje hovudinformasjonen som denne handlinga krev."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -18058,7 +18143,8 @@
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "Eit tillegg for å handsama kva for nokre tillegg som er slått av og på."
+msgstr ""
+"Eit tillegg for å handsama kva for nokre tillegg som er slått av og på."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -18284,7 +18370,7 @@
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:848
 msgid "This will make Spamassasin more reliable, but slower"
-msgstr "Dette vil gjera SpamAssassin meir påliteleg, men tregare"
+msgstr "Dette vil gjera Spamassassin meir påliteleg, men tregare"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:854
 msgid "I_nclude remote tests"
@@ -18591,14 +18677,16 @@
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "ID eller alias til komponenten som vert vist som standard ved oppstart."
+msgstr ""
+"ID eller alias til komponenten som vert vist som standard ved oppstart."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Last upgraded configuration version"
 msgstr "Sist oppgraderte versjon av oppsettet"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste over stiar til mapper som skal synkroniserast til disk for fråkopla "
 "bruk"
@@ -18615,7 +18703,7 @@
 msgid "Skip recovery warning dialog"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:576
 msgid "Start in offline mode"
 msgstr "Start i fråkopla modus"
 
@@ -18627,7 +18715,8 @@
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr "Oppsettsversjonen av Evolution, med stor/liten/oppsettnivå (t.d. «2.6.0»)."
+msgstr ""
+"Oppsettsversjonen av Evolution, med stor/liten/oppsettnivå (t.d. «2.6.0»)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "The default height for the main window, in pixels."
@@ -18664,7 +18753,8 @@
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "Om Evolution vil starte opp i fråkopla modus i staden for tilkopla modus."
+msgstr ""
+"Om Evolution vil starte opp i fråkopla modus i staden for tilkopla modus."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Whether crash detection should be done or not"
@@ -18687,7 +18777,8 @@
 msgstr "Om verktøylinja skal vera synleg."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Om åtvaringsvindauget utviklarversjonane av Evolution skal droppast."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:30
@@ -18805,7 +18896,8 @@
 
 #: ../shell/e-shell-window-commands.c:77
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "GNOME Pilot-verktøya ser ikkje ut til å vera installerte på denne maskinen."
+msgstr ""
+"GNOME Pilot-verktøya ser ikkje ut til å vera installerte på denne maskinen."
 
 #: ../shell/e-shell-window-commands.c:85
 #, c-format
@@ -18823,7 +18915,7 @@
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:744
 msgid "translator-credits"
 msgstr ""
 "Åsmund Skjæveland <aasmunds@fys.uio.no> 2003-2006\n"
@@ -18832,23 +18924,23 @@
 "\n"
 "Send feilmeldingar og kommentarar til <i18n-nn@lister.ping.uio.no>"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:755
 msgid "Evolution Website"
 msgstr "Evolution-nettstad"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:773
 msgid "Error opening the FAQ webpage."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:970
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:996
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
@@ -18951,7 +19043,7 @@
 "med å importera filer frå andre program til Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:233
 #, no-c-format
 msgid ""
 "Hi. Thanks for taking the time to download this preview release\n"
@@ -18988,7 +19080,7 @@
 "Me vonar at du nyt resultata av det harde arbeidet vårt, og me ventar\n"
 "i spenning på dine bidrag.\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18996,19 +19088,19 @@
 "Takk frå\n"
 "Evolution-laget\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:264
 msgid "Do not tell me again"
 msgstr "Ikkje sei ifrå igjen"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:314
 msgid "Evolution Crash Detection"
 msgstr ""
 
-#: ../shell/main.c:311
+#: ../shell/main.c:316
 msgid "Ig_nore"
 msgstr "Ig_norer"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:331
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19016,43 +19108,43 @@
 "You can restore the preview panes from the View menu.\n"
 msgstr ""
 
-#: ../shell/main.c:337
+#: ../shell/main.c:342
 msgid "_Do not show this message again"
 msgstr "Ikkje vis _denne meldinga att"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:574
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution, og start opp den oppgjevne delen"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:578
 msgid "Start in online mode"
 msgstr "Startar i fråkopla modus"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:581
 msgid "Forcibly shut down all Evolution components"
 msgstr "Tving alle komponentane i Evolution til å avslutta"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:585
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tving ny migrering frå Evolution 1.4"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:588
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift frå alle komponentane til ei fil."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:590
 msgid "Disable loading of any plugins."
 msgstr "Kopla frå lasting av tillegg."
 
-#: ../shell/main.c:587
+#: ../shell/main.c:592
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:617
+#: ../shell/main.c:677
 msgid "- The Evolution PIM and Email Client"
 msgstr "Evolution personleg informasjonshandsamar og e-postkomponent"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19456,11 +19548,13 @@
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
-msgstr "Stol på denne sertifiseringsinstansen ved identifisering av e-postbrukarar."
+msgstr ""
+"Stol på denne sertifiseringsinstansen ved identifisering av e-postbrukarar."
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
-msgstr "Stol på denne sertifiserinsinstansen ved identifisering av programutviklarar."
+msgstr ""
+"Stol på denne sertifiserinsinstansen ved identifisering av programutviklarar."
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
@@ -19475,7 +19569,8 @@
 msgstr "Du har sertifikat som identifiserer deg frå desse organisasjonane:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "Du har sertifikat som identifiserer desse sertifiseringsinstansane:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -20132,7 +20227,7 @@
 
 #: ../ui/evolution-event-editor.xml.h:7
 msgid "Click here to set or unset alarms for this event"
-msgstr "Klikk her for å setja eller fjerna alarmar på denne hendinga"
+msgstr "Klikk her for å setja eller fjerna varsel på denne hendinga"
 
 #: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
@@ -20202,7 +20297,7 @@
 
 #: ../ui/evolution-event-editor.xml.h:27
 msgid "_Alarms"
-msgstr "_Alarmar"
+msgstr "V_arsel"
 
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
 #: ../ui/evolution-task-editor.xml.h:18
@@ -20407,7 +20502,8 @@
 msgstr "Gøym _lesne meldingar"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Gøym dei sletta meldingane i staden for å visa dei gjennomstreka"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -20459,9 +20555,8 @@
 msgstr "Vel alle meldingane i same tråd som den valde meldinga"
 
 #: ../ui/evolution-mail-list.xml.h:28
-#, fuzzy
 msgid "Select all replies to the currently selected message"
-msgstr "Vel alle meldingane i same tråd som den valde meldinga"
+msgstr "Vel alle meldingane som er svar til den valde meldinga"
 
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
@@ -20794,9 +20889,8 @@
 msgstr "Søkjemappe frå e-postliste..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-#, fuzzy
 msgid "Search Folder from Recipien_ts..."
-msgstr "Søkjemappe frå _mottakarar..."
+msgstr "Søkjemappe frå _mottakarar ..."
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
@@ -21027,9 +21121,8 @@
 msgstr "HT_ML"
 
 #: ../ui/evolution-message-composer.xml.h:12
-#, fuzzy
 msgid "Insert Send options"
-msgstr "Sett inn avanserte sendingsval"
+msgstr "Sett inn sendingsval"
 
 #: ../ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
@@ -21044,41 +21137,36 @@
 msgstr "PGP-signér"
 
 #: ../ui/evolution-message-composer.xml.h:17
-#, fuzzy
 msgid "PGP _Encrypt"
-msgstr "PGP-kryptér"
+msgstr "PGP-krypt_er"
 
 #: ../ui/evolution-message-composer.xml.h:18
-#, fuzzy
 msgid "PGP _Sign"
-msgstr "PGP-signér"
+msgstr "PGP-_signer"
 
 #: ../ui/evolution-message-composer.xml.h:19
 msgid "R_equest Read Receipt"
 msgstr "Sp_ør etter kvitteringar for lesne meldingar"
 
 #: ../ui/evolution-message-composer.xml.h:20
-#, fuzzy
 msgid "S/MIME En_crypt"
-msgstr "S/MIME-kryptér"
+msgstr "S/MIME-kr_ypter"
 
 #: ../ui/evolution-message-composer.xml.h:21
 msgid "S/MIME Encrypt"
 msgstr "S/MIME-kryptér"
 
 #: ../ui/evolution-message-composer.xml.h:22
-#, fuzzy
 msgid "S/MIME Sig_n"
-msgstr "S/MIME-signér"
+msgstr "S/MIME-sig_ner"
 
 #: ../ui/evolution-message-composer.xml.h:23
 msgid "S/MIME Sign"
 msgstr "S/MIME-signér"
 
 #: ../ui/evolution-message-composer.xml.h:24
-#, fuzzy
 msgid "S_end"
-msgstr "Send"
+msgstr "S_end"
 
 #: ../ui/evolution-message-composer.xml.h:26
 msgid "Save As"
@@ -21347,7 +21435,8 @@
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "Vis vindaugeknappane i tråd med skrivebordet si verktøylinjeinnstilling"
+msgstr ""
+"Vis vindaugeknappane i tråd med skrivebordet si verktøylinjeinnstilling"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
@@ -21362,9 +21451,8 @@
 msgstr "Vis vindaugeknappane berre med tekst"
 
 #: ../ui/evolution.xml.h:10
-#, fuzzy
 msgid "Evolution _FAQ"
-msgstr "Evolution"
+msgstr "Evolution _OSS"
 
 #: ../ui/evolution.xml.h:11
 msgid "Exit the program"
@@ -21383,7 +21471,6 @@
 msgstr "_Importér ..."
 
 #: ../ui/evolution.xml.h:15
-#, fuzzy
 msgid "Icons _and Text"
 msgstr "Ikon _og tekst"
 
@@ -21401,12 +21488,11 @@
 
 #: ../ui/evolution.xml.h:20
 msgid "Open the Frequently Asked Questions webpage"
-msgstr ""
+msgstr "Opna nettsida med ofte stilte spørsmål"
 
 #: ../ui/evolution.xml.h:21
-#, fuzzy
 msgid "Page Set_up..."
-msgstr "Sideoppsett"
+msgstr "Side_oppsett ..."
 
 #: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
@@ -21461,9 +21547,8 @@
 msgstr "Vel om me arbeider fråkopla."
 
 #: ../ui/evolution.xml.h:36
-#, fuzzy
 msgid "Tool_bar Style"
-msgstr "Verktøylinjestil"
+msgstr "Ver_ktøylinjestil"
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
@@ -21487,15 +21572,13 @@
 
 #: ../ui/evolution.xml.h:44
 msgid "_Frequently Asked Questions"
-msgstr ""
+msgstr "_Ofte stilte spørsmål"
 
 #: ../ui/evolution.xml.h:46
-#, fuzzy
 msgid "_Hide Buttons"
-msgstr "_Høym knappar"
+msgstr "_Gøym knappar"
 
 #: ../ui/evolution.xml.h:47
-#, fuzzy
 msgid "_Icons Only"
 msgstr "Berre _ikon"
 
@@ -21516,9 +21599,8 @@
 msgstr "_Synkroniseringsinnstillingar..."
 
 #: ../ui/evolution.xml.h:53
-#, fuzzy
 msgid "_Text Only"
-msgstr "_Rein tekst"
+msgstr "_Berre tekst"
 
 #: ../ui/evolution.xml.h:55
 msgid "_Window"
@@ -21695,27 +21777,25 @@
 msgstr "_Noverande framsyning"
 
 #: ../widgets/menus/gal-view-menus.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "Select View: %s"
-msgstr "Vekesframsyning: %s. %s"
+msgstr "Vel framsyning: %s"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Current view is a customized view"
-msgstr ""
+msgstr "Denne framsyninga er ei sjølvvald framsyning"
 
 #: ../widgets/menus/gal-view-menus.c:364
 msgid "Save Custom View..."
 msgstr "Lagra tilpassa framsyning ..."
 
 #: ../widgets/menus/gal-view-menus.c:369
-#, fuzzy
 msgid "Save current custom view"
-msgstr "Lagra aktiv framsyning"
+msgstr "Lagra aktiv sjølvvald framsyning"
 
 #: ../widgets/menus/gal-view-menus.c:383
-#, fuzzy
 msgid "Create or edit views"
-msgstr "_Lag ei ny framsyning"
+msgstr "Lag eller endra framsyningar"
 
 #: ../widgets/menus/gal-view-new-dialog.c:72
 msgid "Factory"
@@ -21741,13 +21821,13 @@
 msgid "Attachment Bar"
 msgstr "Vedleggslinje"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:317 ../widgets/misc/e-attachment.c:332
+#: ../widgets/misc/e-attachment.c:533 ../widgets/misc/e-attachment.c:550
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan ikkje leggja ved fila «%s»: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:325 ../widgets/misc/e-attachment.c:542
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan ikkje leggja ved fila «%s»: Ikkje ei vanleg fil"
@@ -21852,7 +21932,6 @@
 msgstr "Prosentverdien må vera mellom 0 og 100, inklusive"
 
 #: ../widgets/misc/e-charset-picker.c:65
-#, fuzzy
 msgid "Arabic"
 msgstr "Arabisk"
 
@@ -21974,14 +22053,12 @@
 msgstr "_I dag"
 
 #: ../widgets/misc/e-dateedit.c:1655
-#, fuzzy
 msgid "Invalid Date Value"
-msgstr "Ugyldig signatur"
+msgstr "Ugyldig datoverdi"
 
 #: ../widgets/misc/e-dateedit.c:1684
-#, fuzzy
 msgid "Invalid Time Value"
-msgstr "Ugyldig signatur"
+msgstr "Ugyldig tidsverdi"
 
 #: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
@@ -22124,15 +22201,13 @@
 
 #: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
 #: ../widgets/misc/e-search-bar.c:480
-#, fuzzy
 msgid "Search"
-msgstr "_Søk"
+msgstr "Søk"
 
 #: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
 #: ../widgets/misc/e-search-bar.c:480
-#, fuzzy
 msgid "Click here to change the search type"
-msgstr "Klikk her for å leggja ved ei fil"
+msgstr "Klikk her for å endra søkjetype"
 
 #: ../widgets/misc/e-search-bar.c:610
 msgid "_Search"
@@ -22443,9 +22518,8 @@
 msgstr "Fjern alt"
 
 #: ../widgets/table/e-table-config.glade.h:4
-#, fuzzy
 msgid "Clear _All"
-msgstr "Fjern alt"
+msgstr "Fjern _alt"
 
 #: ../widgets/table/e-table-config.glade.h:5
 #: ../widgets/table/e-table-header-item.c:1582
@@ -22465,19 +22539,16 @@
 msgstr "Flytt _opp"
 
 #: ../widgets/table/e-table-config.glade.h:12
-#, fuzzy
 msgid "Show _field in View"
-msgstr "Vis felt i framsyning"
+msgstr "Vis _felt i framsyning"
 
 #: ../widgets/table/e-table-config.glade.h:13
-#, fuzzy
 msgid "Show field i_n View"
-msgstr "Vis felt i framsyning"
+msgstr "Vis felt i framsy_ning"
 
 #: ../widgets/table/e-table-config.glade.h:14
-#, fuzzy
 msgid "Show field in _View"
-msgstr "Vis felt i framsyning"
+msgstr "_Vis felt i framsyning"
 
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
@@ -22500,9 +22571,8 @@
 msgstr "_Grupper etter..."
 
 #: ../widgets/table/e-table-config.glade.h:22
-#, fuzzy
 msgid "_Show field in View"
-msgstr "Vis felt i framsyning"
+msgstr "Vi_s felt i framsyning"
 
 #: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
@@ -22639,75 +22709,61 @@
 msgstr "Tilpass aktiv visning"
 
 #: ../widgets/table/e-table-header-item.c:1472
-#, fuzzy
 msgid "Sort _Ascending"
-msgstr "Sorter stigande"
+msgstr "Sorter _aukande"
 
 #: ../widgets/table/e-table-header-item.c:1473
-#, fuzzy
 msgid "Sort _Descending"
-msgstr "Sorter synkande"
+msgstr "Sorter _minkande"
 
 #: ../widgets/table/e-table-header-item.c:1474
-#, fuzzy
 msgid "_Unsort"
-msgstr "Fjern sortering"
+msgstr "_Fjern sortering"
 
 #: ../widgets/table/e-table-header-item.c:1476
-#, fuzzy
 msgid "Group By This _Field"
-msgstr "Grupper etter dette feltet"
+msgstr "Grupper etter dette _feltet"
 
 #: ../widgets/table/e-table-header-item.c:1477
-#, fuzzy
 msgid "Group By _Box"
-msgstr "Grupper etter boks"
+msgstr "Grupper etter _boks"
 
 #: ../widgets/table/e-table-header-item.c:1479
-#, fuzzy
 msgid "Remove This _Column"
-msgstr "Fjern denne kolonna"
+msgstr "Fjern denne _kolonna"
 
 #: ../widgets/table/e-table-header-item.c:1480
-#, fuzzy
 msgid "Add a C_olumn..."
-msgstr "Legg til kolonne ..."
+msgstr "Legg til k_olonne ..."
 
 #: ../widgets/table/e-table-header-item.c:1482
-#, fuzzy
 msgid "A_lignment"
-msgstr "Justering"
+msgstr "_Justering"
 
 #: ../widgets/table/e-table-header-item.c:1483
-#, fuzzy
 msgid "B_est Fit"
-msgstr "Beste tilpassing"
+msgstr "B_este tilpassing"
 
 #: ../widgets/table/e-table-header-item.c:1484
-#, fuzzy
 msgid "Format Column_s..."
-msgstr "Formater kolonner ..."
+msgstr "Formater _kolonner ..."
 
 #: ../widgets/table/e-table-header-item.c:1486
-#, fuzzy
 msgid "Custo_mize Current View..."
-msgstr "Tilpass gjeldande visning ..."
+msgstr "Til_pass gjeldande framsyning ..."
 
 #: ../widgets/table/e-table-header-item.c:1542
-#, fuzzy
 msgid "_Sort By"
-msgstr "Sorter etter"
+msgstr "_Sorter etter"
 
 #. Custom
 #: ../widgets/table/e-table-header-item.c:1560
-#, fuzzy
 msgid "_Custom"
-msgstr "Tilpassa"
+msgstr "_Sjølvvald"
 
 #: ../widgets/table/e-table-header-item.c:1893
-#, fuzzy
 msgid "Font Description"
-msgstr "Hendingsskildring"
+msgstr "Skrifttypeskildring"
 
 #: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:173
@@ -22857,3 +22913,8 @@
 msgid "Handle Popup"
 msgstr "Oppsprett med handtak"
 
+#~ msgid "Display"
+#~ msgstr "Vis"
+
+#~ msgid "Server Information"
+#~ msgstr "Tenarinformasjon"
Index: po/ja.po
===================================================================
--- po/ja.po	(revision 35318)
+++ po/ja.po	(working copy)
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: evolution trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-05 00:45+0900\n"
-"PO-Revision-Date: 2008-03-05 00:44+0900\n"
+"POT-Creation-Date: 2008-04-09 07:09+0900\n"
+"PO-Revision-Date: 2008-04-08 21:04+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
@@ -719,7 +719,7 @@
 msgstr "オフライン時に連絡先の内容をローカルへコピーする(_B)"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
@@ -745,7 +745,7 @@
 msgstr "認証"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "詳細"
@@ -760,7 +760,7 @@
 msgstr "ダウンロード"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "アドレス帳のプロパティ"
 
@@ -964,106 +964,98 @@
 msgstr "認証"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "Display"
-msgstr "表示"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Downloading"
 msgstr "ダウンロード"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Searching"
 msgstr "検索"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Server Information"
-msgstr "サーバの情報"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Type:"
 msgstr "種類:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "アドレス帳の追加"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 #: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "常に"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "匿名"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "基本"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "識別名"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "E-メール・アドレス"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution はこの E-メール・アドレスを使ってサーバを利用した認証を行います。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "利用可能な検索ベースを検索します"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "ログイン(_G):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "しない"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../mail/em-account-editor.c:304
 msgid "No encryption"
 msgstr "暗号化しない"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "トップ"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:312
 msgid "SSL encryption"
 msgstr "SSL で暗号化する"
 
 # "検索フォルダ"は適訳ではない
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "仮想フォルダ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "検索ベース(_B):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "検索フィルタ(_F):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "検索フィルタ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by default search will be performed on "
@@ -1072,7 +1064,7 @@
 "検索フィルタとは検索するオブジェクトの種類で検索の対象となるものです (これを"
 "変更しなかった場合、デフォルトの検索フィルタである \"人物\" で検索します)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1080,7 +1072,7 @@
 "このオプションを有効にすると、お使いの LDAP サーバが SSL をサポートしている場"
 "合にのみ、Evolution は LDAP サーバに接続のみ行います。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1088,7 +1080,7 @@
 "このオプションを有効にすると、お使いの LDAP サーバが TLS をサポートしている場"
 "合にのみ、Evolution は LDAP サーバに接続のみ行います。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1098,23 +1090,23 @@
 "いないということを意味しています。従って、その接続はセキュアには行われず、セ"
 "キュリティ上の穴をついて攻撃される可能性があります。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "サブ"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "サポートする検索ベース"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 #: ../mail/em-account-editor.c:308
 msgid "TLS encryption"
 msgstr "TLS で暗号化する"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1123,7 +1115,7 @@
 "検索ベースとは検索を開始するエントリの識別名 (DN) です。空白のままにすると、"
 "ディレクトリ・ツリーのルートから検索を開始します。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1135,14 +1127,14 @@
 "まれます。検索範囲 \"レベル１\" には検索ベースの第一レベルのエントリのみ含ま"
 "れます。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "これはお使いの LDAP サーバのフルパス名です。(例: \"ldap.mycompany.com\")"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1150,7 +1142,7 @@
 "これはダウンロードするエントリの最大数です。この数を大きくすると、アドレス帳"
 "を開く速度が遅くなります。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you. Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1159,7 +1151,7 @@
 "これは Evolution があなたを認証する際に使用する方法です。\"E-メール・アドレス"
 "\" に対するこの設定には、LDAP サーバへの匿名アクセスが必要となります。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1167,7 +1159,7 @@
 "これはこのサーバの名前で、Evolution フォルダ一覧の中に表示されます。表示目的"
 "にのみ使用されます。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1177,35 +1169,35 @@
 "覧が提供されています。特別に指定する必要がある場合は、システム管理者にお尋ね"
 "下さい。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "使用する識別名 (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "使用する E-メール・アドレス"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "可能ならば"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "アドレス帳の追加(_A)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "ダウンロード制限(_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "利用可能な検索ベースを捜す(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "ログイン方式(_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 #: ../calendar/gui/dialogs/calendar-setup.c:229
 #: ../mail/mail-config.glade.h:164
 #: ../plugins/groupwise-features/properties.glade.h:11
@@ -1213,33 +1205,33 @@
 msgid "_Name:"
 msgstr "名前(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "ポート番号(_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "検索範囲(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 #: ../mail/mail-config.glade.h:172
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "サーバ(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "タイムアウト(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "セキュアな接続を利用する(_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "カード"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
@@ -6932,7 +6924,7 @@
 msgid "_Save Selected"
 msgstr "選択したものの保存(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:796
 #, c-format
 msgid "Open in %s..."
 msgstr "\"%s\" で開く..."
@@ -10119,39 +10111,39 @@
 msgstr "<ここをクリックして投稿するフォルダを選択して下さい>"
 
 #. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
+#: ../composer/e-msg-composer-hdrs.c:236
 msgid "Si_gnature:"
 msgstr "署名(_G):"
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-msg-composer-hdrs.c:341
 msgid "Fr_om:"
 msgstr "差出人(_O):"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-msg-composer-hdrs.c:347
 msgid "_Reply-To:"
 msgstr "返信先(_R):"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-msg-composer-hdrs.c:353
 msgid "_To:"
 msgstr "宛先(_T):"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-msg-composer-hdrs.c:355
 msgid "Enter the recipients of the message"
 msgstr "メッセージの宛先を入力します"
 
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-msg-composer-hdrs.c:361
 msgid "_Cc:"
 msgstr "Cc(_C):"
 
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-msg-composer-hdrs.c:363
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "メッセージのカーボン・コピー (Cc) を受けとる人のアドレスを入力します"
 
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-msg-composer-hdrs.c:370
 msgid "_Bcc:"
 msgstr "Bcc(_B):"
 
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../composer/e-msg-composer-hdrs.c:372
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10159,11 +10151,11 @@
 "メッセージの宛先には入れずにカーボン・コピー (Bcc) としてメッセージを受け取る"
 "人のアドレスを入力します"
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-msg-composer-hdrs.c:380
 msgid "_Post To:"
 msgstr "送信先(_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-msg-composer-hdrs.c:386
 msgid "S_ubject:"
 msgstr "件名(_U):"
 
@@ -14065,7 +14057,7 @@
 msgid "_Tick this to accept the license agreement"
 msgstr "ライセンス同意書を受諾する場合はここをチェックする(_T)"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:831
 #, c-format
 msgid "Pinging %s"
 msgstr "%s へ ping 中に"
@@ -15045,7 +15037,7 @@
 msgid "%b %d %Y"
 msgstr "%Y年%B%e日"
 
-#: ../mail/message-list.c:3849
+#: ../mail/message-list.c:3838
 msgid "Generating message list"
 msgstr "メッセージ一覧の作成中"
 
@@ -15477,6 +15469,10 @@
 msgstr "Bogofilter のオプション"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Bogofilter ジャンク・メールのプラグイン"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Bogofilter を使ってジャンク・メールをフィルタリングします。"
 
@@ -16860,12 +16856,12 @@
 msgid "_Proxy Login..."
 msgstr "プロキシへのログイン(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "この \"プロキシ\" タブはアカウントがオンラインになった時にのみ利用できます。"
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:708
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "この \"プロキシ\" タブはアカウントを有効にした時にのみ利用できます。"
 
@@ -21875,13 +21871,13 @@
 msgid "Attachment Bar"
 msgstr "添付ファイル・バー"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:317 ../widgets/misc/e-attachment.c:332
+#: ../widgets/misc/e-attachment.c:533 ../widgets/misc/e-attachment.c:550
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ファイル %s を添付できません: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:325 ../widgets/misc/e-attachment.c:542
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ファイル %s を添付できません: 通常のファイルではありません"
Index: po/he.po
===================================================================
--- po/he.po	(revision 35318)
+++ po/he.po	(working copy)
@@ -8,14 +8,14 @@
 msgstr ""
 "Project-Id-Version: evolution.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-19 11:28+0000\n"
-"PO-Revision-Date: 2004-07-25 21:05+0300\n"
-"Last-Translator: Gil Osher <dolfin@rpg.org.il>\n"
+"POT-Creation-Date: 2008-04-25 13:12+0000\n"
+"PO-Revision-Date: 2008-04-12 17:02+0200\n"
+"Last-Translator: Mark Krapivner <mark125@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
@@ -42,7 +42,6 @@
 msgstr[1] "תיקיית ספר הכתובות הנוכחית "
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "פתח"
 
@@ -165,10 +164,8 @@
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2162
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1545
+#: ../calendar/gui/e-week-view-main-item.c:331
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -199,10 +196,8 @@
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2178
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1561
+#: ../calendar/gui/e-week-view-main-item.c:345
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -361,12 +356,11 @@
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
-msgstr ""
+msgstr "הכתובת '{0}' כבר קיימת."
 
 #: ../addressbook/addressbook.error.xml.h:5
-#, fuzzy
 msgid "Cannot add new contact"
-msgstr "צור איש קשר חדש"
+msgstr "לא ניתן להוסיף איש קשר"
 
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
@@ -399,9 +393,8 @@
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:12
-#, fuzzy
 msgid "Delete address book '{0}'?"
-msgstr "ספר הכתובות של אבולוציה"
+msgstr "למחוק את ספר הכתובות '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
 msgid "Error loading addressbook."
@@ -431,85 +424,86 @@
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "ההרשאה נדחתה."
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "גירסת שרת"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "ספר הכתובות של Evolution נסגר באופן בלתי צפוי."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:24
 #, fuzzy
 msgid "This address book will be removed permanently."
 msgstr "ספר הכתובות לא יכל להיפתח."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "ספר הכתובות לא יכל להיפתח."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "לא ניתן לפתוח את ספר הכתובות"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "לא ניתן לבצע את החיפוש"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "לא ניתן לשמור {0}."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 msgstr ""
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid ""
+"You do not have enough permissions to delete contact in this Address Book."
+msgstr ""
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -545,7 +539,7 @@
 msgstr ""
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:147
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "{0}"
 msgstr "{0}"
@@ -588,7 +582,7 @@
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:401
 #: ../plugins/exchange-operations/exchange-delegates-user.c:88
 #: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
@@ -596,50 +590,46 @@
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book"
-msgstr "ספר הכתובות של Evolution"
+msgstr "Evolution Address Book"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Address Book address pop-up"
-msgstr "ספר הכתובות של אבולוציה"
+msgid "Evolution Address Book address popup"
+msgstr "Evolution Address Book address popup"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
 msgid "Evolution Address Book address viewer"
-msgstr "ספר הכתובות של אבולוציה"
+msgstr "Evolution Address Book address viewer"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
 msgid "Evolution Address Book card viewer"
-msgstr "ספר הכתובות של אבולוציה"
+msgstr "Evolution Address Book card viewer"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
 msgid "Evolution Address Book component"
-msgstr "ספר הכתובות של אבולוציה"
+msgstr "Evolution Address Book component"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
-msgstr ""
+msgstr "Evolution S/Mime Certificate Management Control"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
-msgstr ""
+msgstr "Evolution folder settings configuration control"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
-msgstr ""
+msgstr "Manage your S/MIME certificates here"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
 #: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:480
+#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1096
 #: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:308
+#: ../mail/mail-vfolder.c:216 ../mail/message-list.c:1475
 msgid "On This Computer"
 msgstr "במחשב זה"
 
@@ -653,8 +643,8 @@
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:490
+#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1104
 #: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
 msgid "Personal"
 msgstr "אישי"
@@ -713,13 +703,13 @@
 msgstr ""
 
 #: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../mail/em-folder-properties.c:257 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2356
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "כללי"
@@ -739,13 +729,13 @@
 msgstr "הזדהות"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "פרטים"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../mail/em-folder-browser.c:956
 msgid "Searching"
 msgstr "מחפש"
 
@@ -754,17 +744,17 @@
 msgstr "מוריד"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "מאפייני ספר הכתובות"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1203
 msgid "Migrating..."
 msgstr ""
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1244
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
@@ -835,9 +825,9 @@
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/calendar-component.c:609
 #: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:941
 #: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-tree.c:2092 ../mail/em-folder-view.c:1346
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -863,13 +853,14 @@
 
 #: ../addressbook/gui/component/addressbook.c:207
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
-#, fuzzy, c-format
+#, c-format
 msgid "Enter password for %s (user %s)"
-msgstr "%s הכנס סיסמה ל%s (משתמש %s("
+msgstr ""
+"הכנס סיסמה עבור %s (משתמש %s)"
 
 #: ../addressbook/gui/component/addressbook.c:215
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../plugins/publish-calendar/publish-calendar.c:190
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "הכנס סיסמה"
@@ -948,157 +939,146 @@
 msgstr "הזדהות"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "Display"
-msgstr "תצוגה"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Downloading"
 msgstr "מוריד"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Searching"
 msgstr "מחפש"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Server Information"
-msgstr "מידע על השרת"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Type:"
 msgstr "סוג:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "ספר כתובות חדש"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 #: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "תמיד"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "אנונימי"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "בסיסי"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
-msgstr ""
+msgstr "שם מבדיל"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "כתובת דוא\"ל"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "אבולוציה תשתמש בכתובת דוא\"ל זו להזדהות עם השרת."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "ה_תחבר:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "אף פעם"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../mail/em-account-editor.c:304
 msgid "No encryption"
 msgstr "ללא הצפנה"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "אחד"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:312
 msgid "SSL encryption"
 msgstr "הצפנת SSL"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
-msgstr "בחר תיקייה"
+msgstr "מסנן חיפוש"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
-msgstr "בחר תיקייה"
+msgstr "_מסנן חיפוש:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
-msgstr "בחר תיקייה"
+msgstr "מסנן חיפוש"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by default search will be performed on "
 "objectclass of the type \"person\"."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid "Sub"
 msgstr "נושא"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr ""
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 #: ../mail/em-account-editor.c:308
 msgid "TLS encryption"
 msgstr "הצפנת TLS"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1106,101 +1086,101 @@
 "one level beneath your base."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you. Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "משתמש בכתובת דוא\"ל"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "כאשר אפשר"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "_הוסף ספר כתובות"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "הגבלת הור_דה:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "שיטת ה_תחברות:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 #: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:174
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_שם:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "_שער:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../mail/mail-config.glade.h:183
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_שרת:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "השתמש ב_תקשורת מאובטחת:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "כרטיסים"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
@@ -1247,7 +1227,7 @@
 msgstr "עבודה"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1259,16 +1239,16 @@
 msgstr "_קטגוריות..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
 #: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "איש קשר"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:549
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:564
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Contact Editor"
 msgstr "עורך אנשי הקשר"
 
@@ -1309,7 +1289,7 @@
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1055
@@ -1433,7 +1413,7 @@
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
@@ -1477,7 +1457,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Anguilla"
-msgstr ""
+msgstr "אנגווילה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antarctica"
@@ -1509,7 +1489,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Azerbaijan"
-msgstr ""
+msgstr "אזרבייג'אן"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahamas"
@@ -1537,7 +1517,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Belize"
-msgstr ""
+msgstr "בליז"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Benin"
@@ -1549,7 +1529,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bhutan"
-msgstr ""
+msgstr "בהוטן"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bolivia"
@@ -1561,11 +1541,11 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Botswana"
-msgstr ""
+msgstr "בוטסואנה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Bouvet Island"
-msgstr ""
+msgstr "אי בובט"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brazil"
@@ -1577,7 +1557,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "סולטנות ברוניי"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Bulgaria"
@@ -1585,11 +1565,11 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burkina Faso"
-msgstr ""
+msgstr "בורקינה פאסו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Burundi"
-msgstr ""
+msgstr "בורונדי"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cambodia"
@@ -1605,11 +1585,11 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cape Verde"
-msgstr ""
+msgstr "קייפ ורדה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cayman Islands"
-msgstr ""
+msgstr "איי קיימאן"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Central African Republic"
@@ -1641,7 +1621,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Comoros"
-msgstr ""
+msgstr "קומורו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
@@ -1685,7 +1665,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Djibouti"
-msgstr ""
+msgstr "ג'יבוטי"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominica"
@@ -1709,7 +1689,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "גינאה המשוונית"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Eritrea"
@@ -1729,7 +1709,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Faroe Islands"
-msgstr ""
+msgstr "איי פארו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Fiji"
@@ -1773,7 +1753,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Ghana"
-msgstr ""
+msgstr "גאנה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Gibraltar"
@@ -1789,7 +1769,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Grenada"
-msgstr ""
+msgstr "גרנדה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guadeloupe"
@@ -1797,7 +1777,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guam"
-msgstr ""
+msgstr "גואם"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guatemala"
@@ -1812,12 +1792,13 @@
 msgstr "גואינה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
-msgstr ""
+#, fuzzy
+msgid "Guinea-Bissau"
+msgstr "גינאה-ביסאו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Guyana"
-msgstr ""
+msgstr "גויאנה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Haiti"
@@ -1869,7 +1850,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Isle of Man"
-msgstr ""
+msgstr "האי מאן"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Israel"
@@ -1905,7 +1886,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Kiribati"
-msgstr ""
+msgstr "קיריבאטי"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Democratic People's Republic Of"
@@ -1937,7 +1918,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Lesotho"
-msgstr ""
+msgstr "לסוטו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Liberia"
@@ -1945,7 +1926,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Libya"
-msgstr ""
+msgstr "לוב"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Liechtenstein"
@@ -1953,7 +1934,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Lithuania"
-msgstr ""
+msgstr "ליטא"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Luxembourg"
@@ -1961,7 +1942,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macao"
-msgstr ""
+msgstr "מקאו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Macedonia"
@@ -1981,11 +1962,11 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Maldives"
-msgstr ""
+msgstr "האיים המלדיביים"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mali"
-msgstr ""
+msgstr "מאלי"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Malta"
@@ -1997,7 +1978,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Martinique"
-msgstr ""
+msgstr "מרטיניק"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritania"
@@ -2005,11 +1986,11 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mauritius"
-msgstr ""
+msgstr "מאוריציוס"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mayotte"
-msgstr ""
+msgstr "מאיוט"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Mexico"
@@ -2033,7 +2014,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Montserrat"
-msgstr ""
+msgstr "מונסראט"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Morocco"
@@ -2045,7 +2026,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Myanmar"
-msgstr ""
+msgstr "מיאנמר"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Namibia"
@@ -2053,7 +2034,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nauru"
-msgstr ""
+msgstr "נאורו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nepal"
@@ -2065,7 +2046,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "האנטילים ההולנדיים"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Caledonia"
@@ -2089,15 +2070,15 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Niue"
-msgstr ""
+msgstr "ניווה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Norfolk Island"
-msgstr ""
+msgstr "האי נורפוק"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "איי מריאנה הצפוניים"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Norway"
@@ -2113,7 +2094,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palau"
-msgstr ""
+msgstr "פלאו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Palestinian Territory"
@@ -2125,7 +2106,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "פפאו גיניאה החדשה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Paraguay"
@@ -2141,7 +2122,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Pitcairn"
-msgstr ""
+msgstr "פיטקרן"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Poland"
@@ -2177,15 +2158,15 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "סנט קיטס ונוויס"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Lucia"
-msgstr ""
+msgstr "סנט לוסיה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Saint Vincent And The Grenadines"
-msgstr ""
+msgstr "סנט וינסנט והגרנדינים"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Samoa"
@@ -2193,11 +2174,11 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "San Marino"
-msgstr ""
+msgstr "סאן מארינו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "סאו תומה ופרינסיפה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Saudi Arabia"
@@ -2245,7 +2226,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "איי ג'ורג'יה הדרומית ואיי סנדוויץ' הדרומיים"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Spain"
@@ -2257,7 +2238,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Helena"
-msgstr ""
+msgstr "סנט הלנה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "St. Pierre And Miquelon"
@@ -2277,7 +2258,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Swaziland"
-msgstr ""
+msgstr "סווזילנד"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Sweden"
@@ -2317,7 +2298,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tokelau"
-msgstr ""
+msgstr "טוקלאו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tonga"
@@ -2325,7 +2306,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "טרינידד וטובאגו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Tunisia"
@@ -2341,11 +2322,11 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "איי טורקס וקאיקוס"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Tuvalu"
-msgstr ""
+msgstr "טובאלו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uganda"
@@ -2377,7 +2358,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Vanuatu"
-msgstr ""
+msgstr "ונואטו"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Venezuela"
@@ -2397,7 +2378,7 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Wallis And Futuna Islands"
-msgstr ""
+msgstr "איי ואליס ופוטונה"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Western Sahara"
@@ -2432,7 +2413,7 @@
 msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2446,7 +2427,7 @@
 msgstr "Gadu-Gadu Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2457,8 +2438,8 @@
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Location"
 msgstr "מיקום"
 
@@ -2467,118 +2448,119 @@
 msgstr "שם משתמש"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "בית"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "אחר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "ספר מקור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "ספר מטרה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "האם איש קשר חדש"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 msgid "Required Fields"
 msgstr "שדות דרושים"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
 msgid "Changed"
 msgstr "שונה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2424
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "עורך אנשי הקשר - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2820
 msgid "Please select an image for this contact"
 msgstr "אנא בחר תמונה בעבור איש קשר זה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
 msgid "_No image"
 msgstr "ללא _תמונה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
 #, c-format
 msgid "%s'%s' is empty"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
 msgid "Invalid contact."
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:334
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 msgid "_Edit Full"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "_Full name"
 msgstr "_שם מלא"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "E_mail"
 msgstr "דוא\"ל"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Select Address Book"
 msgstr "_בחר ספר כתובות"
 
@@ -2703,7 +2685,7 @@
 
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 msgid "Add IM Account"
-msgstr ""
+msgstr "הוסף חשבון מסרים מידיים"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "_Account name:"
@@ -2747,10 +2729,14 @@
 msgstr ""
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
-#, fuzzy
 msgid "Contact List Members"
-msgstr "רשימת חברים"
+msgstr "חברי רשימת קשר"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+msgid "_Members"
+msgstr "חברים_"
+
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
@@ -2764,10 +2750,6 @@
 msgid "Is New List"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "חברים_"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr ""
@@ -2789,7 +2771,7 @@
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
-msgstr ""
+msgstr "איש קשר חדש:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
@@ -2802,28 +2784,26 @@
 msgstr ""
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:190
-#, fuzzy
 msgid "Merge Contact"
-msgstr "איש קשר חדש"
+msgstr "מזג איש קשר"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:205
-#, fuzzy
 msgid "_Merge"
-msgstr "הו_דעה:"
+msgstr "_מזג"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:258
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:860
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
 #: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "דוא\"ל"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/cal-search-bar.c:81 ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
 msgid "Any field contains"
 msgstr "כל שדה מכיל"
@@ -2880,7 +2860,7 @@
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:238
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2893,9 +2873,9 @@
 msgstr "שמור בשם..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 #: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_פתח"
@@ -2946,20 +2926,19 @@
 msgstr "העבר ל_ספר הכתובות..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "ג_זור"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
+#: ../calendar/gui/dialogs/comp-editor.c:455
 #: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:996
+#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2009 ../mail/em-folder-tree.c:998
 #: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-editor.xml.h:17 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "ה_עתק"
 
@@ -2969,14 +2948,14 @@
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
 msgid "Any Category"
 msgstr "כל קטגוריה"
 
 #. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Other error"
 msgstr "תקלה אחרת"
 
@@ -3011,7 +2990,7 @@
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:143
 #: ../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
@@ -3112,7 +3091,7 @@
 msgstr "רדיו"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:521
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
@@ -3251,6 +3230,7 @@
 msgstr "דוא\"ל בית"
 
 #: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:833
 msgid "Other Email"
 msgstr "דוא\"ל אחר"
 
@@ -3262,7 +3242,7 @@
 msgid "Has Cursor"
 msgstr "יש סמן"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:638
 msgid "_Open Link in Browser"
 msgstr "_פתח את הקישור בדפדפן"
 
@@ -3271,7 +3251,7 @@
 msgid "_Copy Link Location"
 msgstr "_העתק את מיקום הקישור"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:639
 msgid "_Send New Message To..."
 msgstr "ש_לח הודעה ל..."
 
@@ -3293,7 +3273,7 @@
 msgstr "מפה"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "רשימת חברים"
 
@@ -3355,80 +3335,80 @@
 msgstr "עמוד"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/e-calendar-view.c:2359
 msgid "Birthday"
 msgstr "יום הולדת"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/e-calendar-view.c:2360
 msgid "Anniversary"
 msgstr "יום שנה"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "כותרת תפקיד"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "דף הבית"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "ב-לוג"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Success"
 msgstr "הצלחה"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Repository offline"
-msgstr ""
+msgstr "המאגר לא מקוון"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Address Book does not exist"
 msgstr "ספר הכתובות לא קיים"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "No Self Contact defined"
 msgstr "לא הוגדר איש קשר עצמי"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "אין הרשאות"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Contact not found"
 msgstr "איש הקשר לא נמצא"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact ID already exists"
 msgstr ""
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Protocol not supported"
 msgstr "פרוטוקול לא נתמך"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:255
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
 #: ../calendar/gui/e-calendar-table.c:236
@@ -3437,77 +3417,76 @@
 msgstr "בוטל"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Could not cancel"
 msgstr "לא ניתן לבטל"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "ההזדהות נכשלה"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Authentication Required"
 msgstr "הזדהות נדרשת"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "TLS not Available"
 msgstr "TLS לא זמין"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "No such source"
 msgstr "אין מקור כזה"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Not available in offline mode"
-msgstr "התחל במצב לא מקוון"
+msgstr "לא זמין במצב לא מקוון"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Invalid server version"
-msgstr ""
+msgstr "גירסץ שרת לא תקינה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#: ../addressbook/gui/widgets/eab-gui-util.c:100
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 #, c-format
 msgid ""
 "We were unable to open this addressbook. Please check that the path %s "
 "exists and that you have permission to access it."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 msgid ""
 "We were unable to open this addressbook. This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:123
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it. If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:130
 msgid ""
 "We were unable to open this addressbook. This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3515,7 +3494,7 @@
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook. Please make your search\n"
@@ -3523,45 +3502,45 @@
 "preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error adding list"
-msgstr ""
+msgstr "שגיאה בהוספת רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:193
+#: ../addressbook/gui/widgets/eab-gui-util.c:669
 msgid "Error adding contact"
-msgstr ""
+msgstr "שגיאה בהוספת איש קשר"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:204
 msgid "Error modifying list"
-msgstr ""
+msgstr "שגיאה בשינוי רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:204
 msgid "Error modifying contact"
-msgstr ""
+msgstr "שגיאה בשינוי איש קשר"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
 msgid "Error removing list"
-msgstr ""
+msgstr "שגיאה בהסרת רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
+#: ../addressbook/gui/widgets/eab-gui-util.c:619
 msgid "Error removing contact"
-msgstr ""
+msgstr "שגיאה בהסרת איש קשר"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:298
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3572,88 +3551,88 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 msgid "_Don't Display"
-msgstr "תצוגה"
+msgstr "_אל תציג"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:307
 msgid "Display _All Contacts"
-msgstr "העתק אנשי קשר ל"
+msgstr "הצג את _כל אנשי הקשר"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:333
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
+"‏%s כבר קיים\n"
+"האם להחליפו?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:337
 msgid "Overwrite"
 msgstr "החלף"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:381
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "איש קשר"
 msgstr[1] "אנשי קשר"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:464
 msgid "Select Address Book"
 msgstr "בחר ספר כתובות"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:578
 msgid "list"
 msgstr "רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:730
 msgid "Move contact to"
 msgstr "הזז איש קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:732
 msgid "Copy contact to"
 msgstr "העתק איש קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:735
 msgid "Move contacts to"
 msgstr "הזז אנשי קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:737
 msgid "Copy contacts to"
 msgstr "העתק אנשי קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:881
 msgid "Multiple vCards"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:888
 #, fuzzy, c-format
 msgid "vCard for %s"
 msgstr "תיקייה לא תקינה: `%s'"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:900
+#: ../addressbook/gui/widgets/eab-gui-util.c:926
 #, fuzzy, c-format
 msgid "Contact information"
 msgstr "איש הקשר לא נמצא"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:928
 #, fuzzy, c-format
 msgid "Contact information for %s"
 msgstr "עורך אנשי הקשר"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:313
 msgid "Querying Address Book..."
 msgstr ""
 
@@ -3692,7 +3671,7 @@
 
 #: ../addressbook/importers/evolution-csv-importer.c:826
 msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "‏CSV או Tab של Outlook ‏(‎.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:827
 msgid "Outlook CSV and Tab Importer"
@@ -3700,7 +3679,7 @@
 
 #: ../addressbook/importers/evolution-csv-importer.c:835
 msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "‏CSV או Tab של Mozilla ‏(‎.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:836
 msgid "Mozilla CSV and Tab Importer"
@@ -3708,7 +3687,7 @@
 
 #: ../addressbook/importers/evolution-csv-importer.c:844
 msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "‏CSV או Tab של Evolution ‏(‎.csv, .tab)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:845
 #, fuzzy
@@ -3880,7 +3859,7 @@
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
+#: ../plugins/exchange-operations/exchange-account-setup.c:986
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4005,367 +3984,375 @@
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
+"'{0}' is a read-only calendar source. Change Calendar to one that can accept "
+"appointments."
+msgstr ""
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
 "'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
 "a calendar that can accept appointments."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:15
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "אתה בטוח שברצונך למחוק פגישה זו?"
+msgstr "למחוק את מזכר '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 #, fuzzy
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr ""
 "אתה בטוח שברצונך\n"
 "למחוק אנשי קשר אלו?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:22
 #: ../calendar/gui/dialogs/delete-comp.c:183
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "אתה בטוח שברצונך למחוק פגישה זו?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
 #: ../calendar/gui/dialogs/delete-comp.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete this memo?"
-msgstr "אתה בטוח שברצונך למחוק פגישה זו?"
+msgstr "למחוק את מזכר זה?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:24
 #: ../calendar/gui/dialogs/delete-comp.c:186
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 #, fuzzy
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "האם לשלוח את ההודעה ללא נושא?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 #, fuzzy
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "האם לשלוח את ההודעה ללא נושא?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 #, fuzzy
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "האם לשלוח את ההודעה ללא נושא?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 #, fuzzy
 msgid "Cannot create a new event"
 msgstr "צור איש קשר חדש"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+#, fuzzy
+msgid "Cannot save event"
+msgstr "צור איש קשר חדש"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 #, fuzzy
 msgid "Delete memo list '{0}'?"
 msgstr "רשימת תפוצה חדשה"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 #, fuzzy
 msgid "Delete task list '{0}'?"
 msgstr "רשימת תפוצה חדשה"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "אל _תשלח"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:33
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
-msgstr "ספר הכתובות לא יכל להיפתח."
+msgstr "לא ניתן לפתוח את העורך."
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:36
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
-msgstr "שגיאה בטעינת %s"
+msgstr "שגיאה בטעינת היומן"
 
-#: ../calendar/calendar.error.xml.h:37
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
-msgstr "שגיאה בטעינת %s"
+msgstr "שגיאה בטעינת רשימת התיזכורות"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 #, fuzzy
 msgid "Error loading task list"
 msgstr "שגיאה בטעינת %s"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 #, fuzzy
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ספר הכתובות של אבולוציה נסגר באופן בלתי צפוי."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
 msgid "The memo list is not marked for offline usage"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 #, fuzzy
 msgid "This memo list will be removed permanently."
 msgstr "ספר הכתובות לא יכל להיפתח."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 #, fuzzy
 msgid "Would you like to save your changes to this memo?"
 msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 #, fuzzy
 msgid "Would you like to save your changes to this task?"
 msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 #, fuzzy
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 #, fuzzy
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 #, fuzzy
 msgid "You have changed this task, but not yet saved it."
 msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 #, fuzzy
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "ה_תעלם משינויים"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:492
+#: ../ui/evolution-editor.xml.h:23
 msgid "_Save"
 msgstr "_שמור"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "שמור _שינויים"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../calendar/calendar.error.xml.h:78
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:145
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_שלח"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "_שלח התרעה"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
@@ -4399,7 +4386,7 @@
 
 #: ../calendar/conduits/todo/todo-conduit.c:238
 msgid "Default Priority:"
-msgstr ""
+msgstr "עדיפות ברירת מחדל:"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1100
 #: ../calendar/conduits/todo/todo-conduit.c:1103
@@ -4412,7 +4399,7 @@
 msgstr ""
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2347
 msgid "Calendar and Tasks"
 msgstr "יומן ומשימות"
 
@@ -4423,42 +4410,42 @@
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
+msgstr "Configure your timezone, Calendar and Task List here "
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
-msgstr ""
+msgstr "Evolution Calendar and Tasks"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
-msgstr ""
+msgstr "Evolution Calendar configuration control"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
+msgstr "Evolution Calendar scheduling message viewer"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
-msgstr ""
+msgstr "Evolution Calendar/Task editor"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
-msgstr ""
+msgstr "Evolution's Calendar component"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Memos component"
-msgstr ""
+msgstr "Evolution's Memos component"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
-msgstr ""
+msgstr "Evolution's Tasks component"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Memo_s"
 msgstr "_תזכורות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
 #: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
 #: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
 #: ../calendar/gui/memos-control.c:372
@@ -4466,7 +4453,7 @@
 msgstr "תזכורות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
+#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1441
 #: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
 #: ../calendar/gui/tasks-component.c:539
 #: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
@@ -4492,7 +4479,7 @@
 
 #: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
-msgstr ""
+msgstr "Evolution Calendar alarm notification service"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
 msgid "minute"
@@ -4536,14 +4523,12 @@
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:166
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-memos.xml.h:17 ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
 #: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
@@ -4579,7 +4564,7 @@
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1695
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1536
 msgid "Warning"
 msgstr "אזהרה"
 
@@ -4606,11 +4591,11 @@
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:152
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4884,12 +4869,12 @@
 msgstr "Show status field in the event/task/meeting editor"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show the \"Preview\" pane"
 msgstr "Show the \"Preview\" pane"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show the \"Preview\" pane."
 msgstr "Show the \"Preview\" pane."
 
@@ -5073,57 +5058,57 @@
 msgid "daylight savings time"
 msgstr "daylight savings time"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Summary contains"
 msgstr "הסיכום מכיל"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Description contains"
 msgstr "התיאור מכיל"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Category is"
 msgstr "הקטגוריה היא"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Comment contains"
 msgstr "ההערה מכילה"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:80
 msgid "Location contains"
 msgstr "המיקום מכיל"
 
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:626 ../calendar/gui/cal-search-bar.c:669
+#: ../calendar/gui/cal-search-bar.c:688
 msgid "Unmatched"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:634
 msgid "Next 7 Days' Tasks"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:638
 msgid "Active Tasks"
 msgstr "משימות פעילות"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:642
 #, fuzzy
 msgid "Overdue Tasks"
 msgstr "Overdue tasks color"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:646
 msgid "Completed Tasks"
 msgstr "משימות שהסתיימו "
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:650
 msgid "Tasks with Attachments"
 msgstr "משימות עם תצריפים"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:696
 msgid "Active Appointments"
 msgstr "פגישות פעילות"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:700
 #, fuzzy
 msgid "Next 7 Days' Appointments"
 msgstr "פגישה לכל ה_יום"
@@ -5150,7 +5135,7 @@
 #: ../plugins/calendar-http/calendar-http.c:290
 #: ../plugins/calendar-weather/calendar-weather.c:563
 #: ../plugins/google-account-setup/google-source.c:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "ימים"
 
@@ -5159,13 +5144,13 @@
 #. Create the Webcal source group
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:510
+#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1123
 #: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "באינטרנט"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:404
 msgid "Birthdays & Anniversaries"
 msgstr "ימי הולדת ו-\tימי שנה"
 
@@ -5181,14 +5166,14 @@
 
 #: ../calendar/gui/calendar-component.c:606
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2087
 msgid "_Copy..."
 msgstr "ה_עתק..."
 
 #: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 #: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2099
+#: ../composer/e-msg-composer.c:1045 ../mail/em-folder-tree.c:2101
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_מאפיינים"
@@ -5427,13 +5412,13 @@
 msgstr "התרעות"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../composer/e-composer-actions.c:63
 msgid "_Suggest automatic display of attachment"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
 msgid "Attach file(s)"
-msgstr ""
+msgstr "צרף קבצים"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
 msgid "Selected Calendars for Alarms"
@@ -5447,6 +5432,11 @@
 "10 minutes\n"
 "05 minutes"
 msgstr ""
+"60 דקות\n"
+"30 דקות\n"
+"15 דקות\n"
+"10 דקות\n"
+"05 דקות"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
@@ -5535,7 +5525,7 @@
 "ראשון"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:112
 msgid "Pick a color"
 msgstr "בחר צבע"
 
@@ -5695,7 +5685,7 @@
 msgstr ""
 
 #: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
+msgid "Colo_r:"
 msgstr "_צבע:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:381
@@ -5703,38 +5693,44 @@
 msgstr "רשימת משימות"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:392
-#, fuzzy
 msgid "Memo List"
-msgstr "הודעה זו היא דואר זבל"
+msgstr "רשימת תזכורות"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "מאפייני יומן"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "יומן חדש"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "מאפייני רשימת משימות"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:533
+msgid "New Task List"
+msgstr "רשימת משימות חדשה"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:589
+msgid "Memo List Properties"
+msgstr "מאפייני רשימת תזכורות"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "רשימת תזכורות חדשה"
 
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
-msgstr ""
+msgstr "אירוע זה נמחק."
 
 #: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
-msgstr ""
+msgstr "משימה זו נמחקה."
 
 #: ../calendar/gui/dialogs/changed-comp.c:68
-#, fuzzy
 msgid "This memo has been deleted."
-msgstr "לא נבחר שרת"
+msgstr "תזכורת זו נמחקה."
 
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
@@ -5793,143 +5789,144 @@
 msgid "Due "
 msgstr "עד "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:207
 #, c-format
 msgid "Attached message - %s"
-msgstr ""
+msgstr "הודעה מצורפת - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../calendar/gui/dialogs/comp-editor.c:212
+#: ../calendar/gui/dialogs/comp-editor.c:385 ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1942
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
+#: ../calendar/gui/dialogs/comp-editor.c:456 ../composer/e-msg-composer.c:2010
+#: ../mail/em-folder-tree.c:999 ../mail/em-folder-utils.c:366
 #: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
 msgid "_Move"
 msgstr "_העבר"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:2012
+#: ../mail/em-folder-tree.c:1001 ../mail/message-list.c:2068
 msgid "Cancel _Drag"
 msgstr "בטל _גרירה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
+#: ../calendar/gui/dialogs/comp-editor.c:661
+#: ../calendar/gui/dialogs/comp-editor.c:2856 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../widgets/misc/e-attachment-bar.c:378
 msgid "attachment"
 msgstr "תצריף"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:823
 msgid "Could not update object"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
+#: ../calendar/gui/dialogs/comp-editor.c:973
 #, c-format
 msgid "%d Attachment"
 msgid_plural "%d Attachments"
 msgstr[0] "תצריף %d"
 msgstr[1] "%d תצריפים"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1007
+#: ../calendar/gui/dialogs/comp-editor.c:1005
 msgid "Hide Attachment _Bar"
 msgstr "הסתר את תיבת ה_תצריפים"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1008
+#: ../calendar/gui/dialogs/comp-editor.c:1591
 msgid "Show Attachment _Bar"
 msgstr "הצג את תיבת ה_תצריפים"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 #: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
+#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:1044
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "ה_סר"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
+#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../composer/e-msg-composer.c:1047
 msgid "_Add attachment..."
 msgstr "הוסף _תצריף"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../mail/em-format-html-display.c:2197
 msgid "Show Attachments"
 msgstr "הצג תצריפים"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:1616
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../calendar/gui/dialogs/comp-editor.c:2227
+#: ../calendar/gui/dialogs/comp-editor.c:2270
 msgid "Edit Appointment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
 # c-format
+#: ../calendar/gui/dialogs/comp-editor.c:2233
+#: ../calendar/gui/dialogs/comp-editor.c:2276
+#, c-format
 msgid "Meeting - %s"
 msgstr "ישיבה - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
+#: ../calendar/gui/dialogs/comp-editor.c:2235
+#: ../calendar/gui/dialogs/comp-editor.c:2278
 #, c-format
 msgid "Appointment - %s"
 msgstr "פגישה - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../calendar/gui/dialogs/comp-editor.c:2239
+#: ../calendar/gui/dialogs/comp-editor.c:2282
 #, c-format
 msgid "Assigned Task - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2241
+#: ../calendar/gui/dialogs/comp-editor.c:2284
 #, c-format
 msgid "Task - %s"
 msgstr "משימה - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
+#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../calendar/gui/dialogs/comp-editor.c:2287
 #, c-format
 msgid "Memo - %s"
 msgstr "תזכורת - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
+#: ../calendar/gui/dialogs/comp-editor.c:2255
+#: ../calendar/gui/dialogs/comp-editor.c:2297
 msgid "No summary"
 msgstr "אין סיכום"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:2945
+#: ../calendar/gui/dialogs/comp-editor.c:2999
+#: ../calendar/gui/dialogs/comp-editor.c:3023
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3052
 msgid "Unable to use current version!"
 msgstr ""
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
-msgstr ""
+msgstr "לא ניתן לפתוח את המקור"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:69
 msgid "Could not open destination"
-msgstr ""
+msgstr "לא ניתן לפתוח את היעד"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:78
 msgid "Destination is read only"
-msgstr ""
+msgstr "היעד הוא לקריאה בלבד"
 
 #: ../calendar/gui/dialogs/delete-comp.c:206
 msgid "_Delete this item from all other recipient's mailboxes?"
@@ -6079,7 +6076,7 @@
 #: ../calendar/gui/dialogs/event-page.c:2711
 #, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr ""
+msgstr "לא ניתן לפתוח את היומן '%s'."
 
 #: ../calendar/gui/dialogs/event-page.c:2755
 #: ../calendar/gui/dialogs/memo-page.c:990
@@ -6119,15 +6116,15 @@
 #: ../calendar/gui/e-cal-model-tasks.c:669
 #: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
 #: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:94
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:205
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../plugins/itip-formatter/itip-formatter.c:2024
 #: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
 #: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../widgets/misc/e-signature-combo-box.c:69
 msgid "None"
 msgstr "ללא"
 
@@ -6219,9 +6216,9 @@
 msgid "Unable to open memos in '%s'."
 msgstr ""
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
+#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1553
+#: ../mail/em-format-html.c:1611 ../mail/em-format-html.c:1637
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "אל"
@@ -6243,7 +6240,7 @@
 #: ../calendar/gui/dialogs/task-page.c:451
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
-msgstr ""
+msgstr "_קבוצה:"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
@@ -6279,7 +6276,7 @@
 
 #: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
-msgstr ""
+msgstr "כל המופעים"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:505
 msgid "This appointment contains recurrences that Evolution cannot edit."
@@ -6382,12 +6379,11 @@
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1426
 msgid "occurrences"
-msgstr ""
+msgstr "מופעים"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2167
-#, fuzzy
 msgid "Add exception"
-msgstr "תיאור"
+msgstr "הוסף חריגה"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to modify."
@@ -6408,7 +6404,7 @@
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "Exceptions"
-msgstr ""
+msgstr "חריגות"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
 #: ../mail/mail-config.glade.h:3
@@ -6423,7 +6419,7 @@
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Every"
-msgstr ""
+msgstr "כל"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
@@ -6435,7 +6431,7 @@
 #. '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 ""
+msgstr "לנצח"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
@@ -6474,24 +6470,24 @@
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-component-preview.c:252
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
 #: ../calendar/gui/e-calendar-table.c:234
 #: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:369
 msgid "Completed"
 msgstr "הסתיים"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:271
 #: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
 msgid "High"
 msgstr "גבוה"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:249
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
@@ -6501,20 +6497,20 @@
 msgstr "בתהליך"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:275
 #: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
 msgid "Low"
 msgstr "נמוך"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-component-preview.c:273
 #: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
 #: ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "רגיל"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:259
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
 #: ../calendar/gui/e-calendar-table.c:230
@@ -6540,7 +6536,7 @@
 msgstr "_תאריך סיום:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_עדיפות:"
 
@@ -6672,53 +6668,53 @@
 #: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
 #, c-format
 msgid "Click to open %s"
-msgstr ""
+msgstr "לחץ כדי לפתוח את %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
+#: ../calendar/gui/e-cal-component-memo-preview.c:134
+#: ../calendar/gui/e-cal-component-preview.c:176 ../filter/filter-rule.c:805
 #: ../shell/e-shell-folder-title-bar.c:593
 msgid "Untitled"
 msgstr "ללא-שם"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../calendar/gui/e-cal-component-memo-preview.c:186
+#: ../calendar/gui/e-cal-component-preview.c:216
+#: ../calendar/gui/e-cal-component-preview.c:227
 msgid "Start Date:"
 msgstr "תאריך התחלה:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
+#: ../calendar/gui/e-cal-component-preview.c:290
 #: ../calendar/gui/e-itip-control.c:1201
 #: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "תיאור:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:235
+#: ../calendar/gui/e-cal-component-preview.c:323
 msgid "Web Page:"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-cal-component-preview.c:209
 #: ../calendar/gui/e-itip-control.c:1145
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "סיכום:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:238
 msgid "Due Date:"
 msgstr "תאריך יעד:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-cal-component-preview.c:245
 #: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/exchange-operations/exchange-account-setup.c:268
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "מצב:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:269
 msgid "Priority:"
 msgstr "עדיפות:"
 
@@ -6749,7 +6745,7 @@
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Summary"
 msgstr "סיכום"
 
@@ -6772,34 +6768,34 @@
 msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:747
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "כן"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:166
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "לא"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
 #: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
+#: ../calendar/gui/e-meeting-list-view.c:168
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../plugins/itip-formatter/itip-formatter.c:2049
 #: ../plugins/plugin-manager/plugin-manager.c:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-attachment-bar.c:742
+#: ../widgets/misc/e-charset-picker.c:55
 msgid "Unknown"
 msgstr "לא ידוע"
 
@@ -6811,36 +6807,36 @@
 msgid "Assigned"
 msgstr ""
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:427
 msgid "Save As..."
 msgstr "שמור בשם..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2031
 msgid "Select folder to save selected attachments..."
 msgstr ""
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:455
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:572 ../mail/em-popup.c:583
 msgid "_Save As..."
 msgstr "_שמירה בשם..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:584
 msgid "Set as _Background"
 msgstr "קבע כ_רקע"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 #, fuzzy
 msgid "_Save Selected"
 msgstr "נבחר"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:439 ../mail/em-popup.c:853
 #, c-format
 msgid "Open in %s..."
 msgstr "פתח ב-%s..."
@@ -6890,23 +6886,23 @@
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-view.c:679 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr ""
 
 #: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-view.c:809 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr ""
 
 #: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-view.c:1235 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "שמירה בשם..."
 
 #: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1668
 msgid "New _Task"
 msgstr "משימה _חדשה"
 
@@ -6915,23 +6911,23 @@
 msgstr ""
 
 #: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "ה_דפס..."
 
 #: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_גזור"
 
 #: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-view.c:1674
+#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+#: ../ui/evolution-editor.xml.h:22 ../ui/evolution-memos.xml.h:19
+#: ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ה_דבק"
 
@@ -6981,14 +6977,14 @@
 
 #: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
-msgstr ""
+msgstr "תאריך סיום"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "תאריך יעד"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Priority"
 msgstr "עדיפות"
 
@@ -6997,112 +6993,112 @@
 msgstr "תאריך התחלה"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
+#: ../calendar/gui/e-meeting-list-view.c:546
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "מצב"
 
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1354
 msgid "Moving items"
 msgstr "מעביר פריטים"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1356
 msgid "Copying items"
 msgstr "מעתיק פריטים"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1665
 msgid "New _Appointment..."
 msgstr "_פגישה חדשה..."
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "New All Day _Event"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "New _Meeting"
 msgstr "ישיבה _חדשה"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1678
 msgid "_Current View"
 msgstr "_תצוגה נוכחית"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1680
 msgid "Select T_oday"
 msgstr "בחר את _היום"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1681
 msgid "_Select Date..."
 msgstr "בחר _תאריך..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "Pri_nt..."
 msgstr "ה_דפס..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "Cop_y to Calendar..."
-msgstr ""
+msgstr "הע_תק ליומן..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1698
 msgid "Mo_ve to Calendar..."
-msgstr ""
+msgstr "ה_עבר ליומן..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1699
 #, fuzzy
 msgid "_Delegate Meeting..."
 msgstr "_מחק..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1700
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1701
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1702
 msgid "_Reply"
 msgstr "ה_שב"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1703 ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:577 ../mail/em-popup.c:588
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "השב ל_כולם"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1708
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1709 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Delete _All Occurrences"
-msgstr ""
+msgstr "מחק את _כל המופעים"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
+#: ../calendar/gui/e-calendar-view.c:2232
 #, fuzzy, c-format
 msgid "Organizer: %s <%s>"
 msgstr "_ארגון:"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
+#: ../calendar/gui/e-calendar-view.c:2236
 #, fuzzy, c-format
 msgid "Organizer: %s"
 msgstr "_ארגון:"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2252 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "_מיקום: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2286
 #, c-format
 msgid "Time: %s %s"
 msgstr "שעה: %s %s"
@@ -7128,7 +7124,7 @@
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:807
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
@@ -7139,22 +7135,20 @@
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1359
-#: ../calendar/gui/e-day-view.c:2145
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:837 ../calendar/gui/e-day-view.c:1528
+#: ../calendar/gui/e-week-view-main-item.c:322 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-day-view.c:1123
-#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:772 ../calendar/gui/e-week-view.c:511
+#: ../calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
-#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:775 ../calendar/gui/e-week-view.c:514
+#: ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
@@ -7263,7 +7257,7 @@
 msgstr "מסתיים"
 
 #: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Due"
 msgstr ""
 
@@ -7295,23 +7289,23 @@
 msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/itip-utils.c:692
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Accepted"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:695
+#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Tentatively Accepted"
 msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/itip-utils.c:698 ../calendar/gui/itip-utils.c:727
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Declined"
 msgstr "נדחה"
 
@@ -7528,13 +7522,13 @@
 msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../plugins/itip-formatter/itip-formatter.c:1254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
 msgid "Item sent!\n"
-msgstr ""
+msgstr "הפריט נשלח!\n"
 
 #: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
 msgid "The item could not be sent!\n"
@@ -7542,7 +7536,7 @@
 
 #: ../calendar/gui/e-itip-control.c:2233
 msgid "Choose an action:"
-msgstr ""
+msgstr "בחר פעולה:"
 
 #: ../calendar/gui/e-itip-control.c:2304
 msgid "Update"
@@ -7574,7 +7568,7 @@
 msgid "Send Latest Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:715
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ביטול"
@@ -7603,106 +7597,106 @@
 msgid "Server Message:"
 msgstr "הודעת שרת:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Chair Persons"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Required Participants"
 msgstr "משתתפים דרושים"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Optional Participants"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:72
 msgid "Resources"
 msgstr "משאבים"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:153
 #, fuzzy
 msgid "Attendees"
 msgstr "מוזמנים"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/e-meeting-store.c:741 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
 #: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
-msgstr ""
+msgstr "קבוצה"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
 #: ../calendar/gui/print.c:967
 msgid "Resource"
-msgstr ""
+msgstr "משאב"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
 #: ../calendar/gui/print.c:968
 msgid "Room"
+msgstr "חדר"
+
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/print.c:982
+msgid "Chair"
 msgstr ""
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
-msgid "Chair"
+#: ../calendar/gui/e-meeting-store.c:744 ../calendar/gui/print.c:983
+msgid "Required Participant"
 msgstr ""
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
-msgid "Required Participant"
+#: ../calendar/gui/print.c:984
+msgid "Optional Participant"
 msgstr ""
 
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
-msgid "Optional Participant"
-msgstr ""
-
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
 #: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:754
 msgid "Needs Action"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
 #: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Tentative"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/itip-utils.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:2046
 msgid "Delegated"
 msgstr ""
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:492
 msgid "Attendee "
 msgstr ""
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:534
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
 msgid "In Process"
 msgstr ""
 
@@ -7829,7 +7823,7 @@
 msgid "Click to add a memo"
 msgstr "לחץ כאן כדי להוסיף תזכורת"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
+#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
 #: ../calendar/gui/gnome-cal.c:2871
 #, c-format
 msgid ""
@@ -7837,33 +7831,33 @@
 " %s"
 msgstr ""
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:839
 msgid "Loading memos"
 msgstr "טוען תזכורות"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:920
 #, c-format
 msgid "Opening memos at %s"
 msgstr "פותח תזכורות ב-%s"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1333
 msgid "Deleting selected objects..."
 msgstr "מוחק את האובייקטים שנבחרו..."
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:975
 msgid "Loading tasks"
 msgstr ""
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1065
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1310
 msgid "Completing tasks..."
 msgstr "מסיים משימות..."
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1360
 msgid "Expunging"
 msgstr ""
 
@@ -7874,8 +7868,7 @@
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:339 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -7974,60 +7967,60 @@
 
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
-msgstr ""
+msgstr "בחר את _היום"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../calendar/gui/itip-utils.c:439 ../calendar/gui/itip-utils.c:491
+#: ../calendar/gui/itip-utils.c:575
 msgid "An organizer must be set."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:483
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:654 ../calendar/gui/itip-utils.c:769
 msgid "Event information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:656 ../calendar/gui/itip-utils.c:772
 msgid "Task information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:658 ../calendar/gui/itip-utils.c:775
 #, fuzzy
 msgid "Memo information"
 msgstr "כל ה_מידע"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:793
 msgid "Free/Busy information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:662
 msgid "Calendar information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:711
 msgid "Updated"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:719
 msgid "Refresh"
-msgstr ""
+msgstr "רענן"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:723
 msgid "Counter-proposal"
-msgstr ""
+msgstr "הצעה נגדית"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:790
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:798
 msgid "iCalendar information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:969
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -8106,7 +8099,7 @@
 msgid "Print Memos"
 msgstr "הדפס תזכורות"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/migration.c:162
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8114,7 +8107,7 @@
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:166
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8123,24 +8116,24 @@
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:809
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:977
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr ""
 
-#: ../calendar/gui/migration.c:1227
+#: ../calendar/gui/migration.c:1232
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
@@ -8424,7 +8417,7 @@
 
 #: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
 msgid "Do not ask me again."
-msgstr ""
+msgstr "אל תשאל אותי שוב."
 
 #: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
 msgid "Print Tasks"
@@ -8436,7 +8429,7 @@
 
 #: ../calendar/importers/icalendar-importer.c:337
 #: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../plugins/itip-formatter/itip-formatter.c:1583
 msgid "Opening calendar"
 msgstr "פותח יומן"
 
@@ -8475,11 +8468,11 @@
 #.
 #: ../calendar/zones.h:7
 msgid "Africa/Abidjan"
-msgstr ""
+msgstr "אפריקה/אבידג'אן"
 
 #: ../calendar/zones.h:8
 msgid "Africa/Accra"
-msgstr ""
+msgstr "אפריקה/אקרה"
 
 #: ../calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
@@ -8487,27 +8480,27 @@
 
 #: ../calendar/zones.h:10
 msgid "Africa/Algiers"
-msgstr ""
+msgstr "אפריקה/אלג'יר"
 
 #: ../calendar/zones.h:11
 msgid "Africa/Asmera"
-msgstr ""
+msgstr "אפריקה/אסמרה"
 
 #: ../calendar/zones.h:12
 msgid "Africa/Bamako"
-msgstr ""
+msgstr "אפריקה/במקו"
 
 #: ../calendar/zones.h:13
 msgid "Africa/Bangui"
-msgstr ""
+msgstr "אפריקה/בנגואי"
 
 #: ../calendar/zones.h:14
 msgid "Africa/Banjul"
-msgstr ""
+msgstr "אפריקה/בנז'ול"
 
 #: ../calendar/zones.h:15
 msgid "Africa/Bissau"
-msgstr ""
+msgstr "אפריקה/ביסאו"
 
 #: ../calendar/zones.h:16
 msgid "Africa/Blantyre"
@@ -8515,11 +8508,11 @@
 
 #: ../calendar/zones.h:17
 msgid "Africa/Brazzaville"
-msgstr ""
+msgstr "אפריקה/ברזוויל"
 
 #: ../calendar/zones.h:18
 msgid "Africa/Bujumbura"
-msgstr ""
+msgstr "אפריקה/בוג'ומבורה"
 
 #: ../calendar/zones.h:19
 msgid "Africa/Cairo"
@@ -8531,11 +8524,11 @@
 
 #: ../calendar/zones.h:21
 msgid "Africa/Ceuta"
-msgstr ""
+msgstr "אפריקה/סאוטה"
 
 #: ../calendar/zones.h:22
 msgid "Africa/Conakry"
-msgstr ""
+msgstr "אפריקה/קונאקרי"
 
 #: ../calendar/zones.h:23
 msgid "Africa/Dakar"
@@ -8547,7 +8540,7 @@
 
 #: ../calendar/zones.h:25
 msgid "Africa/Djibouti"
-msgstr ""
+msgstr "אפריקה/ג'יבוטי"
 
 #: ../calendar/zones.h:26
 msgid "Africa/Douala"
@@ -8559,15 +8552,15 @@
 
 #: ../calendar/zones.h:28
 msgid "Africa/Freetown"
-msgstr ""
+msgstr "אפריקה/פריטאון"
 
 #: ../calendar/zones.h:29
 msgid "Africa/Gaborone"
-msgstr ""
+msgstr "אפריקה/גאבורון"
 
 #: ../calendar/zones.h:30
 msgid "Africa/Harare"
-msgstr ""
+msgstr "אפריקה/הארארה"
 
 #: ../calendar/zones.h:31
 msgid "Africa/Johannesburg"
@@ -8575,35 +8568,35 @@
 
 #: ../calendar/zones.h:32
 msgid "Africa/Kampala"
-msgstr ""
+msgstr "אפריקה/קמפלה"
 
 #: ../calendar/zones.h:33
 msgid "Africa/Khartoum"
-msgstr ""
+msgstr "אפריקה/חרטום"
 
 #: ../calendar/zones.h:34
 msgid "Africa/Kigali"
-msgstr ""
+msgstr "אפריקה/קיגאלי"
 
 #: ../calendar/zones.h:35
 msgid "Africa/Kinshasa"
-msgstr ""
+msgstr "אפריקה/קינשאסה"
 
 #: ../calendar/zones.h:36
 msgid "Africa/Lagos"
-msgstr ""
+msgstr "אפריקה/לאגוס"
 
 #: ../calendar/zones.h:37
 msgid "Africa/Libreville"
-msgstr ""
+msgstr "אפריקה/ליברוויל"
 
 #: ../calendar/zones.h:38
 msgid "Africa/Lome"
-msgstr ""
+msgstr "אפריקה/לום"
 
 #: ../calendar/zones.h:39
 msgid "Africa/Luanda"
-msgstr ""
+msgstr "אפריקה/לואנדה"
 
 #: ../calendar/zones.h:40
 msgid "Africa/Lubumbashi"
@@ -8611,23 +8604,23 @@
 
 #: ../calendar/zones.h:41
 msgid "Africa/Lusaka"
-msgstr ""
+msgstr "אפריקה/לוסאקה"
 
 #: ../calendar/zones.h:42
 msgid "Africa/Malabo"
-msgstr ""
+msgstr "אפריקה/מלאבו"
 
 #: ../calendar/zones.h:43
 msgid "Africa/Maputo"
-msgstr ""
+msgstr "אפריקה/מאפוטו"
 
 #: ../calendar/zones.h:44
 msgid "Africa/Maseru"
-msgstr ""
+msgstr "אפריקה/מסרו"
 
 #: ../calendar/zones.h:45
 msgid "Africa/Mbabane"
-msgstr ""
+msgstr "אפריקה/מבבנה"
 
 #: ../calendar/zones.h:46
 msgid "Africa/Mogadishu"
@@ -8635,7 +8628,7 @@
 
 #: ../calendar/zones.h:47
 msgid "Africa/Monrovia"
-msgstr ""
+msgstr "אפריקה/מונרוביה"
 
 #: ../calendar/zones.h:48
 msgid "Africa/Nairobi"
@@ -8643,23 +8636,23 @@
 
 #: ../calendar/zones.h:49
 msgid "Africa/Ndjamena"
-msgstr ""
+msgstr "אפריקה/נג'מנה"
 
 #: ../calendar/zones.h:50
 msgid "Africa/Niamey"
-msgstr ""
+msgstr "אפריקה/ניאמי"
 
 #: ../calendar/zones.h:51
 msgid "Africa/Nouakchott"
-msgstr ""
+msgstr "אפריקה/נואקצ'וט"
 
 #: ../calendar/zones.h:52
 msgid "Africa/Ouagadougou"
-msgstr ""
+msgstr "אפריקה/וואגאדוגו"
 
 #: ../calendar/zones.h:53
 msgid "Africa/Porto-Novo"
-msgstr ""
+msgstr "אפריקה/פורטו נובו"
 
 #: ../calendar/zones.h:54
 msgid "Africa/Sao_Tome"
@@ -8667,7 +8660,7 @@
 
 #: ../calendar/zones.h:55
 msgid "Africa/Timbuktu"
-msgstr ""
+msgstr "אפריקה/טימבקטו"
 
 #: ../calendar/zones.h:56
 msgid "Africa/Tripoli"
@@ -8679,7 +8672,7 @@
 
 #: ../calendar/zones.h:58
 msgid "Africa/Windhoek"
-msgstr ""
+msgstr "אפריקה/וינדהוק"
 
 #: ../calendar/zones.h:59
 msgid "America/Adak"
@@ -8691,11 +8684,11 @@
 
 #: ../calendar/zones.h:61
 msgid "America/Anguilla"
-msgstr ""
+msgstr "אמריקה/אנגווילה"
 
 #: ../calendar/zones.h:62
 msgid "America/Antigua"
-msgstr ""
+msgstr "אמריקה/אנטיגואה"
 
 #: ../calendar/zones.h:63
 msgid "America/Araguaina"
@@ -8703,15 +8696,15 @@
 
 #: ../calendar/zones.h:64
 msgid "America/Aruba"
-msgstr ""
+msgstr "אמריקה/ארובה"
 
 #: ../calendar/zones.h:65
 msgid "America/Asuncion"
-msgstr ""
+msgstr "אמריקה/אסונסיון"
 
 #: ../calendar/zones.h:66
 msgid "America/Barbados"
-msgstr ""
+msgstr "אמריקה/ברבדוס"
 
 #: ../calendar/zones.h:67
 msgid "America/Belem"
@@ -8731,7 +8724,7 @@
 
 #: ../calendar/zones.h:71
 msgid "America/Boise"
-msgstr ""
+msgstr "אמריקה/בויסי"
 
 #: ../calendar/zones.h:72
 msgid "America/Buenos_Aires"
@@ -8791,11 +8784,11 @@
 
 #: ../calendar/zones.h:86
 msgid "America/Dawson"
-msgstr ""
+msgstr "אמריקה/דוסון"
 
 #: ../calendar/zones.h:87
 msgid "America/Dawson_Creek"
-msgstr ""
+msgstr "אמריקה/דוסון_קריק"
 
 #: ../calendar/zones.h:88
 msgid "America/Denver"
@@ -9200,11 +9193,11 @@
 
 #: ../calendar/zones.h:188
 msgid "Asia/Aden"
-msgstr ""
+msgstr "אסיה/עדן"
 
 #: ../calendar/zones.h:189
 msgid "Asia/Almaty"
-msgstr ""
+msgstr "אסיה/אלמאטי"
 
 #: ../calendar/zones.h:190
 msgid "Asia/Amman"
@@ -9224,7 +9217,7 @@
 
 #: ../calendar/zones.h:194
 msgid "Asia/Ashgabat"
-msgstr ""
+msgstr "אסיה/אשגאבט"
 
 #: ../calendar/zones.h:195
 msgid "Asia/Baghdad"
@@ -9236,7 +9229,7 @@
 
 #: ../calendar/zones.h:197
 msgid "Asia/Baku"
-msgstr ""
+msgstr "אסיה/באקו"
 
 #: ../calendar/zones.h:198
 msgid "Asia/Bangkok"
@@ -9248,11 +9241,11 @@
 
 #: ../calendar/zones.h:200
 msgid "Asia/Bishkek"
-msgstr ""
+msgstr "אסיה/בישקק"
 
 #: ../calendar/zones.h:201
 msgid "Asia/Brunei"
-msgstr ""
+msgstr "אסיה/ברוניי"
 
 #: ../calendar/zones.h:202
 msgid "Asia/Calcutta"
@@ -9264,11 +9257,11 @@
 
 #: ../calendar/zones.h:204
 msgid "Asia/Chongqing"
-msgstr ""
+msgstr "אסיה/צ'ונגצ'ינג"
 
 #: ../calendar/zones.h:205
 msgid "Asia/Colombo"
-msgstr ""
+msgstr "אסיה/קולומבו"
 
 #: ../calendar/zones.h:206
 msgid "Asia/Damascus"
@@ -9276,11 +9269,11 @@
 
 #: ../calendar/zones.h:207
 msgid "Asia/Dhaka"
-msgstr ""
+msgstr "אסיה/דאקה"
 
 #: ../calendar/zones.h:208
 msgid "Asia/Dili"
-msgstr ""
+msgstr "אסיה/דילי"
 
 #: ../calendar/zones.h:209
 msgid "Asia/Dubai"
@@ -9288,7 +9281,7 @@
 
 #: ../calendar/zones.h:210
 msgid "Asia/Dushanbe"
-msgstr ""
+msgstr "אסיה/דושאנבה"
 
 #: ../calendar/zones.h:211
 msgid "Asia/Gaza"
@@ -9308,7 +9301,7 @@
 
 #: ../calendar/zones.h:215
 msgid "Asia/Irkutsk"
-msgstr ""
+msgstr "אסיה/אירקוטסק"
 
 #: ../calendar/zones.h:216
 msgid "Asia/Istanbul"
@@ -9332,11 +9325,11 @@
 
 #: ../calendar/zones.h:221
 msgid "Asia/Kamchatka"
-msgstr ""
+msgstr "אסיה/קמצ'טקה"
 
 #: ../calendar/zones.h:222
 msgid "Asia/Karachi"
-msgstr ""
+msgstr "אסיה/קראצ'י"
 
 #: ../calendar/zones.h:223
 msgid "Asia/Kashgar"
@@ -9344,7 +9337,7 @@
 
 #: ../calendar/zones.h:224
 msgid "Asia/Katmandu"
-msgstr ""
+msgstr "אסיה/קטמנדו"
 
 #: ../calendar/zones.h:225
 msgid "Asia/Krasnoyarsk"
@@ -9352,7 +9345,7 @@
 
 #: ../calendar/zones.h:226
 msgid "Asia/Kuala_Lumpur"
-msgstr ""
+msgstr "אסיה/קואלה_לומפור"
 
 #: ../calendar/zones.h:227
 msgid "Asia/Kuching"
@@ -9384,7 +9377,7 @@
 
 #: ../calendar/zones.h:234
 msgid "Asia/Muscat"
-msgstr ""
+msgstr "אסיה/מסקט"
 
 #: ../calendar/zones.h:235
 msgid "Asia/Nicosia"
@@ -9392,11 +9385,11 @@
 
 #: ../calendar/zones.h:236
 msgid "Asia/Novosibirsk"
-msgstr ""
+msgstr "אסיה/נובוסיבירסק"
 
 #: ../calendar/zones.h:237
 msgid "Asia/Omsk"
-msgstr ""
+msgstr "אסיה/אומסק"
 
 #: ../calendar/zones.h:238
 msgid "Asia/Oral"
@@ -9404,7 +9397,7 @@
 
 #: ../calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
-msgstr ""
+msgstr "אסיה/פנום_פן"
 
 #: ../calendar/zones.h:240
 msgid "Asia/Pontianak"
@@ -9412,7 +9405,7 @@
 
 #: ../calendar/zones.h:241
 msgid "Asia/Pyongyang"
-msgstr ""
+msgstr "אסיה/פיונגיאנג"
 
 #: ../calendar/zones.h:242
 msgid "Asia/Qatar"
@@ -9424,11 +9417,11 @@
 
 #: ../calendar/zones.h:244
 msgid "Asia/Rangoon"
-msgstr ""
+msgstr "אסיה/רנגון"
 
 #: ../calendar/zones.h:245
 msgid "Asia/Riyadh"
-msgstr ""
+msgstr "אסיה/ריאד"
 
 #: ../calendar/zones.h:246
 msgid "Asia/Saigon"
@@ -9436,11 +9429,11 @@
 
 #: ../calendar/zones.h:247
 msgid "Asia/Sakhalin"
-msgstr ""
+msgstr "אסיה/סחלין"
 
 #: ../calendar/zones.h:248
 msgid "Asia/Samarkand"
-msgstr ""
+msgstr "אסיה/סמרקנד"
 
 #: ../calendar/zones.h:249
 msgid "Asia/Seoul"
@@ -9460,11 +9453,11 @@
 
 #: ../calendar/zones.h:253
 msgid "Asia/Tashkent"
-msgstr ""
+msgstr "אסיה/טשקנט"
 
 #: ../calendar/zones.h:254
 msgid "Asia/Tbilisi"
-msgstr ""
+msgstr "אסיה/טביליסי"
 
 #: ../calendar/zones.h:255
 msgid "Asia/Tehran"
@@ -9472,7 +9465,7 @@
 
 #: ../calendar/zones.h:256
 msgid "Asia/Thimphu"
-msgstr ""
+msgstr "אסיה/ת'ימפו"
 
 #: ../calendar/zones.h:257
 msgid "Asia/Tokyo"
@@ -9484,19 +9477,19 @@
 
 #: ../calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
-msgstr ""
+msgstr "אסיה/אולן בטור"
 
 #: ../calendar/zones.h:260
 msgid "Asia/Urumqi"
-msgstr ""
+msgstr "אסיה/אורומקי"
 
 #: ../calendar/zones.h:261
 msgid "Asia/Vientiane"
-msgstr ""
+msgstr "אסיה/ווינטיאן"
 
 #: ../calendar/zones.h:262
 msgid "Asia/Vladivostok"
-msgstr ""
+msgstr "אסיה/ולדיווסטוק"
 
 #: ../calendar/zones.h:263
 msgid "Asia/Yakutsk"
@@ -9508,7 +9501,7 @@
 
 #: ../calendar/zones.h:265
 msgid "Asia/Yerevan"
-msgstr ""
+msgstr "אסיה/ירוואן"
 
 #: ../calendar/zones.h:266
 msgid "Atlantic/Azores"
@@ -9556,11 +9549,11 @@
 
 #: ../calendar/zones.h:277
 msgid "Australia/Adelaide"
-msgstr ""
+msgstr "אוסטרליה/אדלייד"
 
 #: ../calendar/zones.h:278
 msgid "Australia/Brisbane"
-msgstr ""
+msgstr "אוסטרליה/בריסביין"
 
 #: ../calendar/zones.h:279
 msgid "Australia/Broken_Hill"
@@ -9572,7 +9565,7 @@
 
 #: ../calendar/zones.h:281
 msgid "Australia/Hobart"
-msgstr ""
+msgstr "אוסטרליה/הובארט"
 
 #: ../calendar/zones.h:282
 msgid "Australia/Lindeman"
@@ -9608,7 +9601,7 @@
 
 #: ../calendar/zones.h:290
 msgid "Europe/Belfast"
-msgstr ""
+msgstr "אירופה/בלפאסט"
 
 #: ../calendar/zones.h:291
 msgid "Europe/Belgrade"
@@ -9620,7 +9613,7 @@
 
 #: ../calendar/zones.h:293
 msgid "Europe/Bratislava"
-msgstr ""
+msgstr "אירופה/ברטיסלאבה"
 
 #: ../calendar/zones.h:294
 msgid "Europe/Brussels"
@@ -9636,7 +9629,7 @@
 
 #: ../calendar/zones.h:297
 msgid "Europe/Chisinau"
-msgstr ""
+msgstr "אירופה/קישינב"
 
 #: ../calendar/zones.h:298
 msgid "Europe/Copenhagen"
@@ -9660,7 +9653,7 @@
 
 #: ../calendar/zones.h:303
 msgid "Europe/Kaliningrad"
-msgstr ""
+msgstr "אירופה/קאלינינגרד"
 
 #: ../calendar/zones.h:304
 msgid "Europe/Kiev"
@@ -9672,7 +9665,7 @@
 
 #: ../calendar/zones.h:306
 msgid "Europe/Ljubljana"
-msgstr ""
+msgstr "אירופה/לובליאנה"
 
 #: ../calendar/zones.h:307
 msgid "Europe/London"
@@ -9732,7 +9725,7 @@
 
 #: ../calendar/zones.h:321
 msgid "Europe/San_Marino"
-msgstr ""
+msgstr "אירופה/סאן_מארינו"
 
 #: ../calendar/zones.h:322
 msgid "Europe/Sarajevo"
@@ -9744,7 +9737,7 @@
 
 #: ../calendar/zones.h:324
 msgid "Europe/Skopje"
-msgstr ""
+msgstr "אירופה/סקופיה"
 
 #: ../calendar/zones.h:325
 msgid "Europe/Sofia"
@@ -9760,7 +9753,7 @@
 
 #: ../calendar/zones.h:328
 msgid "Europe/Tirane"
-msgstr ""
+msgstr "אירופה/טירנה"
 
 #: ../calendar/zones.h:329
 msgid "Europe/Uzhgorod"
@@ -9768,7 +9761,7 @@
 
 #: ../calendar/zones.h:330
 msgid "Europe/Vaduz"
-msgstr ""
+msgstr "אירופה/ואדוז"
 
 #: ../calendar/zones.h:331
 msgid "Europe/Vatican"
@@ -9780,7 +9773,7 @@
 
 #: ../calendar/zones.h:333
 msgid "Europe/Vilnius"
-msgstr ""
+msgstr "אירופה/וילנה"
 
 #: ../calendar/zones.h:334
 msgid "Europe/Warsaw"
@@ -9998,125 +9991,322 @@
 msgid "Pacific/Yap"
 msgstr ""
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
+#: ../composer/e-composer-autosave.c:275
+#, fuzzy
+msgid "Could not open autosave file"
+msgstr "לא ניתן לפתוח קובץ"
+
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
+#: ../composer/e-composer-actions.c:46
+msgid "Insert Attachment"
+msgstr "הוסף תצריף"
+
+#: ../composer/e-composer-actions.c:50
+msgid "A_ttach"
+msgstr "צ_רף"
+
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
 msgstr ""
 
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
+#: ../composer/e-composer-actions.c:464 ../ui/evolution-editor.xml.h:15
+msgid "_Attachment..."
+msgstr "_תצריף..."
+
+#: ../composer/e-composer-actions.c:466
+msgid "Attach a file"
+msgstr "צרף קובץ"
+
+#: ../composer/e-composer-actions.c:471 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "_סגור"
+
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../composer/e-composer-actions.c:473
+#: ../ui/evolution-signature-editor.xml.h:13
+msgid "Close the current file"
+msgstr "סגור את הקובץ הנוכחי"
+
+#: ../composer/e-composer-actions.c:478 ../mail/em-folder-view.c:1343
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "ה_דפס..."
+
+#: ../composer/e-composer-actions.c:485 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "_תצוגה לפני הדפסה"
+
+#: ../composer/e-composer-actions.c:494
+msgid "Save the current file"
+msgstr "שמור את הקובץ הנוכחי"
+
+#: ../composer/e-composer-actions.c:499
+msgid "Save _As..."
+msgstr "שמור _בשם..."
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file with a different name"
+msgstr "שמור את הקובץ הנוכחי בשם אחר"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _Draft"
+msgstr "שמור _טיוטה"
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save as draft"
+msgstr "שמור כטיוטה"
+
+#: ../composer/e-composer-actions.c:513
+msgid "S_end"
+msgstr "ש_לח"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Send this message"
+msgstr "שלח את ההודעה"
+
+#: ../composer/e-composer-actions.c:520 ../ui/evolution-task-editor.xml.h:23
+msgid "_Send Options"
+msgstr " _אפשרויות שליחה"
+
+#: ../composer/e-composer-actions.c:522
+#, fuzzy
+msgid "Insert Send options"
+msgstr "אפשרויות"
+
+#: ../composer/e-composer-actions.c:529
+#, fuzzy
+msgid "Character _Encoding"
+msgstr "קידוד תווים"
+
+#: ../composer/e-composer-actions.c:536
+msgid "_Security"
+msgstr "_אבטחה"
+
+#: ../composer/e-composer-actions.c:546
+msgid "PGP _Encrypt"
+msgstr "ה_צפנת PGP"
+
+#: ../composer/e-composer-actions.c:548
+msgid "Encrypt this message with PGP"
+msgstr "הצפן הודעה זו עם PGP"
+
+#: ../composer/e-composer-actions.c:554
+msgid "PGP _Sign"
+msgstr "_חתימת PGP"
+
+#: ../composer/e-composer-actions.c:556
+msgid "Sign this message with your PGP key"
 msgstr ""
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
+#: ../composer/e-composer-actions.c:562
+#, fuzzy
+msgid "_Prioritize Message"
+msgstr "הדפס הודעה"
+
+#: ../composer/e-composer-actions.c:564
+#, fuzzy
+msgid "Set the message priority to high"
+msgstr "שמור את ההודעה כקובץ מלל"
+
+#: ../composer/e-composer-actions.c:570
+#, fuzzy
+msgid "Re_quest Read Receipt"
+msgstr "משתתפים דרושים"
+
+#: ../composer/e-composer-actions.c:572
+msgid "Get delivery notification when your message is read"
 msgstr ""
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "ח_תימה:"
+#: ../composer/e-composer-actions.c:578
+msgid "S/MIME En_crypt"
+msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-composer-actions.c:580
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:586
+msgid "S/MIME Sig_n"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:588
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:594
+msgid "_Bcc Field"
+msgstr "שדה _Bcc"
+
+#: ../composer/e-composer-actions.c:596
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:602
+msgid "_Cc Field"
+msgstr "שדה _Cc"
+
+#: ../composer/e-composer-actions.c:604
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:610
+msgid "_From Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:612
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:618
+msgid "_Post-To Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:620
+msgid "Toggles whether the Post-To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:626
+msgid "_Reply-To Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:628
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:634
+#, fuzzy
+msgid "_Subject Field"
+msgstr "שדה _Cc"
+
+#: ../composer/e-composer-actions.c:636
+msgid "Toggles whether the Subject field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:642
+msgid "_To Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:644
+msgid "Toggles whether the To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:685 ../ui/evolution-editor.xml.h:1
+msgid "Attach"
+msgstr "צרף"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "הכנס את הנמענים של ההודעה"
+
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:71
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:645
 msgid "Fr_om:"
 msgstr "_מאת:"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-composer-header-table.c:654
 msgid "_Reply-To:"
 msgstr "השב _אל:"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-composer-header-table.c:658
 msgid "_To:"
 msgstr "א_ל:"
 
-#: ../composer/e-msg-composer-hdrs.c:337
-msgid "Enter the recipients of the message"
-msgstr "הכנס את הנמענים של ההודעה"
-
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-composer-header-table.c:663
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-composer-header-table.c:668
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:348
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr ""
-
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
 #, fuzzy
 msgid "_Post To:"
 msgstr "_לך אל"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "נו_שא:"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "צ_רף"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "ח_תימה:"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "הוסף תצריף"
+#: ../composer/e-composer-name-header.c:114
+msgid "Click here for the address book"
+msgstr ""
 
-#: ../composer/e-msg-composer.c:819
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-composer-post-header.c:136
+msgid "Posting destination"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:826
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+#: ../composer/e-composer-post-header.c:137
+msgid "Choose folders to post the message to."
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
-msgid "Hide _Attachment Bar"
-msgstr "ה_סתר את תיבת התצריפים"
+#: ../composer/e-composer-post-header.c:171
+msgid "Click here to select folders to post to"
+msgstr ""
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
+#: ../composer/e-composer-private.c:65
+msgid "Recent _Documents"
+msgstr ""
+
+#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1557
 msgid "Show _Attachment Bar"
 msgstr "_הצג את תיבת התצריפים"
 
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "סיבה לא ידועה"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "לא ניתן לפתוח קובץ"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
+#: ../composer/e-msg-composer.c:871
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
+#: ../composer/e-msg-composer.c:878
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
 msgstr ""
 
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "פתח קובץ"
+#: ../composer/e-msg-composer.c:1499 ../mail/em-format-html-display.c:1917
+#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "תצריף"
+msgstr[1] "תצריף"
 
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1555
+msgid "Hide _Attachment Bar"
+msgstr "ה_סתר את תיבת התצריפים"
+
+#: ../composer/e-msg-composer.c:1572 ../composer/e-msg-composer.c:2739
 msgid "Compose Message"
 msgstr "חבר הודעה"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4029
 msgid ""
 "(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10142,8 +10332,7 @@
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr ""
 
@@ -10203,9 +10392,8 @@
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:18
-#, fuzzy
 msgid "Send options not available."
-msgstr "TLS לא זמין"
+msgstr "אפשרויות שליחה לא זמינות."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -10246,14 +10434,12 @@
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:30
-#, fuzzy
 msgid "_Do not Recover"
-msgstr "אל תסיר"
+msgstr "_אל תשחזר"
 
 #: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
-#, fuzzy
 msgid "_Recover"
-msgstr "ה_סר"
+msgstr "_שחזר"
 
 #: ../composer/mail-composer.error.xml.h:32
 msgid "_Save Message"
@@ -10263,7 +10449,7 @@
 msgid "Evolution Mail and Calendar"
 msgstr "דואר ויומן Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:751
 msgid "Groupware Suite"
 msgstr ""
 
@@ -10314,28 +10500,34 @@
 "The printing system did not report any additional details about the error."
 msgstr ""
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr ""
+
 #: ../e-util/e-system.error.xml.h:2
 #, fuzzy
-msgid "Cannot open file &quot;{0}&quot;."
+msgid "Cannot open file \"{0}\"."
 msgstr "לא ניתן לפתוח קובץ"
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr "לא ניתן לפתוח קובץ"
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr ""
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
+#, fuzzy
+msgid "File exists \"{0}\"."
 msgstr "הקובץ קיים &quot;{0}&quot;."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "להחליף קובץ?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:144
 msgid "_Overwrite"
 msgstr "ה_חלף"
 
@@ -10381,9 +10573,20 @@
 msgstr ""
 
 #: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
 msgstr ""
 
+#: ../e-util/gconf-bridge.c:1218
+#, fuzzy, c-format
+msgid "GConf error: %s"
+msgstr "שגיאת מערכת: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr ""
+
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
@@ -10507,7 +10710,7 @@
 #: ../filter/filter-part.c:533
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: ../filter/filter-rule.c:800
 msgid "R_ule name:"
@@ -10531,9 +10734,8 @@
 msgstr ""
 
 #: ../filter/filter-rule.c:870
-#, fuzzy
 msgid "_Find items:"
-msgstr "יחידה"
+msgstr "_חפש פריטים:"
 
 #: ../filter/filter-rule.c:892
 msgid "All related"
@@ -10556,11 +10758,11 @@
 msgstr ""
 
 #: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "נכנס"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:990 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "יוצא"
 
@@ -10578,15 +10780,15 @@
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
-msgstr ""
+msgstr "תאריך חסר."
 
 #: ../filter/filter.error.xml.h:5
 msgid "Missing file name."
-msgstr ""
+msgstr "שם קובץ חסר."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:77
 msgid "Missing name."
-msgstr ""
+msgstr "שם חסר."
 
 #: ../filter/filter.error.xml.h:7
 msgid "Name &quot;{0}&quot; already used."
@@ -10610,7 +10812,7 @@
 
 #: ../filter/filter.glade.h:1
 msgid "_Filter Rules"
-msgstr ""
+msgstr "_חוקי מסנן"
 
 #: ../filter/filter.glade.h:2
 msgid "Compare against"
@@ -10654,7 +10856,7 @@
 msgid "months"
 msgstr "חודשים"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:194
 msgid "seconds"
 msgstr "שניות"
 
@@ -10690,64 +10892,77 @@
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
-msgstr "העדפות מחבר הדואר"
+msgstr "Composer Preferences"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
+"Configure mail preferences, including security and message display, here"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
+msgstr "Configure spell-checking, signatures, and the message composer here"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
-msgstr ""
+msgstr "Configure your email accounts here"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "Configure your network connection settings here"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
-msgstr "דואר Evolution"
+msgstr "Evolution Mail"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
-msgstr ""
+msgstr "Evolution Mail accounts configuration control"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
-msgstr "רכיב דואר Evolution"
+msgstr "Evolution Mail component"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
-msgstr ""
+msgstr "Evolution Mail composer"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
-msgstr ""
+msgstr "Evolution Mail composer configuration control"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
-msgstr ""
+msgstr "Evolution Mail preferences control"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "Evolution Network configuration control"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:611
 #: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/mail-component.c:584 ../mail/mail-component.c:585
+#: ../mail/mail-component.c:749
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "דואר"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 #: ../mail/em-account-prefs.c:502
 msgid "Mail Accounts"
 msgstr "חשבונות דואר"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "העדפות דואר"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "Network Preferences"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_דואר"
 
@@ -10771,7 +10986,7 @@
 msgstr "בחר תיקייה"
 
 #: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:97
 msgid "Autogenerated"
 msgstr ""
 
@@ -10780,11 +10995,11 @@
 msgid "Ask for each message"
 msgstr "הודעה שלא נקראה:"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "זהות"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:123
 msgid "Receiving Email"
 msgstr "קבלת דוא\"ל"
 
@@ -10796,7 +11011,7 @@
 msgid "minu_tes"
 msgstr "ד_קות"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:135
 msgid "Sending Email"
 msgstr "שליחת דוא\"ל"
 
@@ -10805,8 +11020,8 @@
 msgstr "ברירת מחדל"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:130
+#: ../plugins/exchange-operations/exchange-account-setup.c:316
 msgid "Security"
 msgstr "אבטחה"
 
@@ -10819,7 +11034,7 @@
 msgid "Checking for New Messages"
 msgstr "בודק עבור הודעות חדשות"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "עורך חשבונות"
 
@@ -10832,9 +11047,9 @@
 msgid "[Default]"
 msgstr "[ברירת מחדל]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
+#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:978
+#: ../plugins/plugin-manager/plugin-manager.c:331
+#: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "מופעל"
 
@@ -10846,41 +11061,41 @@
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../mail/em-composer-prefs.c:299 ../mail/em-composer-prefs.c:434
+#: ../mail/mail-config.c:1117 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "ללא שם"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:982
 msgid "Language(s)"
 msgstr "שפה/ות"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1031
 msgid "Add signature script"
 msgstr ""
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1073
 msgid "Signature(s)"
 msgstr "חתימה/ות"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:938 ../mail/em-format-quote.c:413
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1754
 msgid "an unknown sender"
 msgstr "שולח בלתי ידוע"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:1801
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:1942
 msgid "-----Original Message-----"
 msgstr "-----הודעה מקורית-----"
 
@@ -10907,7 +11122,7 @@
 
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
-msgstr "BCC"
+msgstr "‏BCC"
 
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
@@ -10915,7 +11130,7 @@
 
 #: ../mail/em-filter-i18n.h:8
 msgid "CC"
-msgstr "CC"
+msgstr "‏CC"
 
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
@@ -11047,7 +11262,7 @@
 msgid "is set"
 msgstr "%d נשלח"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "דואר זבל"
@@ -11140,9 +11355,8 @@
 msgstr "שולח"
 
 #: ../mail/em-filter-i18n.h:63
-#, fuzzy
 msgid "Set Label"
-msgstr "תוית"
+msgstr "קבע תווית"
 
 #: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
@@ -11172,10 +11386,9 @@
 msgid "Stop Processing"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:95
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:337
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
@@ -11191,61 +11404,60 @@
 msgstr ""
 
 #: ../mail/em-filter-rule.c:517
-#, fuzzy
 msgid "Add Ac_tion"
-msgstr "תיאור"
+msgstr "הוסף _פעולה"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 #, fuzzy
 msgid "C_reate Search Folder From Search..."
 msgstr "צור תיקייה וירטואלית מההודעה"
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "כל ההודעות"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "הודעות שלא נקראו"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "ללא תוית"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "הודעות שנקראו"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "הודעות אחרונות"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "הודעות מ-5 הימים האחרונים"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "הודעות עם תצריף"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "הודעות חשובות"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "הודעות שאינן זבל"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1144
 msgid "Account Search"
 msgstr "חיפוש חשבון"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1197
 msgid "All Account Search"
 msgstr ""
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:178
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "הודעה שלא נקראה:"
@@ -11253,13 +11465,18 @@
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:182
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "סה\"כ הודעות:"
 msgstr[1] "סה\"כ הודעות:"
 
-#: ../mail/em-folder-properties.c:323
+#: ../mail/em-folder-properties.c:198 ../mail/em-folder-properties.c:200
+#, fuzzy
+msgid "Quota usage"
+msgstr "סה\"כ הודעות:"
+
+#: ../mail/em-folder-properties.c:362
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "מאפייני תיקייה"
@@ -11286,27 +11503,27 @@
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
 msgid "Drafts"
 msgstr "טיוטות"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2535
-#: ../mail/mail-component.c:156
+#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2537
+#: ../mail/mail-component.c:157
 #: ../plugins/exchange-operations/exchange-delegates-user.c:88
 #: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "דואר נכנס"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:159
 msgid "Outbox"
 msgstr "דואר יוצא"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:160
 msgid "Sent"
 msgstr "נשלח"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
 msgid "Loading..."
 msgstr "טוען..."
 
@@ -11325,88 +11542,87 @@
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:373
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:734
 #, fuzzy
 msgid "Mail Folder Tree"
 msgstr "_תיקיית דואר"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:893
 #, c-format
 msgid "Moving folder %s"
 msgstr "מעביר את התיקייה %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:895
 #, c-format
 msgid "Copying folder %s"
 msgstr "מעתיק את התיקייה %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1974
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "מעביר הודעות אל התיקייה %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:904 ../mail/message-list.c:1976
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "מעתיק הודעות אל התיקייה %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:919
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:996 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "הע_תק אל תיקייה"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:997 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "הע_בר אל תיקייה"
 
-#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2079 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:54
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../mail/em-folder-tree.c:2078
+#: ../mail/em-folder-tree.c:2080
 msgid "Open in _New Window"
 msgstr "פתח ב_חלון חדש"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2085
 msgid "_New Folder..."
 msgstr "תיקייה _חדשה..."
 
-#: ../mail/em-folder-tree.c:2086
+#: ../mail/em-folder-tree.c:2088
 msgid "_Move..."
 msgstr "הע_בר..."
 
-#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2095 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_שנה שם..."
 
-#: ../mail/em-folder-tree.c:2094
+#: ../mail/em-folder-tree.c:2096
 msgid "Re_fresh"
 msgstr "_רענן"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2097
 #, fuzzy
 msgid "Fl_ush Outbox"
 msgstr "דואר יוצא"
 
-#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2103 ../mail/mail.error.xml.h:141
 msgid "_Empty Trash"
 msgstr "_רוקן את האשפה"
 
@@ -11443,11 +11659,11 @@
 msgid "Specify where to create the folder:"
 msgstr "ציין היכן ליצור את התיקייה:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:129
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 
@@ -11455,7 +11671,7 @@
 msgid "_Reply to Sender"
 msgstr "ה_שב לשולח"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:578 ../mail/em-popup.c:589
+#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:579 ../mail/em-popup.c:590
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "הע_בר"
@@ -11465,21 +11681,13 @@
 msgid "_Edit as New Message..."
 msgstr "_ערוך כהודעה חדשה..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "ה_דפס..."
-
 #: ../mail/em-folder-view.c:1347
 msgid "U_ndelete"
 msgstr "_בטל מחיקה"
 
 #: ../mail/em-folder-view.c:1348
 msgid "_Move to Folder..."
-msgstr ""
+msgstr "הע_בר לתיקייה..."
 
 #: ../mail/em-folder-view.c:1349
 msgid "_Copy to Folder..."
@@ -11524,9 +11732,8 @@
 msgstr "לל_א"
 
 #: ../mail/em-folder-view.c:1364
-#, fuzzy
 msgid "_New Label"
-msgstr "ללא תוית"
+msgstr "תווית _חדשה"
 
 #: ../mail/em-folder-view.c:1368
 msgid "Fla_g Completed"
@@ -11588,9 +11795,8 @@
 msgstr "לא ניתן לקבל הודעה"
 
 #: ../mail/em-folder-view.c:2548
-#, fuzzy
 msgid "Retrieving Message..."
-msgstr "מקבל הודעות"
+msgstr "מקבל הודעה..."
 
 #: ../mail/em-folder-view.c:2807
 msgid "C_all To..."
@@ -11623,213 +11829,206 @@
 msgstr ""
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:499
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:643
 msgid "Fin_d:"
 msgstr "_חפש:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:667
 msgid "_Previous"
 msgstr "ה_קודם"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:672
 msgid "_Next"
 msgstr "ה_בא"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:677
 msgid "M_atch case"
 msgstr "התאם _רשיות"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:976 ../mail/em-format-html.c:645
 msgid "Unsigned"
 msgstr "לא חתום"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:976
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "הודעה זו לא חתומה. אין שום ביטחון שזו הודעה מקורית."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:977 ../mail/em-format-html.c:646
 msgid "Valid signature"
 msgstr "חתימה חוקית"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:977
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "הודעה זו חתומה באופן חוקי. קיימת סבירות גבוהה שזו הודעה מקורית."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:978 ../mail/em-format-html.c:647
 msgid "Invalid signature"
 msgstr "חתימה בלתי חוקית"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:978
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:979 ../mail/em-format-html.c:648
 #, fuzzy
 msgid "Valid signature, but cannot verify sender"
 msgstr "חתימה חוקית, לא מצליח לאשר את השולח"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:979
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:980 ../mail/em-format-html.c:649
 msgid "Signature exists, but need public key"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:980
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:987 ../mail/em-format-html.c:655
 msgid "Unencrypted"
 msgstr "לא מוצפן"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:987
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:988 ../mail/em-format-html.c:656
 msgid "Encrypted, weak"
 msgstr "מוצפן, חלש"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:988
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:989 ../mail/em-format-html.c:657
 msgid "Encrypted"
 msgstr "מוצפן"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:989
 msgid ""
 "This message is encrypted. It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:990 ../mail/em-format-html.c:658
 msgid "Encrypted, strong"
 msgstr "מוצפן, חזק"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:990
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1091 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_הצג תעודה"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1106
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1399
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "הסתיים ב-%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1407
 msgid "Overdue:"
 msgstr "תאריך תפוגה:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1410
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "עד %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1470
 msgid "_View Inline"
-msgstr ""
+msgstr "_תצוגה פנימית"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1471
 msgid "_Hide"
 msgstr "ה_חבא"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1472
 msgid "_Fit to Width"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1515
-#, fuzzy
+#: ../mail/em-format-html-display.c:1473
 msgid "Show _Original Size"
-msgstr "הגודל המקורי"
+msgstr "ה_צג גודל מקורי"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "תצריף"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1985
 msgid "Save attachment as"
 msgstr "שמור תצריף בשם"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1989
 #, fuzzy
 msgid "Select folder to save all attachments"
 msgstr "בחר תיקייה לייבא אליה"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2040
 #, fuzzy
 msgid "_Save Selected..."
 msgstr "בחר..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
-#, fuzzy, c-format
+#: ../mail/em-format-html-display.c:2107
+#, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
-msgstr[0] "תצריף אחד"
-msgstr[1] "%d תצריפים"
+msgstr[0] "_תצריף אחד"
+msgstr[1] "_%d תצריפים"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2114 ../mail/em-format-html-display.c:2203
 msgid "S_ave"
 msgstr "_שמור"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2125
 msgid "S_ave All"
 msgstr "שמור ה_כל"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2199
 msgid "No Attachment"
 msgstr "ללא תצריף"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2340 ../mail/em-format-html-display.c:2378
 #, fuzzy
 msgid "View _Unformatted"
 msgstr "מבנה זמן:"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2342
 #, fuzzy
 msgid "Hide _Unformatted"
 msgstr "מבנה זמן:"
 
-#: ../mail/em-format-html-display.c:2564
-#, fuzzy
+#: ../mail/em-format-html-display.c:2397
 msgid "O_pen With"
-msgstr "פתח קובץ"
+msgstr "_פתח בעזרת"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2468
 msgid ""
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
@@ -11840,114 +12039,112 @@
 msgid "Page %d of %d"
 msgstr "עמוד %d מתוך %d"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:499 ../mail/em-format-html.c:508
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "מקבל `%s'"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:920
 #, fuzzy
 msgid "Unknown external-body part."
 msgstr "שגיאה לא ידועה."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:928
 msgid "Malformed external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:958
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:969
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:971
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:992
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1003
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1231
 msgid "Formatting message"
 msgstr ""
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1402
 #, fuzzy
 msgid "Formatting Message..."
 msgstr "חפש _בהודעה..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1554 ../mail/em-format-html.c:1618
+#: ../mail/em-format-html.c:1640 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:93
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1555 ../mail/em-format-html.c:1624
+#: ../mail/em-format-html.c:1643 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:94
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1735 ../mail/em-format-quote.c:350
+#: ../mail/em-mailer-prefs.c:1465
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html.c:1762
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1767
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "תאריך"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr ""
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1866
+#: ../mail/em-format-html.c:1898
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr ""
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
 #: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
 #: ../mail/message-tag-followup.c:333
 msgid "From"
 msgstr "מאת"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:91
 msgid "Reply-To"
 msgstr "השב אל"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:96
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:368
+msgid "Date"
+msgstr "תאריך"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:97
+msgid "Newsgroups"
+msgstr ""
+
+#: ../mail/em-format.c:1156
 #, c-format
 msgid "%s attachment"
 msgstr "תצריף %s"
@@ -12025,9 +12222,8 @@
 msgstr "השולח מכיל"
 
 #: ../mail/em-mailer-prefs.c:451
-#, fuzzy
 msgid "Contains Value"
-msgstr "המשך"
+msgstr "מכיל ערך"
 
 #: ../mail/em-mailer-prefs.c:473
 msgid "Color"
@@ -12038,19 +12234,19 @@
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1093 ../mail/em-mailer-prefs.c:1147
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1101 ../mail/em-mailer-prefs.c:1156
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1122
 #, fuzzy
 msgid "No Junk plugin available"
 msgstr "אין תיאור זמין."
@@ -12108,27 +12304,28 @@
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2827
+#: ../mail/em-migrate.c:2852
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2871
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
 msgid "_Reply to sender"
 msgstr "ה_שב לשולח"
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "השב ל_רשימה"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:640 ../mail/em-popup.c:874
 msgid "_Add to Address Book"
 msgstr "_הוסף לספר הכתובות"
 
@@ -12153,29 +12350,28 @@
 msgid "No server has been selected"
 msgstr "לא נבחר שרת"
 
-#: ../mail/em-utils.c:121
-#, fuzzy
+#: ../mail/em-utils.c:120
 msgid "_Do not show this message again."
-msgstr "אל תציג הודעה זאת שוב."
+msgstr "אל תציג הודעה זאת _שוב."
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "מסנני הודעה"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "הודעה"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "שמור הודעה..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "הוסף כתובת"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "הודעה מ-%s"
@@ -12190,54 +12386,66 @@
 msgstr "מקור הנייר:"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"Send and Receive Mail\" window height"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"Send and Receive Mail\" window maximize state"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "\"Send and Receive Mail\" window width"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr "Allows evolution to display text part of limited size"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Always request read receipt"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Amount of time in seconds the error should be shown on the status bar."
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Automatic emoticon recognition"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Automatic link recognition"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Check incoming mail being junk"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Citation highlight color"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Citation highlight color."
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Composer Window default height"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Composer Window default width"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Composer load/attach directory"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Compress display of addresses in TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12245,63 +12453,83 @@
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Custom headers to use while checking for junk."
+msgstr "Custom headers to use while checking for junk."
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Default charset in which to compose messages"
 msgstr "Default charset in which to compose messages"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages."
 msgstr "Default charset in which to compose messages."
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to display messages"
 msgstr "Default charset in which to display messages"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages."
 msgstr "Default charset in which to display messages."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default height of the Composer Window."
 msgstr "Default height of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the message window."
 msgstr "Default height of the message window."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the subscribe dialog."
 msgstr "Default height of the subscribe dialog."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default reply style"
 msgstr "Default reply style"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default value for thread expand state"
 msgstr "Default value for thread expand state"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default width of the Composer Window."
 msgstr "Default width of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the message window."
 msgstr "Default width of the message Window."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the subscribe dialog."
 msgstr "Default width of the subscribe dialog."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+msgstr ""
+"Determines whether to look up addresses for junk filtering in local "
+"addressbook only"
+
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Determines whether to lookup in addressbook for sender email"
 msgstr "Determines whether to lookup in addressbook for sender email"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
 "Determines whether to loopup the sender email in addressbook. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -12313,11 +12541,11 @@
 "can be slow, if remote addressbooks (like ldap) are marked for "
 "autocompletion."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Determines whether to use custom headers to check for junk"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -12327,7 +12555,7 @@
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12335,55 +12563,59 @@
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directory for loading/attaching files to composer."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for saving mail component files."
 msgstr "Directory for saving mail component files."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr "Disable or enable ellipsizing of folder names in folder tree"
+
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Draw spelling error indicators on words as you type."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Empty Junk folders on exit"
 msgstr "Empty Junk folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Trash folders on exit"
 msgstr "Empty Trash folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Empty all Junk folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Empty all Trash folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Enable caret mode, so that you can see a cursor when reading mail."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable or disable magic space bar"
 msgstr "Enable or disable magic space bar"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable search folders"
 msgstr "Enable search folders"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders on startup."
 msgstr "Enable search folders on startup."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12395,7 +12627,7 @@
 "bar by just typing the folder name and the selection jumps automatically to "
 "that folder."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12403,27 +12635,27 @@
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable to render message text part of limited size."
 msgstr "Enable to render message text part of limited size."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Hides the per-folder preview and removes the selection"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12431,7 +12663,7 @@
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12439,7 +12671,7 @@
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12449,11 +12681,41 @@
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "It disables/enables the prompt while marking multiple messages."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -12461,7 +12723,7 @@
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -12471,31 +12733,31 @@
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Last time empty junk was run"
 msgstr "Last time empty junk was run"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty trash was run"
 msgstr "Last time empty trash was run"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Level beyond which the message should be logged."
 msgstr "Level beyond which the message should be logged."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colors"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of accepted licenses"
 msgstr "List of accepted licenses"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accounts"
 msgstr "List of accounts"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12503,11 +12765,15 @@
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "List of dictionary language codes used for spell checking."
+msgstr "List of dictionary language codes used for spell checking."
+
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12515,19 +12781,19 @@
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "List of mime types to check for bonobo component viewers"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of protocol names whose license has been accepted."
 msgstr "List of protocol names whose license has been accepted."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Load images for HTML messages over http"
 msgstr "Load images for HTML messages over http"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net. 1 - Load images in messages from contacts. 2 - "
@@ -12537,105 +12803,105 @@
 "load images off the net. 1 - Load images in messages from contacts. 2 - "
 "Always load images off the net."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Message Window default height"
 msgstr "Message Window default height"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default width"
 msgstr "Message Window default width"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimum days between emptying the junk on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum days between emptying the trash on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minimum time between emptying the junk on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the trash on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Number of addresses to display in TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Prompt to check if the user wants to go offline immediately"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prompt when deleting messages in search folder"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Prompt when user tries to open 10 or more messages at once"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12643,71 +12909,71 @@
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recognize emoticons in text and replace them with images."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize links in text and replace them."
 msgstr "Recognize links in text and replace them."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Search for the sender photo in local addressbooks"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Sender email-address column in the message list"
 msgstr "Sender email-address column in the message list"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -12715,63 +12981,59 @@
 "Show the email-address of the sender in a separate column in the message "
 "list."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Show the photo of the sender in the message reading pane."
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "Specifies the header to check for junk."
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Spell check inline"
 msgstr "Spell check inline"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Spell checking color"
+msgstr "Spell checking color"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell checking languages"
+msgstr "Spell checking languages"
+
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Subscribe dialog default height"
 msgstr "Subscribe dialog default height"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Subscribe dialog default width"
 msgstr "Subscribe dialog default width"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Text message part limit"
 msgstr "Text message part limit"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "The default plugin for Junk hook"
 msgstr "The default plugin for Junk hook"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "The last time empty junk was run, in days since the epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "The last time empty trash was run, in days since the epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The terminal font for mail display."
 msgstr "The terminal font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The variable width font for mail display."
 msgstr "The variable width font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -12779,7 +13041,7 @@
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -12787,7 +13049,7 @@
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12797,7 +13059,7 @@
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This key is read only once and reset to false after read. This unselects the "
 "mail in the list and removes the preview for that folder."
@@ -12805,7 +13067,7 @@
 "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."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12817,11 +13079,18 @@
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local addressbook only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "This option would help in improving the speed of fetching."
 msgstr "This option would help in improving the speed of fetching."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12829,7 +13098,7 @@
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12837,7 +13106,7 @@
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -12847,107 +13116,115 @@
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Thread the message list."
 msgstr "Thread the message list."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Thread the message-list"
 msgstr "Thread the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Timeout for marking message as seen"
 msgstr "Timeout for marking message as seen"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Timeout for marking message as seen."
 msgstr "Timeout for marking message as seen."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr "Underline color for misspelled words when using inline spelling."
+
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Use SpamAssassin daemon and client"
 msgstr "Use SpamAssassin daemon and client"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Use only the local spam tests (no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use side-by-side or wide layout"
 msgstr "Use side-by-side or wide layout"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "View/Bcc menu item is checked"
 msgstr "View/Bcc menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "View/Bcc menu item is checked."
 msgstr "View/Bcc menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Cc menu item is checked"
 msgstr "View/Cc menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Cc menu item is checked."
 msgstr "View/Cc menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/From menu item is checked"
 msgstr "View/From menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/From menu item is checked."
 msgstr "View/From menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/PostTo menu item is checked"
 msgstr "View/PostTo menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/PostTo menu item is checked."
 msgstr "View/PostTo menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/ReplyTo menu item is checked"
 msgstr "View/ReplyTo menu item is checked"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/ReplyTo menu item is checked."
 msgstr "View/ReplyTo menu item is checked."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Whether a read receipt request gets added to every message by default."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr "Whether disable ellipsizing feature of folder names in folder tree."
+
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12955,15 +13232,15 @@
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Whether sort threads based on latest message in that thread"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
@@ -12982,7 +13259,7 @@
 
 #: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Destination folder:"
-msgstr ""
+msgstr "תיקיית יעד:"
 
 #: ../mail/importers/evolution-mbox-importer.c:86
 msgid "Select folder to import into"
@@ -12998,17 +13275,17 @@
 
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
-msgstr ""
+msgstr "מייבא תיבת דואר"
 
 #: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
-msgstr ""
+msgstr "מייבא `%s'"
 
 #: ../mail/importers/mail-importer.c:372
 #, c-format
 msgid "Scanning %s"
-msgstr ""
+msgstr "סורק %s"
 
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
@@ -13046,138 +13323,140 @@
 msgid "Add Filter Rule"
 msgstr "הוסף חוק סינון"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:539
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "אחד נבחר, "
 msgstr[1] "%d נבחרו, "
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:543
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d נמחק"
 msgstr[1] "%d נמחק"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d דואר זבל"
 msgstr[1] "%d דואר זבל"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:553
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "טיוטה %d"
 msgstr[1] "%d טיוטות"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:555
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d נשלח"
 msgstr[1] "%d נשלח"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:557
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d לא נשלח"
 msgstr[1] "%d לא נשלח"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:563
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d לא נקראה, "
 msgstr[1] "%d לא נקראו, "
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d סה\"כ"
 msgstr[1] "%d סה\"כ"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:905
 msgid "New Mail Message"
 msgstr "הודאת דואר חדשה"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:906
 msgid "_Mail Message"
 msgstr "_הודעת דואר"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:907
 msgid "Compose a new mail message"
 msgstr "חבר הודעת דואר חדשה"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:913
 msgid "New Mail Folder"
 msgstr "תיקיית דואר חדשה"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:914
 msgid "Mail _Folder"
 msgstr "_תיקיית דואר"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:915
 msgid "Create a new mail folder"
 msgstr "צור תיקיית דואר חדשה"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1062
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1535
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1535
 msgid "Errors"
 msgstr "שגיאות"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1536
 msgid "Warnings and Errors"
 msgstr ""
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1537
 msgid "Debug"
 msgstr ""
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1537
 msgid "Error, Warnings and Debug messages"
 msgstr ""
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1647
 #, fuzzy
 msgid "Debug Logs"
 msgstr "עמוד"
 
-#: ../mail/mail-component.c:1638
+#. Translators: This is the first part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1652
 msgid "Show _errors in the status bar for"
 msgstr ""
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1660
+#, fuzzy
+msgid "second(s)."
 msgstr "שניות."
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1670
 #, fuzzy
 msgid "Log Messages:"
 msgstr "הודעות"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1722
 msgid "Log Level"
 msgstr ""
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
-#, fuzzy
+#: ../mail/mail-component.c:1729 ../widgets/misc/e-dateedit.c:410
 msgid "Time"
-msgstr "כותרת"
+msgstr "שעה"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1736 ../mail/message-list.c:2406
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "הודעות"
@@ -13195,9 +13474,8 @@
 msgstr "SSL אינו נתמך בבנייה זאת של Evolution"
 
 #: ../mail/mail-config.glade.h:5
-#, fuzzy
-msgid "Sender Photograph"
-msgstr "אפשרויות לוח שנה"
+msgid "Sender Photograph"
+msgstr "תמונת השולח"
 
 #: ../mail/mail-config.glade.h:6
 msgid "Sig_natures"
@@ -13221,7 +13499,7 @@
 
 #: ../mail/mail-config.glade.h:12
 msgid "Composing Messages"
-msgstr ""
+msgstr "חיבור הודעות"
 
 #: ../mail/mail-config.glade.h:13
 msgid "Configuration"
@@ -13229,11 +13507,11 @@
 
 #: ../mail/mail-config.glade.h:14
 msgid "Default Behavior"
-msgstr ""
+msgstr "התנהגות ברירת המחדל"
 
 #: ../mail/mail-config.glade.h:15
 msgid "Delete Mail"
-msgstr ""
+msgstr "מחק דואר"
 
 #: ../mail/mail-config.glade.h:16
 #, fuzzy
@@ -13241,13 +13519,12 @@
 msgstr "אבטחה"
 
 #: ../mail/mail-config.glade.h:18
-#, fuzzy
 msgid "Labels"
-msgstr "התרעות"
+msgstr "תוויות"
 
 #: ../mail/mail-config.glade.h:19
 msgid "Loading Images"
-msgstr ""
+msgstr "טוען תמונות"
 
 #: ../mail/mail-config.glade.h:20
 msgid "Message Display"
@@ -13280,75 +13557,74 @@
 msgstr ""
 
 #: ../mail/mail-config.glade.h:27
+msgid "Proxy Settings"
+msgstr "הגדרות מתווך"
+
+#: ../mail/mail-config.glade.h:28
 msgid "Required Information"
 msgstr "מידע הכרחי"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME מאובטח(S/MIME)"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "Security"
 msgstr "אבטחה"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "Sent and Draft Messages"
 msgstr "הודעות שנשלחו וטיוטות"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "Server Configuration"
 msgstr "הגדרת השרת"
 
-#: ../mail/mail-config.glade.h:32
-#, fuzzy
+#: ../mail/mail-config.glade.h:33
 msgid "_Authentication Type"
-msgstr "סוג ההזדהות"
+msgstr "סוג _הזדהות"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "ניהול חשבון"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "הוסף חתימה _חדשה..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "הוסף _תסריט"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always request rea_d receipt"
 msgstr "משתתפים דרושים"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr ""
-
 #: ../mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Automatically insert _emoticon images"
@@ -13367,14 +13643,14 @@
 msgstr "קי_דוד תוים:"
 
 #: ../mail/mail-config.glade.h:50
+msgid "Ch_eck for Supported Types "
+msgstr "ב_דוק סוגי הזדהות נתמכים"
+
+#: ../mail/mail-config.glade.h:51
 #, fuzzy
-msgid "C_heck custom headers for junk"
+msgid "Check cu_stom headers for junk"
 msgstr "בדוק האם דואר נכנס מכיל דואר זבל"
 
-#: ../mail/mail-config.glade.h:51
-msgid "Ch_eck for Supported Types "
-msgstr "ב_דוק סוגי הזדהות נתמכים"
-
 #: ../mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Check incoming _messages for junk"
@@ -13425,7 +13701,7 @@
 
 #: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
-msgstr ""
+msgstr "קידוד _תווים ברירת המחדל:"
 
 #: ../mail/mail-config.glade.h:68
 msgid "Delete junk messages on e_xit"
@@ -13436,16 +13712,16 @@
 msgstr ""
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
+msgid "Do not format text contents in messages if the text si_ze exceeds"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not mar_k messages as junk if sender is in my addressbook"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "אל תצטט את ההודעה המקורית"
+msgid "Do not quote"
+msgstr "אל תצוטט"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13489,7 +13765,6 @@
 msgstr "רו_חב-קבוע:"
 
 #: ../mail/mail-config.glade.h:85
-#, fuzzy
 msgid "Fix_ed width Font:"
 msgstr "גופן _רוחב קבוע:"
 
@@ -13506,80 +13781,92 @@
 msgstr "_שם מלא:"
 
 #: ../mail/mail-config.glade.h:90
-#, fuzzy
 msgid "HTML Messages"
-msgstr "הודעות"
+msgstr "הודעות HTML"
 
 #: ../mail/mail-config.glade.h:91
+#, fuzzy
+msgid "H_TTP Proxy:"
+msgstr "_תא דואר:"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "כותרות"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
-msgstr ""
+msgstr "פנימי"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
-msgstr ""
+msgstr "KB"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "תויות"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "טבלת שפות"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "הגדרות דואר"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "עורך הודעה"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:107
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
 msgid "Or_ganization:"
 msgstr "_ארגון:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:110
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
+msgid "Pass_word:"
+msgstr "_סיסמה:"
+
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:115
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13587,7 +13874,7 @@
 "אנא הכנס מידע על דרך שליחת הדואר. אם אינך בטוח, שאל את מנהל המערכת או את ספק "
 "האינטרנט."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13596,128 +13883,131 @@
 "נא הכנס את שמך וכתובת הדוא\"ל שלך. אין חובה למלא את השדות ה \"לא הכרחיים\","
 "אלא אם אתה מעוניין לכלול מידע זה בהודעות שאתה שולח."
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:117
 msgid "Please select among the following options"
 msgstr "בחר בבקשה מהאפשרויות הבאות"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:118
+msgid "Port:"
+msgstr "שער:"
+
+#: ../mail/mail-config.glade.h:119
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:120
 msgid "Quoted"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
 msgid "Re_member password"
 msgstr "_זכור את הסיסמה"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:122
 msgid "Re_ply-To:"
 msgstr "ה_שב אל:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Remember _password"
 msgstr "זכור _סיסמה"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:125
+msgid "S_OCKS Host:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:126
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:127
 msgid "S_elect..."
 msgstr "ב_חר..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:128
 #, fuzzy
 msgid "S_end message receipts:"
 msgstr "ש_לח הודעה ל..."
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:129
 msgid "S_tandard Font:"
 msgstr "גופן _רגיל:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:131
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:136
 msgid "Sending Mail"
 msgstr "שליחת דואר"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:137
 msgid "Sent _Messages Folder:"
-msgstr ""
+msgstr "תיקיית הודעת ש_נשלחו:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:138
 msgid "Ser_ver requires authentication"
 msgstr "ה_שרת דורש הזדהות"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:139
 msgid "Server _Type: "
 msgstr "_סוג השרת: "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Sig_ning certificate:"
-msgstr "תעודות"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:141
 msgid "Signat_ure:"
 msgstr "ח_תימה:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:142
 msgid "Signatures"
 msgstr "חתימות"
 
-#: ../mail/mail-config.glade.h:139
-#, fuzzy
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures Table"
-msgstr "חתימות"
+msgstr "טבלת חתימות"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:144
 msgid "Spell Checking"
 msgstr "בדיקת איות"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:145
 msgid "T_ype: "
 msgstr "_סוג: "
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:146
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "This option will be overridden if a match for custom junk headers is found."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13725,16 +14015,25 @@
 "הקלד את שם החשבון.\n"
 "למשל \"עבודה\" או \"אישי\""
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:153
+msgid "Us_ername:"
+msgstr "שם _משתמש:"
+
+#: ../mail/mail-config.glade.h:154
+#, fuzzy
+msgid "Use Authe_ntication"
+msgstr "הזדהות"
+
+#: ../mail/mail-config.glade.h:155 ../plugins/caldav/caldav-source.c:282
 #: ../plugins/google-account-setup/google-source.c:358
 msgid "User_name:"
 msgstr "שם משתמש:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:156
 msgid "V_ariable-width:"
 msgstr "_רוחב-משתנה:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:157
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13744,101 +14043,128 @@
 "\n"
 "לחץ \"קדימה\" להתחיל. "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:160
 msgid "_Add Signature"
 msgstr "הו_סף חתימה"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:161
 msgid "_Always load images from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_Automatic proxy configuration URL:"
+msgstr "Automatic smiley recognition"
+
+#: ../mail/mail-config.glade.h:163
 msgid "_Default junk plugin:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:164
+msgid "_Direct connection to the Internet"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:165
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:167
 msgid "_Forward style:"
-msgstr ""
+msgstr "_סגנון העברה:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:168
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Load images in messages from contacts"
 msgstr "Load images for HTML messages over http"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:170
+#, fuzzy
+msgid "_Lookup in local addressbook only"
+msgstr "ספר הכתובות של אבולוציה"
+
+#: ../mail/mail-config.glade.h:171
 msgid "_Make this my default account"
 msgstr "ה_פוך חשבון זה לחשבון ברירת המחדל"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Manual proxy configuration:"
+msgstr "הגדרות דואר"
+
+#: ../mail/mail-config.glade.h:173
 msgid "_Mark messages as read after"
 msgstr "_סמן הודעות כאילו שנ_קראו לאחר"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:175
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:176
 msgid "_Path:"
 msgstr "_נתיב:"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:177
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:179
 msgid "_Reply style:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:180
 msgid "_Script:"
+msgstr "_תסריט:"
+
+#: ../mail/mail-config.glade.h:181
+msgid "_Secure HTTP Proxy:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
 msgid "_Select..."
 msgstr "ב_חר..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:185
 msgid "_Show image animations"
 msgstr "הצג _אנימציות"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:186
 msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:187
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:188
 msgid "_Use Secure Connection:"
 msgstr "השתמש ב_תקשורת מאובטחת:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:189
+msgid "_Use system defaults"
+msgstr "הש_תמש בברירת מחדל"
+
+#: ../mail/mail-config.glade.h:190
 msgid "_Use the same fonts as other applications"
 msgstr "השתמש באותם _גופנים כמו יישומים אחרים"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:191
 msgid "addresses"
 msgstr "כתובות"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:192
 msgid "color"
 msgstr "צבע"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:193
 msgid "description"
 msgstr "תיאור"
 
@@ -13868,7 +14194,7 @@
 
 #: ../mail/mail-dialogs.glade.h:7
 msgid "All local folders"
-msgstr ""
+msgstr "כל התיקיות המקומיות"
 
 #: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
@@ -13922,9 +14248,8 @@
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:23
-#, fuzzy
 msgid "_Accept License"
-msgstr "_פעולות"
+msgstr "_הסכם לרישיון"
 
 #: ../mail/mail-dialogs.glade.h:24
 msgid "_Due By:"
@@ -13938,7 +14263,7 @@
 msgid "_Tick this to accept the license agreement"
 msgstr ""
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:831
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -13970,9 +14295,8 @@
 msgstr ""
 
 #: ../mail/mail-ops.c:724
-#, fuzzy
 msgid "Sending message"
-msgstr "_שלח את ההודעה"
+msgstr "שולח הודעה"
 
 #: ../mail/mail-ops.c:734
 #, c-format
@@ -13984,11 +14308,11 @@
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:711
 msgid "Canceled."
 msgstr "בוטל."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:713
 msgid "Complete."
 msgstr "הסתיים."
 
@@ -14016,129 +14340,134 @@
 msgstr "פותח את התיקייה %s"
 
 #: ../mail/mail-ops.c:1270
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "עורך אנשי הקשר"
+
+#: ../mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1410
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1499
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1562
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1563
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1617
 msgid "Refreshing folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1654 ../mail/mail-ops.c:1704
 msgid "Expunging folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1701
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1702
 msgid "Local Folders"
-msgstr ""
+msgstr "תיקיות מקומיות"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1783
 #, c-format
 msgid "Retrieving message %s"
 msgstr "מקבל הודעה %s"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1890
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "מקבל הודעה %d"
 msgstr[1] "מקבל %d הודעות"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1975
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "שומר הודעה %d"
 msgstr[1] "שומר %d הודעות"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2053
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2125
 msgid "Saving attachment"
 msgstr "שומר תצריף"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2143 ../mail/mail-ops.c:2151
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2166
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2312
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "מתנתק מ %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2312
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "מתחבר מחדש ל %s"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2408
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr ""
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2494
 msgid "Checking Service"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:194
 msgid "Canceling..."
 msgstr "מבטל..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:397
 msgid "Send & Receive Mail"
 msgstr "שלח וקבל דואר"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:408
 msgid "Cancel _All"
 msgstr "בטל ה_כל"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:517
 msgid "Updating..."
 msgstr "מעדכן..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:517 ../mail/mail-send-recv.c:590
 msgid "Waiting..."
 msgstr "ממתין..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:817
 #, c-format
 msgid "Checking for new mail"
 msgstr "בדיקת דואר חדש"
@@ -14166,18 +14495,25 @@
 msgid "User canceled operation."
 msgstr "המשתמש ביטל את הפעולה."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "ערוך את החתימה"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "שמור ו_סגור"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "הכנס שם לחתימה זו."
+#: ../mail/mail-signature-editor.c:208 ../ui/evolution-editor.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_קובץ"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "שם:"
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "ערוך חתימה"
 
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "_שם חתימה:"
+
 #: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
@@ -14226,18 +14562,16 @@
 msgstr "תיקיית חיפוש חדשה"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
@@ -14245,14 +14579,14 @@
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:8
@@ -14291,7 +14625,7 @@
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr "האם לשלוח את ההודעה בתצורת HTML?"
 
 #: ../mail/mail.error.xml.h:15
@@ -14307,11 +14641,11 @@
 msgstr "האם לשלוח את ההודעה ללא נושא?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:21
@@ -14319,66 +14653,72 @@
 msgstr "חתימה ריקה"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "צור תיקיית _חיפוש"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "צור תיקייה"
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "לא ניתן להציג תיקיות."
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "לא ניתן להציג תיקיות."
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr ""
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "לא ניתן לפתוח את המקור"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "לא ניתן לפתוח את המקור"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "לא ניתן להזיז איש קשר."
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:37
@@ -14386,149 +14726,153 @@
 msgstr ""
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr ""
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr "לא ניתן לפתוח קובץ"
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "בדיקת דואר זבל נכשלה"
+
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr ""
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr ""
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "נמחק: "
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr ""
+msgid "Delete account?"
+msgstr "למחוק את החשבון?"
 
 #: ../mail/mail.error.xml.h:46
 #, fuzzy
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
+
+#: ../mail/mail.error.xml.h:47
+#, fuzzy
 msgid "Delete messages in Search Folder?"
 msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "להתעלם משינויים?"
 
-#: ../mail/mail.error.xml.h:48
-#, fuzzy
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
-msgstr "לא ניתן לפתוח קובץ"
+msgstr "אל _תמחק"
 
-#: ../mail/mail.error.xml.h:49
-#, fuzzy
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
-msgstr "לא ניתן לפתוח קובץ"
+msgstr "אל תמחק"
 
-#: ../mail/mail.error.xml.h:50
-#, fuzzy
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
-msgstr "כבה"
+msgstr "אל _תכבה"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Do you want the operation to be performed also in the subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 #, fuzzy
 msgid "Do you want to mark all messages as read?"
 msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "Do you wish to save your changes?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:56
 msgid "Enter password."
 msgstr "הכנס סיסמה."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:57
 msgid "Error loading filter definitions."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "Error while performing operation."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "Error while {0}."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid "File exists but is not a regular file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "התעלם"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "מסנני הודעה עודענו אוטומטית"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14536,110 +14880,118 @@
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Mark all messages as read"
 msgstr "סמן את כל ההודעות כאילו נקראו"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 #, fuzzy
 msgid "Mark all messages in this folder and subfolders as read?"
 msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "Missing folder."
-msgstr ""
+msgstr "תיקייה חסרה."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "No sources selected."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:78
-#, fuzzy
+#: ../mail/mail.error.xml.h:79
 msgid "Only on _Current Folder"
-msgstr "תיקייה נוכחית"
+msgstr "בתיקייה ה_נוכחית בלבד"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "Please check your account settings and try again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please enable the account or send using another account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 #, fuzzy
 msgid "Please provide an unique name to identify this signature."
 msgstr "הכנס שם לחתימה זו."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Please wait."
 msgstr "נא להמתין"
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr ""
-
 #: ../mail/mail.error.xml.h:88
-msgid "Querying server"
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:89
-msgid "Querying server for a list of supported authentication mechanisms."
+msgid "Querying server"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:90
-msgid "Read receipt requested."
+msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+msgid "Read receipt requested."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:92
-msgid "Search Folders automatically updated."
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:93
 #, fuzzy
+msgid "Report Junk Failed"
+msgstr "יבא קובץ"
+
+#: ../mail/mail.error.xml.h:94
+msgid "Report Not Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:95
+msgid "Search Folders automatically updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:96
+#, fuzzy
 msgid "Send Receipt"
 msgstr "שלח / קבל"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Signature Already Exists"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid "Synchronize"
-msgstr ""
+msgstr "סנכרן"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14649,144 +15001,144 @@
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-" &quot;{1}&quot;\n"
+" \"{1}\"\n"
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-" &quot;{1}&quot;\n"
+" \"{1}\"\n"
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
 msgid "The script file must exist and be executable."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 #, fuzzy
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
 msgid "Unable to connect to the GroupWise server."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 msgid "Unable to read license file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:125
 msgid "Use _Default"
 msgstr "הש_תמש בברירת מחדל"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid "Use default drafts folder?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:133
 msgid "You must name this Search Folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
 msgid "You must specify a folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+#: ../mail/mail.error.xml.h:137
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:138
 msgid "_Append"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
 msgid "_Discard changes"
-msgstr ""
+msgstr "ה_תעלם משינויים"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
 #, fuzzy
 msgid "_Do not Synchronize"
 msgstr "אל תסיר"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:142
 msgid "_Expunge"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:143
 msgid "_Open Messages"
 msgstr "_פתח הודעות"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:146
 #, fuzzy
 msgid "on Current Folder and _Subfolders"
 msgstr "צור תיקייה"
@@ -14854,7 +15206,7 @@
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3849
+#: ../mail/message-list.c:3838
 msgid "Generating message list"
 msgstr "יוצר רשימת הודעות"
 
@@ -14879,9 +15231,8 @@
 msgstr "התקבל"
 
 #: ../mail/message-list.etspec.h:15
-#, fuzzy
 msgid "Sent Messages"
-msgstr "_פתח הודעה"
+msgstr "הודעות שנשלחו"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
@@ -14982,7 +15333,7 @@
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:475
 msgid "Keywords"
-msgstr ""
+msgstr "מילות מפתח"
 
 #: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
 #, fuzzy
@@ -15008,14 +15359,12 @@
 msgstr ""
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-#, fuzzy
 msgid "Message has no attachments"
-msgstr "הודעות עם תצריף"
+msgstr "להודעה אין תצריפים"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-#, fuzzy
-msgid "_Continue Editing"
-msgstr "המשך"
+msgid "_Edit Message"
+msgstr "_ערוך הודעה"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -15067,7 +15416,7 @@
 
 #: ../plugins/backup-restore/backup-restore.c:254
 msgid "Choose a file to restore"
-msgstr ""
+msgstr "בחר קובץ לשחזור"
 
 #: ../plugins/backup-restore/backup.c:40
 #, fuzzy
@@ -15086,7 +15435,7 @@
 
 #: ../plugins/backup-restore/backup.c:46
 msgid "Restart Evolution"
-msgstr ""
+msgstr "הפעל מחדש את Evolution"
 
 #: ../plugins/backup-restore/backup.c:48
 msgid "With Graphical User Interface"
@@ -15095,7 +15444,7 @@
 #: ../plugins/backup-restore/backup.c:69
 #: ../plugins/backup-restore/backup.c:110
 msgid "Shutting down Evolution"
-msgstr ""
+msgstr "מכבה את Evolution"
 
 #: ../plugins/backup-restore/backup.c:74
 msgid "Backing Evolution accounts and settings"
@@ -15106,9 +15455,8 @@
 msgstr ""
 
 #: ../plugins/backup-restore/backup.c:88
-#, fuzzy
 msgid "Backup complete"
-msgstr "% השלמה"
+msgstr "הגיבוי הסתיים"
 
 #: ../plugins/backup-restore/backup.c:93
 #: ../plugins/backup-restore/backup.c:136
@@ -15125,9 +15473,8 @@
 msgstr ""
 
 #: ../plugins/backup-restore/backup.c:125
-#, fuzzy
 msgid "Loading Evolution settings"
-msgstr "הגדרות Evolution"
+msgstr "טוען את הגדרות Evolution"
 
 #: ../plugins/backup-restore/backup.c:129
 msgid "Removing temporary backup files"
@@ -15145,14 +15492,12 @@
 
 #. Backup / Restore only can have GUI. We should restrict the rest
 #: ../plugins/backup-restore/backup.c:270
-#, fuzzy
 msgid "Evolution Backup"
-msgstr "אזהרת Evolution"
+msgstr "גיבוי Evolution"
 
 #: ../plugins/backup-restore/backup.c:270
-#, fuzzy
 msgid "Evolution Restore"
-msgstr "תקלת Evolution"
+msgstr "שחזור Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
@@ -15206,9 +15551,8 @@
 msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-#, fuzzy
 msgid "R_estore Settings..."
-msgstr "הגדרות מחשב כף יד..."
+msgstr "הגדרות _שחזור..."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "_Backup Settings..."
@@ -15216,9 +15560,8 @@
 
 #: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-#, fuzzy
 msgid "Automatic Contacts"
-msgstr "הוסף לאנשי הקשר"
+msgstr "אנשי קשר אוטומטיים"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:565
@@ -15263,7 +15606,28 @@
 msgid "BBDB"
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 #, fuzzy
 msgid "Convert message text to _Unicode"
 msgstr "Convert mail text to Unicode"
@@ -15315,7 +15679,7 @@
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV sources"
-msgstr ""
+msgstr "מקורות CalDAV"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 #, fuzzy
@@ -15329,22 +15693,20 @@
 #: ../plugins/calendar-http/calendar-http.c:273
 #: ../plugins/calendar-weather/calendar-weather.c:546
 #: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
+msgid "Re_fresh:"
 msgstr "_רענן:"
 
 #: ../plugins/calendar-http/calendar-http.c:341
-#, fuzzy
 msgid "_Secure connection"
-msgstr "השתמש ב_תקשורת מאובטחת:"
+msgstr "חיבור _מאובטח"
 
 #: ../plugins/calendar-http/calendar-http.c:406
 msgid "Userna_me:"
 msgstr "שם משתמש:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-#, fuzzy
 msgid "HTTP Calendars"
-msgstr "לוחות שנה"
+msgstr "יומני HTTP"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Provides core functionality for webcal and http calendars."
@@ -15431,11 +15793,11 @@
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
-msgstr ""
+msgstr "לקוח דואר ברירת המחדל "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr ""
+msgstr "הם ברצונך להפוך את Evolution ללקוח דואר ברירת המחדל?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
 #: ../shell/main.c:690
@@ -15443,15 +15805,29 @@
 msgstr "Evolution"
 
 #: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
 #, fuzzy
-msgid "Mark as _default folder"
+msgid "Mark as _default address book"
 msgstr "_סמן כנקרא"
 
+#: ../plugins/default-source/default-source.c:102
+#, fuzzy
+msgid "Mark as _default calendar"
+msgstr "_סמן כנקרא"
+
+#: ../plugins/default-source/default-source.c:103
+#, fuzzy
+msgid "Mark as _default task list"
+msgstr "_סמן כנקרא"
+
+#: ../plugins/default-source/default-source.c:104
+#, fuzzy
+msgid "Mark as _default memo list"
+msgstr "_סמן כנקרא"
+
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 #, fuzzy
 msgid "Default Sources"
-msgstr "ברירת מחדל"
+msgstr "מקורות ברירת המחדל"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
@@ -15476,122 +15852,118 @@
 msgstr "_משתמש:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:62
 msgid "Secure Password"
-msgstr "הכנס סיסמה"
+msgstr "סיסמה מאובטחת"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:65
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:73
 #, fuzzy
 msgid "Plaintext Password"
 msgstr "הכנס סיסמה"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:75
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:256
 msgid "Out Of Office"
 msgstr "מחוץ למשרד"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am out of the office"
-msgstr ""
+msgstr "אני מחוץ למשרד"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am in the office"
-msgstr ""
+msgstr "אני במשרד"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:327
 #, fuzzy
 msgid "Change the password for Exchange account"
 msgstr "הכנס סיסמה עבור %s"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "החלף סיסמה"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:334
 msgid "Manage the delegate settings for Exchange account"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:336
 #, fuzzy
 msgid "Delegation Assistant"
 msgstr "אשף ההגדרות של Evolution"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:348
 msgid "Miscelleneous"
 msgstr "כללי"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:358
 msgid "View the size of all Exchange folders"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:360
 msgid "Folders Size"
-msgstr "תיקיות וירטואליות"
+msgstr "גודל תיקיות"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:367
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-#, fuzzy
 msgid "Exchange Settings"
-msgstr "הגדרות Evolution"
+msgstr "הגדרות Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:624
 msgid "_OWA URL:"
-msgstr "_כתובת:"
+msgstr "_כתובת OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:650
 #, fuzzy
 msgid "A_uthenticate"
 msgstr "ההזדהות נכשלה"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:853
 #, fuzzy
 msgid "_Authentication Type"
 msgstr "ההזדהות נכשלה"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:867
 #, fuzzy
 msgid "Ch_eck for Supported Types"
 msgstr "ב_דוק סוגי הזדהות נתמכים"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:979
 #: ../plugins/exchange-operations/exchange-contacts.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "%s KB"
-msgstr "%ld ק\"ב"
+msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:981
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
-msgstr ""
+msgstr "0 KB"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:191
 #: ../plugins/exchange-operations/exchange-contacts.c:165
@@ -15637,9 +16009,8 @@
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:164
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#, fuzzy
 msgid "Custom"
-msgstr "גזור"
+msgstr "ברירת מחדל"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:194
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
@@ -15663,9 +16034,9 @@
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:263
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Permissions for %s"
-msgstr "אין הרשאות"
+msgstr "הרשאות עבור %s"
 
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
@@ -15760,9 +16131,8 @@
 msgstr "מחק"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
-#, fuzzy
 msgid "Permissions for"
-msgstr "אין הרשאות"
+msgstr "הרשאות עבור"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
@@ -15789,7 +16159,7 @@
 msgid "_Tasks:"
 msgstr "_משימות:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:60
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "הרשאות..."
@@ -15799,11 +16169,15 @@
 msgstr "שם תיקייה"
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:137
-#, fuzzy
 msgid "Folder Size"
-msgstr "תיקייה"
+msgstr "גודל תיקייה"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
+msgid "User"
+msgstr "משתמש"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:315
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr ""
@@ -15844,7 +16218,7 @@
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "Status:"
-msgstr ""
+msgstr "מצב::"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:6
 msgid ""
@@ -15895,6 +16269,9 @@
 msgstr "הוסף משתמש:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-send-options.c:417
+#: ../plugins/groupwise-features/proxy.c:946
+#: ../plugins/groupwise-features/share-folder.c:726
 msgid "Add User"
 msgstr "הוסף משתמש"
 
@@ -15903,24 +16280,20 @@
 msgstr "הרשאות"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-#, fuzzy
 msgid "Cannot Delete"
-msgstr "לא ניתן לפתוח קובץ"
+msgstr "לא ניתן למחוק"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-#, fuzzy
 msgid "Cannot Edit"
-msgstr "עורך אנשי הקשר"
+msgstr "לא ניתן לערוך"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-#, fuzzy
 msgid "Create items"
-msgstr "צור"
+msgstr "צור פריטים"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-#, fuzzy
 msgid "Create subfolders"
-msgstr "צור תיקייה"
+msgstr "צור תת-תיקיות"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Delete Any Items"
@@ -15962,9 +16335,8 @@
 msgstr "תפקיד: "
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-#, fuzzy
 msgid "Message Settings"
-msgstr "הודעות מידיות"
+msgstr "הגדרות הודעה"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:2
 #, fuzzy
@@ -15972,9 +16344,9 @@
 msgstr "אפשרויות"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-#, fuzzy
 msgid "Exchange - Send Options"
-msgstr "הגדרות Evolution"
+msgstr ""
+"‏Exchange - אפשרויות שליחה"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:4
 msgid "I_mportance: "
@@ -16014,10 +16386,9 @@
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:15
 msgid "_Sensitivity: "
-msgstr ""
+msgstr "_רגישות:"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-#, fuzzy
 msgid "_User"
 msgstr "_משתמש:"
 
@@ -16057,14 +16428,12 @@
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-#, fuzzy
 msgid "Cannot display folders."
-msgstr "מעתיק את התיקייה %s"
+msgstr "לא ניתן להציג תיקיות."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-#, fuzzy
 msgid "Cannot perform the operation."
-msgstr "המשתמש ביטל את הפעולה."
+msgstr "לא ניתן לבצע את הפעולה."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid ""
@@ -16078,9 +16447,8 @@
 msgstr "ניסיון ההזדהות נכשל.\n"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-#, fuzzy
 msgid "Could not change password."
-msgstr "לא ניתן לבטל"
+msgstr "לא ניתן לשנות את הסיסמה."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid ""
@@ -16232,9 +16600,8 @@
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-#, fuzzy
 msgid "Please select a user."
-msgstr "אנא בחר תמונה בעבור איש קשר זה"
+msgstr "נא לבחור משתמש."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Server rejected password because it is too weak."
@@ -16292,9 +16659,8 @@
 msgstr "סוג לא ידוע"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#, fuzzy
 msgid "Unsupported operation"
-msgstr "המשתמש ביטל את הפעולה."
+msgstr "פעולה לא ניתמכת."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You are nearing your quota available for storing mail on this server."
@@ -16360,6 +16726,15 @@
 msgid "Check folder permissions"
 msgstr ""
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#, fuzzy
+msgid "Default External Editor"
+msgstr "עורך אנשי הקשר"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
@@ -16372,6 +16747,27 @@
 msgid "External Editor"
 msgstr "עורך אנשי הקשר"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#, fuzzy
+msgid "Cannot create Temporary File"
+msgstr "צור איש קשר חדש"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 #, fuzzy
 msgid "Compose in External Editor"
@@ -16381,14 +16777,23 @@
 msgid "Compose messages using an external editor"
 msgstr ""
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:91
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:92
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr ""
 
-#: ../plugins/face/face.c:67
-#, fuzzy
+#: ../plugins/face/face.c:68
 msgid "PNG files"
-msgstr "כל הקבצים"
+msgstr "קבצי PNG"
 
 #: ../plugins/face/org-gnome-face-ui.xml.h:1
 #, fuzzy
@@ -16403,9 +16808,8 @@
 msgstr ""
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
-#, fuzzy
 msgid "Face"
-msgstr "צרפת"
+msgstr "פנים"
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
@@ -16426,13 +16830,12 @@
 
 #: ../plugins/google-account-setup/google-source.c:71
 #: ../plugins/google-account-setup/google-source.c:78
-#, fuzzy
 msgid "Google"
-msgstr "תפקיד"
+msgstr "Google"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "A plugin to setup google calendar."
-msgstr ""
+msgstr "תוסף להגדרת יומן google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 #, fuzzy
@@ -16488,9 +16891,8 @@
 msgstr "הגדרות דואר זבל..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-#, fuzzy
 msgid "Junk List:"
-msgstr "רשימת מטלות"
+msgstr "רשימת דואר זבל"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
 msgid "Email:"
@@ -16506,9 +16908,8 @@
 msgstr "_אפשר"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
-#, fuzzy
 msgid "_Junk List"
-msgstr "מבחן דואר זבל"
+msgstr "_רשימת דואר זבל"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
 msgid "Message retracted successfully"
@@ -16536,6 +16937,74 @@
 msgid "Groupwise Features"
 msgstr ""
 
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#, fuzzy
+msgid "Message retract failed"
+msgstr "ההודעה מכילה"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#, fuzzy
+msgid "The server did not allow the selected message to be retracted."
+msgstr "פתח את ההודעה שנבחרה בחלון חדש"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#, fuzzy
+msgid "Invalid user"
+msgstr "חתימה בלתי חוקית"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "לא ניתן לפתוח קובץ"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+msgid "Specify User"
+msgstr "ציין משתמש"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+#, fuzzy
+msgid "Account Already Exists"
+msgstr "עורך חשבונות"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
+"try again."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#, fuzzy
+msgid "What would you like to {0}?"
+msgstr "האם ברצונך לשמור את השינויים שלך?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#, fuzzy
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "לא ניתן לפתוח קובץ"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You have to specify a user name whom you want to add to the list"
+msgstr ""
+
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr ""
@@ -16549,9 +17018,8 @@
 msgstr ""
 
 #: ../plugins/groupwise-features/properties.glade.h:3
-#, fuzzy
 msgid "Con_tacts..."
-msgstr "אנשי קשר..."
+msgstr "אנשי _קשר..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
 #: ../widgets/table/e-table-click-to-add.c:517
@@ -16590,9 +17058,8 @@
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
-#, fuzzy
 msgid "Add/Edit"
-msgstr "_עריכה"
+msgstr "הוסף/ערוך"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
 msgid "Con_tacts"
@@ -16620,9 +17087,8 @@
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#, fuzzy
 msgid "_Write"
-msgstr "הד_פס"
+msgstr "_כתוב"
 
 #. To Translators: strip the part in front of the | and the | itself
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
@@ -16632,7 +17098,7 @@
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
-msgstr ""
+msgstr "מתווך"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "Account Name"
@@ -16658,11 +17124,11 @@
 msgid "_Proxy Login..."
 msgstr "ה_דפס..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:708
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
@@ -16683,6 +17149,11 @@
 msgid "Sharing"
 msgstr "משתף"
 
+#: ../plugins/groupwise-features/share-folder.c:544
+#, fuzzy
+msgid "Custom Notification"
+msgstr "התרעות דואר"
+
 #: ../plugins/groupwise-features/share-folder.c:766
 msgid "Add "
 msgstr "הוסף "
@@ -16707,9 +17178,8 @@
 msgstr "מאת:"
 
 #: ../plugins/groupwise-features/status-track.c:148
-#, fuzzy
 msgid "Creation date:"
-msgstr "תאריך יצירה :"
+msgstr "תאריך יצירה :"
 
 #: ../plugins/groupwise-features/status-track.c:187
 msgid "Recipient: "
@@ -16721,32 +17191,28 @@
 msgstr "_מחק"
 
 #: ../plugins/groupwise-features/status-track.c:200
-#, fuzzy
 msgid "Opened: "
-msgstr "פתח"
+msgstr "נפתח: "
 
 #: ../plugins/groupwise-features/status-track.c:205
-#, fuzzy
 msgid "Accepted: "
-msgstr "קבל"
+msgstr "התקבל: "
 
 #: ../plugins/groupwise-features/status-track.c:210
 msgid "Deleted: "
 msgstr "נמחק: "
 
 #: ../plugins/groupwise-features/status-track.c:215
-#, fuzzy
 msgid "Declined: "
-msgstr "סרב"
+msgstr "סורב: "
 
 #: ../plugins/groupwise-features/status-track.c:220
 msgid "Completed: "
 msgstr "הסתיים: "
 
 #: ../plugins/groupwise-features/status-track.c:225
-#, fuzzy
 msgid "Undelivered: "
-msgstr "_מחק"
+msgstr "לא נימסר: "
 
 #: ../plugins/groupwise-features/status-track.c:249
 #, fuzzy
@@ -16767,9 +17233,8 @@
 msgstr "כותרות"
 
 #: ../plugins/imap-features/imap-headers.c:335
-#, fuzzy
 msgid "IMAP Headers"
-msgstr "כותרות"
+msgstr "כותרות IMAP"
 
 #: ../plugins/imap-features/imap-headers.glade.h:1
 #, fuzzy
@@ -16777,9 +17242,8 @@
 msgstr "מוזמנים"
 
 #: ../plugins/imap-features/imap-headers.glade.h:2
-#, fuzzy
 msgid "IMAP Headers"
-msgstr "התרעות"
+msgstr "כותרות IMAP"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
 msgid "Basic and _Mailing List Headers (Default)"
@@ -16817,31 +17281,31 @@
 msgid "IMAP Features"
 msgstr ""
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 #, fuzzy
 msgid "_Import to Calendar"
 msgstr "לוח שנה"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 #, fuzzy
 msgid "_Import to Tasks"
 msgstr "_יבא"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 #, fuzzy
 msgid "Import ICS"
 msgstr "_יבא"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 #, fuzzy
 msgid "Select Task List"
 msgstr "משימות"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "בחר לוח שנה"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
+#: ../plugins/import-ics-attachments/icsimporter.c:259
 #: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_יבא"
@@ -16876,8 +17340,8 @@
 "connected to the system or it is not powered on."
 msgstr ""
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:123
+#: ../plugins/save-calendar/ical-format.c:167
 msgid "iCalendar format (.ics)"
 msgstr ""
 
@@ -16929,149 +17393,149 @@
 msgid "Searching for an existing version of this appointment"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:946
 msgid "Unable to parse item"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1004
 #, c-format
 msgid "Unable to send item to calendar '%s'. %s"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1016
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1020
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1030
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1124
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 msgid "Sent a cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1219
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1246
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1250
 msgid "Attendee status updated"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 #, fuzzy
 msgid "Meeting information sent"
 msgstr "בחר פעולה"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 #, fuzzy
 msgid "Task information sent"
 msgstr "איש הקשר לא נמצא"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1282
 #, fuzzy
 msgid "Memo information sent"
 msgstr "איש הקשר לא נמצא"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1291
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1294
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1372
+#: ../plugins/itip-formatter/itip-formatter.c:1387
 msgid "The calendar attached is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1373
+#: ../plugins/itip-formatter/itip-formatter.c:1388
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1423
+#: ../plugins/itip-formatter/itip-formatter.c:1441
+#: ../plugins/itip-formatter/itip-formatter.c:1523
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1424
+#: ../plugins/itip-formatter/itip-formatter.c:1442
+#: ../plugins/itip-formatter/itip-formatter.c:1524
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1454
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This meeting recurs"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This task recurs"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2157
 msgid "This memo recurs"
 msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2372
 msgid "_Delete message after acting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2382
+#: ../plugins/itip-formatter/itip-formatter.c:2414
 msgid "Conflict Search"
 msgstr ""
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2397
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
@@ -17463,9 +17927,8 @@
 msgstr "ק_בל"
 
 #: ../plugins/itip-formatter/itip-view.c:831
-#, fuzzy
 msgid "_Decline all"
-msgstr "מ_חק הכל"
+msgstr "_סרב להכל"
 
 #: ../plugins/itip-formatter/itip-view.c:832
 #, fuzzy
@@ -17476,20 +17939,17 @@
 #: ../plugins/itip-formatter/itip-view.c:838
 #: ../plugins/itip-formatter/itip-view.c:855
 #: ../plugins/itip-formatter/itip-view.c:860
-#, fuzzy
 msgid "_Tentative"
-msgstr "ההזדהות נכשלה"
+msgstr "_גמיש"
 
 #: ../plugins/itip-formatter/itip-view.c:833
-#, fuzzy
 msgid "_Accept all"
-msgstr "קבל"
+msgstr "קבל ה_כל"
 
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:844
-#, fuzzy
 msgid "_Send Information"
-msgstr "מידע על השרת"
+msgstr "_שלח מידע"
 
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:848
@@ -17497,21 +17957,18 @@
 msgstr ""
 
 #: ../plugins/itip-formatter/itip-view.c:851
-#, fuzzy
 msgid "_Update"
-msgstr "ה_דבק"
+msgstr "_עדכן"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:1012
-#, fuzzy
 msgid "Start time:"
-msgstr "מתחיל:"
+msgstr "שעת התחלה:"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:1021
-#, fuzzy
 msgid "End time:"
-msgstr "כל פעם"
+msgstr "שעת סיום:"
 
 #. Comment
 #: ../plugins/itip-formatter/itip-view.c:1037
@@ -17538,9 +17995,8 @@
 msgstr "כותרת ההודעה"
 
 #: ../plugins/itip-formatter/itip-view.c:1852
-#, fuzzy
 msgid "_Tasks :"
-msgstr "_משימות"
+msgstr "_משימות :"
 
 #: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
@@ -17675,9 +18131,8 @@
 
 #: ../plugins/mail-notification/mail-notification.c:380
 #: ../plugins/mail-notification/mail-notification.c:385
-#, fuzzy
 msgid "New email"
-msgstr "תזכורת חדשה"
+msgstr "דוא\"ל חדש"
 
 #: ../plugins/mail-notification/mail-notification.c:440
 #, fuzzy
@@ -17718,7 +18173,7 @@
 
 #: ../plugins/mail-notification/mail-notification.c:646
 msgid "Pl_ay"
-msgstr ""
+msgstr "נ_גן"
 
 #: ../plugins/mail-notification/mail-notification.c:785
 msgid "Notify new messages for _Inbox only"
@@ -17731,9 +18186,8 @@
 msgstr ""
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-#, fuzzy
 msgid "Mail Notification"
-msgstr "הגדרות דואר"
+msgstr "התרעות דואר"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
@@ -17797,15 +18251,13 @@
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-#, fuzzy
 msgid "Mailing List Actions"
-msgstr "רשימת תפוצה"
+msgstr "פעולות רשימת תפוצה"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-#, fuzzy
 msgid "Mailing _List"
-msgstr "רשימת תפוצה"
+msgstr "רשימת _תפוצה"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
@@ -17819,16 +18271,15 @@
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 msgid "_Subscribe to list"
-msgstr ""
+msgstr "ה_רשם לרשימה"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
 msgid "_Un-subscribe to list"
-msgstr ""
+msgstr "_בטל רישום לרשימה"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
-#, fuzzy
 msgid "Action not available"
-msgstr "TLS לא זמין"
+msgstr "פעולה לא זמינה"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
@@ -18006,9 +18457,8 @@
 msgstr "_תוספים"
 
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#, fuzzy
 msgid "Author(s)"
-msgstr "שעה (שעות)"
+msgstr "יוצר(ים)"
 
 #: ../plugins/plugin-manager/plugin-manager.c:58
 #: ../widgets/table/e-table-config.glade.h:6
@@ -18025,16 +18475,15 @@
 msgstr "החלף"
 
 #: ../plugins/plugin-manager/plugin-manager.c:261
-#, fuzzy
 msgid "Configuration"
-msgstr "הגדרות דואר"
+msgstr "הגדרות"
 
 #: ../plugins/plugin-manager/plugin-manager.c:277
 msgid "There is no configuration option for this plugin."
 msgstr ""
 
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:338
+#: ../plugins/plugin-manager/plugin-manager.c:400
 msgid "Plugin"
 msgstr "תוסף"
 
@@ -18056,42 +18505,22 @@
 msgid "Prefer plain-text"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:158
 msgid "Show HTML if present"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:159
 msgid "Prefer PLAIN"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:160
 msgid "Only ever show PLAIN"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
-#, fuzzy
+#: ../plugins/prefer-plain/prefer-plain.c:203
 msgid "HTML _Mode"
-msgstr "דואר HTML"
+msgstr "מצב _HTML"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr ""
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "הדפס הודעה"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "_תצוגה לפני הדפסה"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "הדפס את ההודעה"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 #, fuzzy
 msgid "Evolution Profiler"
@@ -18119,13 +18548,7 @@
 msgid "_Publish Calendar Information"
 msgstr "מידע אישי"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "הכנס את הסיסמה עבור `%s'"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr ""
 
@@ -18204,21 +18627,58 @@
 msgstr "_שם משתמש:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
-#, fuzzy
 msgid ""
 "iCal\n"
 "Free/Busy"
-msgstr "פנוי/עסוק:"
+msgstr ""
+"‏iCal\n"
+"פנוי/עסוק"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, fuzzy, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "Use SpamAssassin daemon and client"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
+msgstr "ניסיון ההזדהות נכשל.\n"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
 msgstr ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "אפשרויות שליחה לא זמינות."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "כלול בדיקות מ_רוחקות"
 
@@ -18265,7 +18725,7 @@
 msgstr "סוג MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-editor.xml.h:12
 msgid "Save"
 msgstr "שמור"
 
@@ -18273,88 +18733,81 @@
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:166
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Description List"
-msgstr "תיאור:"
+msgstr "רשימת תיאור"
 
-#: ../plugins/save-calendar/csv-format.c:384
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Categories List"
-msgstr "קטגוריות"
+msgstr "רשימת קטגוריות"
 
-#: ../plugins/save-calendar/csv-format.c:385
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Comment List"
-msgstr "_רשימת תפוצה"
+msgstr "רשימת הערה"
 
-#: ../plugins/save-calendar/csv-format.c:387
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Created"
-msgstr "צור"
+msgstr "נוצר"
 
-#: ../plugins/save-calendar/csv-format.c:388
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Contact List"
-msgstr "_רשימת תפוצה"
+msgstr "רשימת תפוצה"
 
-#: ../plugins/save-calendar/csv-format.c:389
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Start"
-msgstr "מצב"
+msgstr "התחלה"
 
-#: ../plugins/save-calendar/csv-format.c:390
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "End"
-msgstr "מופעל"
+msgstr "סיום"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "percent Done"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "URL"
 msgstr "כתובת"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:378
 #, fuzzy
 msgid "Attendees List"
 msgstr "רענן רשימה"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:380
 #, fuzzy
 msgid "Modified"
 msgstr "מודל"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:535
 msgid "Advanced options for the CSV format"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:542
 msgid "Prepend a header"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:551
 msgid "Value delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:557
 msgid "Record delimiter:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:563
 msgid "Encapsulate values with:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:585
 msgid "Comma separated value format (.csv)"
 msgstr ""
 
@@ -18377,18 +18830,17 @@
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:153
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:380
 msgid "RDF format (.rdf)"
 msgstr "תצורת RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
-#, fuzzy
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
-msgstr "בחר קובץ"
+msgstr "בחר קובץ יעד"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 #, fuzzy
@@ -18517,64 +18969,138 @@
 msgstr "A string description of the current printer settings."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Authenticate proxy server connections"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Automatic proxy configuration URL"
+msgstr "Automatic proxy configuration URL"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Configuration version"
 msgstr "Configuration version"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Decides whether the crash detection should be run or not."
 msgstr "Decides whether the crash detection should be run or not."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default sidebar width"
 msgstr "Default sidebar width"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "Default window height"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "Default window state"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "Default window width"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+#, fuzzy
+msgid "HTTP proxy password"
+msgstr "הכנס סיסמה"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+msgid "HTTP proxy username"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID or alias of the component to be shown by default at start-up."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username/password combo is defined by \"/apps/evolution/shell/network_config/"
+"authentication_user\" and locally stored password in .gnome2_private/."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Last upgraded configuration version"
 msgstr "Last upgraded configuration version"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Non-proxy hosts"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+#, fuzzy
+msgid "Proxy configuration mode"
+msgstr "הגדרות"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "SOCKS proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "SOCKS proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Secure HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid "Secure HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Sidebar is visible"
 msgstr "Sidebar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Skip development warning dialog"
 msgstr "Skip development warning dialog"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Skip recovery warning dialog"
 msgstr "Skip recovery warning dialog"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:30 ../shell/main.c:576
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Statusbar is visible"
 msgstr "Statusbar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -18582,19 +19108,19 @@
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "The default height for the main window, in pixels."
 msgstr "The default height for the main window, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the main window, in pixels."
 msgstr "The default width for the main window, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the sidebar, in pixels."
 msgstr "The default width for the sidebar, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18602,8 +19128,38 @@
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
@@ -18612,54 +19168,75 @@
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "Toolbar is visible"
 msgstr "Toolbar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "Last upgraded configuration version"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "Use HTTP proxy"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Whether Evolution will start up in offline mode instead of online mode."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether crash detection should be done or not"
 msgstr "Whether crash detection should be done or not"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "Whether or not the window should be maximized."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr "Whether the sidebar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "Whether the status bar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "Whether the toolbar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the warning dialog in recovery of Evolution is skipped."
 msgstr "Whether the warning dialog in recovery of Evolution is skipped."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the window buttons should be visible."
 msgstr "Whether the window buttons should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window button style"
 msgstr "Window button style"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
@@ -18746,32 +19323,33 @@
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
-#, fuzzy, c-format
+#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:343
+#, c-format
 msgid "%s - Evolution"
-msgstr "Evolution"
+msgstr ""
+"‏%s - ‏Evolution"
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "הכלים של GNOME Pilot לא מותקנים במערכת."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "ארעה שגיאה בהפעלת %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy לא מותקן."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "אין אפשרות להריץ את כלי דיווח הבאגים."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:744
+#: ../shell/e-shell-window-commands.c:742
 msgid "translator-credits"
 msgstr ""
 "יאיר הרשקוביץ <yairhr@gmail.com>\n"
@@ -18779,45 +19357,44 @@
 "פרוייקט תרגום GNOME לעברית:\n"
 "‏http://gnome-il.berlios.de"
 
-#: ../shell/e-shell-window-commands.c:755
+#: ../shell/e-shell-window-commands.c:753
 msgid "Evolution Website"
 msgstr "אתר Evolution"
 
-#: ../shell/e-shell-window-commands.c:773
+#: ../shell/e-shell-window-commands.c:771
 msgid "Error opening the FAQ webpage."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:970
+#: ../shell/e-shell-window-commands.c:968
 msgid "_Work Online"
 msgstr "עבודה במצב מ_קוון"
 
-#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:981 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "עבודה במצב _לא מקוון"
 
-#: ../shell/e-shell-window-commands.c:996
+#: ../shell/e-shell-window-commands.c:994
 msgid "Work Offline"
 msgstr "עבודה במצב לא מקוון"
 
-#: ../shell/e-shell-window.c:382
+#: ../shell/e-shell-window.c:392
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution נמצאת במצב מקוון. לחץ כאן כדי לעבור למצב לא מקוון."
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:399
 msgid "Evolution is in the process of going offline."
 msgstr "אבולוציה במהלך העברה למצב לא מקוון."
 
-#: ../shell/e-shell-window.c:396
+#: ../shell/e-shell-window.c:406
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution נמצאת במצב לא מקוון. לחץ כאן כדי לעבור למצב מקוון."
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:815
 #, c-format
 msgid "Switch to %s"
 msgstr "החלף ל-%s"
 
 #: ../shell/e-shell.c:640
-#, fuzzy
 msgid "Unknown system error."
 msgstr "שגיאת מערכת לא ידועה."
 
@@ -18946,41 +19523,40 @@
 msgstr ""
 
 #: ../shell/main.c:342
-#, fuzzy
 msgid "_Do not show this message again"
-msgstr "אל תציג הודעה זאת שוב."
+msgstr "אל _תציג הודעה זאת שוב"
 
 #: ../shell/main.c:574
 msgid "Start Evolution activating the specified component"
-msgstr ""
+msgstr "Start Evolution activating the specified component"
 
 #: ../shell/main.c:578
 msgid "Start in online mode"
-msgstr "התחל במצב מקוון"
+msgstr "Start in online mode"
 
 #: ../shell/main.c:581
 msgid "Forcibly shut down all Evolution components"
-msgstr ""
+msgstr "Forcibly shut down all Evolution components"
 
 #: ../shell/main.c:585
 msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr ""
+msgstr "Forcibly re-migrate from Evolution 1.4"
 
 #: ../shell/main.c:588
 msgid "Send the debugging output of all components to a file."
-msgstr ""
+msgstr "Send the debugging output of all components to a file."
 
 #: ../shell/main.c:590
 msgid "Disable loading of any plugins."
-msgstr ""
+msgstr "Disable loading of any plugins."
 
 #: ../shell/main.c:592
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr ""
+msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
 #: ../shell/main.c:677
 msgid "- The Evolution PIM and Email Client"
-msgstr ""
+msgstr "- The Evolution PIM and Email Client"
 
 #: ../shell/main.c:694
 #, c-format
@@ -18988,6 +19564,8 @@
 "%s: --online and --offline cannot be used together.\n"
 " Use %s --help for more information.\n"
 msgstr ""
+"%s: --online and --offline cannot be used together.\n"
+" Use %s --help for more information.\n"
 
 #: ../shell/shell.error.xml.h:1
 #, fuzzy
@@ -19075,9 +19653,8 @@
 msgstr ""
 
 #: ../shell/shell.error.xml.h:31
-#, fuzzy
 msgid "_Forget"
-msgstr "_שער:"
+msgstr "_שכח"
 
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
@@ -19171,6 +19748,11 @@
 msgid "Certificate Viewer: %s"
 msgstr "מציג תעודות: %s"
 
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "הכנס את הסיסמה עבור `%s'"
+
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -19379,7 +19961,7 @@
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:673
 msgid "Certificate already exists"
 msgstr ""
 
@@ -19589,8 +20171,7 @@
 msgid "Contact _Preview"
 msgstr "_רשימת תפוצה"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "העתק"
@@ -19618,8 +20199,7 @@
 msgid "Create a new addressbook folder"
 msgstr "הוסף משימה חדשה"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "גזור"
@@ -19663,8 +20243,7 @@
 msgid "Move to Folder..."
 msgstr "העבר לתיקייה..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "הדבק"
@@ -19707,8 +20286,7 @@
 msgid "Select All"
 msgstr "בחר הכל"
 
-#: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-editor.xml.h:13
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "בחר ה_כל"
@@ -19919,40 +20497,6 @@
 msgid "_Open Appointment"
 msgstr "_פתח פגישה"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr ""
-
-#: ../ui/evolution-composer-entries.xml.h:3
-#, fuzzy
-msgid "Copy selection to clipboard"
-msgstr "העתק את ההודעה המסומנת"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr ""
-
-#: ../ui/evolution-composer-entries.xml.h:7
-#, fuzzy
-msgid "Cut selection to clipboard"
-msgstr "גזור את ההודעה המסומנת"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr ""
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr ""
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "בחר את כל הטקסט"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "צרף"
-
 #: ../ui/evolution-editor.xml.h:2
 msgid "Click here to attach a file"
 msgstr "לחץ כאן לצרף קובץ"
@@ -19976,32 +20520,30 @@
 #. accel="*Ctrl*s"/>
 #.
 #: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
 #: ../ui/evolution-signature-editor.xml.h:7
 msgid "Close"
 msgstr "סגור"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-editor.xml.h:7
+msgid "Copy selected text to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:9
+msgid "Cut selected text to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-signature-editor.xml.h:16
 msgid "I_nsert"
 msgstr "_הוסף:"
 
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_תצריף..."
+#: ../ui/evolution-editor.xml.h:11
+msgid "Paste text from the clipboard"
+msgstr ""
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_סגור"
+#: ../ui/evolution-editor.xml.h:14
+msgid "Select all text"
+msgstr "בחר את כל הטקסט"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "_קובץ"
-
 #: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:45
 msgid "_Help"
@@ -20935,231 +21477,14 @@
 msgid "_Open Memo"
 msgstr "_פתח תזכורת"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "צרף קובץ"
+#: ../ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "_סגור"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "סגור את הקובץ הנוכחי"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "הצפן הודעה זו עם PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-#, fuzzy
-msgid "Insert Send options"
-msgstr "אפשרויות"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "פתח קובץ"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "הצפנת PGP"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "חתימת PGP"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "ה_צפנת PGP"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "_חתימת PGP"
-
-#: ../ui/evolution-message-composer.xml.h:19
-#, fuzzy
-msgid "R_equest Read Receipt"
-msgstr "משתתפים דרושים"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "ש_לח"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "שמור בשם"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "שמור טיוטה"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "שמור _בשם..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "שמור _טיוטה"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "שמור כטיוטה"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "שמור בתיקייה..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "שמור את הקובץ הנוכחי"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "שמור את הקובץ הנוכחי בשם אחר"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "שלח"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "שלח את הדואר בתצורת HTML"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "שלח את ההודעה"
-
-#: ../ui/evolution-message-composer.xml.h:38
-#, fuzzy
-msgid "Set the message priority to high"
-msgstr "שמור את ההודעה כקובץ מלל"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "שדה _Bcc"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "שדה _Cc"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "מ_חק הכל"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_פתח..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:57
-#, fuzzy
-msgid "_Prioritize Message"
-msgstr "הדפס הודעה"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "_אבטחה"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr " _אפשרויות שליחה"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr ""
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_סגור"
-
 #: ../ui/evolution-signature-editor.xml.h:15
 msgid "H_TML"
 msgstr "H_TML"
@@ -21179,6 +21504,10 @@
 msgid "Save the current file and close the window"
 msgstr "שמור את הקובץ הנוכחי וסגור את החלון"
 
+#: ../ui/evolution-signature-editor.xml.h:23
+msgid "Send the mail in HTML format"
+msgstr "שלח את הדואר בתצורת HTML"
+
 #: ../ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -21565,8 +21894,8 @@
 msgstr "בחר אזור זמן"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "תיבת אזור זמן"
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21687,17 +22016,43 @@
 msgid "Type of view:"
 msgstr "סוג תצוגה:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:103
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../widgets/misc/e-attachment-bar.c:109
+#, c-format
+msgid "%.1f KB"
+msgstr "%.1f KB"
+
+#: ../widgets/misc/e-attachment-bar.c:112
+#, c-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: ../widgets/misc/e-attachment-bar.c:115
+#, c-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
+
+#: ../widgets/misc/e-attachment-bar.c:1058
 msgid "Attachment Bar"
 msgstr ""
 
-#: ../widgets/misc/e-attachment.c:317 ../widgets/misc/e-attachment.c:332
-#: ../widgets/misc/e-attachment.c:533 ../widgets/misc/e-attachment.c:550
+#: ../widgets/misc/e-attachment-bar.c:1304
+msgid "Recent Docu_ments"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:296 ../widgets/misc/e-attachment.c:311
+#: ../widgets/misc/e-attachment.c:596 ../widgets/misc/e-attachment.c:613
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "לא ניתן לצרף את הקובץ %s: %s"
 
-#: ../widgets/misc/e-attachment.c:325 ../widgets/misc/e-attachment.c:542
+#: ../widgets/misc/e-attachment.c:304 ../widgets/misc/e-attachment.c:605
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -21719,8 +22074,7 @@
 msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1099
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21804,100 +22158,98 @@
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Arabic"
 msgstr "ערבית"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Baltic"
 msgstr "בלטי"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Central European"
 msgstr "מרכז אירופי"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Chinese"
 msgstr "סינית"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Cyrillic"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Greek"
 msgstr "יוונית"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Hebrew"
 msgstr "עברית"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Japanese"
 msgstr "יפנית"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Korean"
 msgstr "קוראנית"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Thai"
 msgstr "תאילנדית"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "טורקית"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "יוניקוד"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "מערב אירופאי"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European, New"
 msgstr "מערב אירופאי, חדש"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
+#: ../widgets/misc/e-charset-picker.c:90
 msgid "Traditional"
 msgstr "מסורתי"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
 msgstr "מופשט"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
 msgstr "אוקראינית"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Visual"
 msgstr "ויזואלי"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:169
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "קידוד תווים לא ידוע: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:214
 msgid "Character Encoding"
 msgstr "קידוד תווים"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:229
 msgid "Enter the character set to use"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:336
 msgid "Other..."
 msgstr "אחר..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:598
 msgid "Ch_aracter Encoding"
 msgstr "קידוד _תווים"
 
@@ -21914,7 +22266,7 @@
 msgstr ""
 
 #: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+msgid "Drop-down combination box to select time"
 msgstr ""
 
 #: ../widgets/misc/e-dateedit.c:484
@@ -22042,7 +22394,7 @@
 #: ../widgets/misc/e-map.c:628
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
 msgstr ""
 
 #: ../widgets/misc/e-pilot-settings.c:103
@@ -22070,53 +22422,53 @@
 msgid "Column width"
 msgstr "רוחב עמודה"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
+#: ../widgets/misc/e-search-bar.c:484
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:350 ../widgets/misc/e-search-bar.c:482
+#: ../widgets/misc/e-search-bar.c:484
 #, fuzzy
 msgid "Click here to change the search type"
 msgstr "לחץ כאן לצרף קובץ"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:615
 msgid "_Search"
 msgstr "_חיפוש"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:621
 msgid "_Find Now"
 msgstr "חפש _עכשיו"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:622
 msgid "_Clear"
 msgstr "_נקה"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:877
 msgid "Item ID"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
+#: ../widgets/misc/e-search-bar.c:884 ../widgets/text/e-text.c:3564
 #: ../widgets/text/e-text.c:3565
 msgid "Text"
 msgstr "טקסט"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1018
 msgid "Sho_w: "
 msgstr "ת_צוגה: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1030
+#: ../widgets/misc/e-search-bar.c:1035
 msgid "Sear_ch: "
 msgstr "_חיפוש: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1042
+#: ../widgets/misc/e-search-bar.c:1047
 msgid " i_n "
 msgstr ""
 
@@ -22253,30 +22605,31 @@
 msgid "_All information"
 msgstr "כל ה_מידע"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 #, fuzzy
 msgid "_Delay message delivery"
 msgstr "השאר הודעות על השרת"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 #, fuzzy
 msgid "_Delivered"
 msgstr "_מחק"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_קבע תאריך תפוגה"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 #, fuzzy
 msgid "_Until:"
 msgstr "ללא-שם"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 #, fuzzy
 msgid "_When opened:"
 msgstr "_איפה:"
@@ -22324,9 +22677,8 @@
 msgstr "%l:%M %p"
 
 #: ../widgets/table/e-cell-pixbuf.c:360
-#, fuzzy
 msgid "Selected Column"
-msgstr "נבחר"
+msgstr "עמודה ניבחרת"
 
 #: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
@@ -22818,7 +23170,84 @@
 msgid "Handle Popup"
 msgstr ""
 
+#~ msgid "Permission Denied."
+#~ msgstr "ההרשאה נדחתה."
+
+#~ msgid "Unknown reason"
+#~ msgstr "סיבה לא ידועה"
+
+#~ msgid "Open File"
+#~ msgstr "פתח קובץ"
+
+#~ msgid "Do not quote original message"
+#~ msgstr "אל תצטט את ההודעה המקורית"
+
+#~ msgid "Enter a name for this signature."
+#~ msgstr "הכנס שם לחתימה זו."
+
+#~ msgid "Name:"
+#~ msgstr "שם:"
+
+#~ msgid "_Continue Editing"
+#~ msgstr "המשך ב_עריכה"
+
+#~ msgid "_Refresh:"
+#~ msgstr "_רענן:"
+
+#~ msgid "Print Message"
+#~ msgstr "הדפס הודעה"
+
+#~ msgid "Prints the message"
+#~ msgstr "הדפס את ההודעה"
+
 #, fuzzy
+#~ msgid "Copy selection to clipboard"
+#~ msgstr "העתק את ההודעה המסומנת"
+
+#, fuzzy
+#~ msgid "Cut selection to clipboard"
+#~ msgstr "גזור את ההודעה המסומנת"
+
+#~ msgid "HT_ML"
+#~ msgstr "HT_ML"
+
+#~ msgid "Open a file"
+#~ msgstr "פתח קובץ"
+
+#~ msgid "PGP Encrypt"
+#~ msgstr "הצפנת PGP"
+
+#~ msgid "PGP Sign"
+#~ msgstr "חתימת PGP"
+
+#~ msgid "Save As"
+#~ msgstr "שמור בשם"
+
+#~ msgid "Save Draft"
+#~ msgstr "שמור טיוטה"
+
+#~ msgid "Save in folder..."
+#~ msgstr "שמור בתיקייה..."
+
+#~ msgid "Send"
+#~ msgstr "שלח"
+
+#~ msgid "_Delete all"
+#~ msgstr "מ_חק הכל"
+
+#~ msgid "_Open..."
+#~ msgstr "_פתח..."
+
+#~ msgid "TimeZone Combobox"
+#~ msgstr "תיבת אזור זמן"
+
+#~ msgid "Display"
+#~ msgstr "תצוגה"
+
+#~ msgid "Server Information"
+#~ msgstr "מידע על השרת"
+
+#, fuzzy
 #~ msgid "Select Drafts Folder"
 #~ msgstr "בחר תיקייה"
 
@@ -22875,9 +23304,6 @@
 #~ msgid "Retrieving Message..."
 #~ msgstr "מקבל הודעה..."
 
-#~ msgid "Automatic smiley recognition"
-#~ msgstr "Automatic smiley recognition"
-
 #~ msgid "New Mail Notify sound file"
 #~ msgstr "New Mail Notify sound file"
 
@@ -22920,9 +23346,6 @@
 #~ msgid "From :"
 #~ msgstr "מאת :"
 
-#~ msgid "System error: %s"
-#~ msgstr "שגיאת מערכת: %s"
-
 #, fuzzy
 #~ msgid "No store available"
 #~ msgstr "אין תיאור זמין."
@@ -22988,10 +23411,6 @@
 #~ msgstr "מייבא %s. \n"
 
 #, fuzzy
-#~ msgid "Could not open addressbook!"
-#~ msgstr "ספר הכתובות של אבולוציה"
-
-#, fuzzy
 #~ msgid "Could not open the Evolution addressbook to export data."
 #~ msgstr "ספר הכתובות של אבולוציה נסגר באופן בלתי צפוי."
 
Index: po/fi.po
===================================================================
--- po/fi.po	(revision 35318)
+++ po/fi.po	(working copy)
@@ -1,9 +1,8 @@
 # Finnish messages for evolution
-# Copyright (C) 2000-2003 Free Software Foundation, Inc.
+# Copyright (C) 2000-2008 Free Software Foundation, Inc.
+# Ilkka Tuohela <hile@iki.fi> 2003-2008.
 # Jarkko Ranta <jjranta@cc.joensuu.fi> 2000-2001,
 # Sami Pesonen <sampeson@iki.fi> 2001-2003,
-# Ilkka Tuohela <hile@iki.fi> 2003-2005.
-# Timo Jyrinki <timo.jyrinki@iki.fi>, 2008.
 #
 # Huomautus: PIM ei ole suomennettu, evolution on suomeksi
 # yksinkertaisesti sähköpostiohjelma. Saa ehdottaa nimeä.
@@ -12,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-03 16:09+0300\n"
-"PO-Revision-Date: 2008-04-03 16:10+0300\n"
+"POT-Creation-Date: 2008-04-30 12:31+0300\n"
+"PO-Revision-Date: 2008-04-30 11:00+0300\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -369,7 +368,7 @@
 
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
-msgstr "Yhteystietoa ei voida siirtää."
+msgstr "Yhteystietoa ei voi siirtää."
 
 #: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
@@ -513,7 +512,7 @@
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
-"Yrität siirtää yhteystietoa osoitekirjasta toiseen, mutta sitä ei voida "
+"Yrität siirtää yhteystietoa osoitekirjasta toiseen, mutta sitä ei voi "
 "poistaa lähdeosoitekirjasta. Haluatko sen sijaan tallentaa kopion?"
 
 #: ../addressbook/addressbook.error.xml.h:35
@@ -537,7 +536,7 @@
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
-"Yhteystietoja {0} ei voida käyttää ennen kuin Evolution käynnistetään "
+"Yhteystietoja {0} ei voi käyttää ennen kuin Evolution käynnistetään "
 "uudestaan."
 
 #: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
@@ -733,7 +732,7 @@
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Yleiset"
@@ -862,7 +861,7 @@
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/calendar-component.c:609
 #: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:941
 #: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
 #: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1346
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
@@ -884,12 +883,12 @@
 msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
 
 #: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
 msgid "Failed to authenticate.\n"
 msgstr "Kirjautuminen epäonnistui.\n"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Syötä salasana palvelulle %s (käyttäjä %s)"
@@ -1484,8 +1483,8 @@
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
 #: ../addressbook/gui/widgets/e-minicard.c:187
 #: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Muokattava"
 
@@ -2910,8 +2909,8 @@
 #: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
 #: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Malli"
 
@@ -2939,7 +2938,7 @@
 #: ../addressbook/gui/widgets/e-addressbook-view.c:935
 #: ../calendar/gui/dialogs/comp-editor.c:1128
 #: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Avaa"
@@ -2996,7 +2995,7 @@
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
 #: ../calendar/gui/dialogs/comp-editor.c:457
 #: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
+#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:932
 #: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:996
 #: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
@@ -3204,7 +3203,7 @@
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Leveys"
 
@@ -3219,7 +3218,7 @@
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Korkeus"
 
@@ -3378,9 +3377,9 @@
 #: ../calendar/gui/gnome-cal.c:2383
 #: ../plugins/exchange-operations/exchange-delegates-user.c:88
 #: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/hula-account-setup/camel-hula-listener.c:378
 #: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3412,12 +3411,12 @@
 msgstr "Web-loki"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/e-calendar-view.c:2338
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/e-calendar-view.c:2339
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
@@ -3572,7 +3571,7 @@
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 "Osoitekirjan avaus epäonnistui. Syötit joko virheellisen URIn tai palvelinta "
-"ei voida tavoittaa."
+"ei voi tavoittaa."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
@@ -3853,7 +3852,7 @@
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-header-item.c:1908
 #: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "Ylätunniste:"
@@ -4012,7 +4011,7 @@
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
-msgstr "Tiedostoa ei voida avata"
+msgstr "Tiedostoa ei voi avata"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 msgid "Couldn't get list of addressbooks"
@@ -4108,42 +4107,39 @@
 #: ../calendar/calendar.error.xml.h:5
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
-"Kaikki tiedot näissä muistilapuissa poistetaan eikä niitä voida palauttaa."
+"Kaikki tiedot näissä muistilapuissa poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr ""
-"Kaikki tiedot tässä muistilapussa poistetaan eikä niitä voida palauttaa."
+msgstr "Kaikki tiedot tässä muistilapussa poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr ""
-"Kaikki tiedot näistä tapaamisista poistetaan eikä niitä voida palauttaa."
+msgstr "Kaikki tiedot näistä tapaamisista poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "Kaikki tiedot näistä tehtävistä poistetaan eikä niitä voida palauttaa."
+msgstr "Kaikki tiedot näistä tehtävistä poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"Kaikki tiedot tästä tapaamisesta poistetaan eikä niitä voida palauttaa."
+msgstr "Kaikki tiedot tästä tapaamisesta poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
-msgstr "Kaikki tiedot tästä kokouksesta poistetaan eikä niitä voida palauttaa."
+msgstr "Kaikki tiedot tästä kokouksesta poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:11
 msgid "All information on this memo will be deleted and can not be restored."
-msgstr "Kaikki tämän muistilapun tiedot poistetaan eikä niitä voida palauttaa."
+msgstr "Kaikki tämän muistilapun tiedot poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:12
 msgid "All information on this task will be deleted and can not be restored."
-msgstr "Kaikki tiedot tästä tehtävästä poistetaan eikä niitä voida palauttaa."
+msgstr "Kaikki tiedot tästä tehtävästä poistetaan eikä niitä voi palauttaa."
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -4506,7 +4502,7 @@
 msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voi kirjoittaa"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2350
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
@@ -4569,8 +4565,8 @@
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-delegates-user.c:88
 #: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tehtävät"
@@ -4654,16 +4650,16 @@
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1470
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1593
 msgid "No summary available."
-msgstr "Ei yhteenvetoa saatavilla"
+msgstr "Ei yhteenvetoa saatavilla."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1479
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1481
 msgid "No description available."
-msgstr "Ei kuvausta saatavilla"
+msgstr "Ei kuvausta saatavilla."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1489
 msgid "No location information available."
-msgstr "Ei sijaintitietoja saatavilla"
+msgstr "Ei sijaintitietoja saatavilla."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1533
 #, c-format
@@ -5972,7 +5968,7 @@
 msgstr "_Lisää liite..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
+#: ../mail/em-format-html-display.c:2415
 msgid "Show Attachments"
 msgstr "Näytä liitteet"
 
@@ -6028,7 +6024,7 @@
 
 #: ../calendar/gui/dialogs/comp-editor.c:3017
 msgid "Unable to use current version!"
-msgstr "Nykyistä versiota ei voida käyttää!"
+msgstr "Nykyistä versiota ei voi käyttää!"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
@@ -6232,9 +6228,9 @@
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:205
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
+#: ../plugins/itip-formatter/itip-formatter.c:2013
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1533
+#: ../widgets/misc/e-dateedit.c:1747
 #: ../widgets/misc/e-signature-combo-box.c:50
 msgid "None"
 msgstr "Määrittelemätön"
@@ -6325,8 +6321,8 @@
 msgid "Unable to open memos in '%s'."
 msgstr "Muistilappuja kohteesta '%s' ei voi avata."
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
+#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1553
+#: ../mail/em-format-html.c:1611 ../mail/em-format-html.c:1637
 #: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
 #: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
 msgid "To"
@@ -6653,7 +6649,7 @@
 msgstr "_Kotisivun osoite:"
 
 #: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/tasks-component.c:1327
 msgid "_Task"
 msgstr "_Tehtävä"
 
@@ -6902,7 +6898,7 @@
 #: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
 #: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
 #: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 #: ../plugins/plugin-manager/plugin-manager.c:84
 #: ../widgets/misc/e-attachment-bar.c:721
 #: ../widgets/misc/e-charset-picker.c:64
@@ -6921,7 +6917,7 @@
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2249
 msgid "Select folder to save selected attachments..."
 msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
 
@@ -6931,7 +6927,7 @@
 msgstr "nimetön_kuva.%s"
 
 #: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:926
 #: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
@@ -6995,23 +6991,23 @@
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-view.c:679 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
 #: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-view.c:809 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
 #: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
+#: ../calendar/gui/e-calendar-view.c:1235 ../calendar/gui/e-memo-table.c:821
 #: ../composer/e-msg-composer.c:1472
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
 #: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1668
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
@@ -7020,20 +7016,20 @@
 msgstr "_Avaa www-sivu"
 
 #: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "T_ulosta..."
 
 #: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
 #: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-view.c:1674
+#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
@@ -7107,105 +7103,105 @@
 msgid "Status"
 msgstr "Tila"
 
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1354
 msgid "Moving items"
 msgstr "Siirretään kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1356
 msgid "Copying items"
 msgstr "Kopioidaan kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1665
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "New _Meeting"
 msgstr "Uusi _kokous"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1678
 msgid "_Current View"
 msgstr "_Nykyinen näkymä"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1680
 msgid "Select T_oday"
 msgstr "Valitse _tämä päivä"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1681
 msgid "_Select Date..."
 msgstr "_Valitse päiväys..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "Pri_nt..."
 msgstr "T_ulosta..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1698
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1699
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1700
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1701
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1702
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
+#: ../calendar/gui/e-calendar-view.c:1703 ../mail/em-folder-view.c:1336
 #: ../mail/em-popup.c:576 ../mail/em-popup.c:587
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1708
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1709 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Delete _All Occurrences"
 msgstr "Poista _kaikki tapahtumakerrat"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
+#: ../calendar/gui/e-calendar-view.c:2210
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
+#: ../calendar/gui/e-calendar-view.c:2214
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2230 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2264
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
@@ -7404,12 +7400,12 @@
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
 #: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../plugins/itip-formatter/itip-formatter.c:2026
 msgid "Accepted"
 msgstr "Hyväksytty"
 
 #: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:2029
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
@@ -7417,7 +7413,7 @@
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
 #: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../plugins/itip-formatter/itip-formatter.c:2032
 msgid "Declined"
 msgstr "Hylätty"
 
@@ -7619,7 +7615,7 @@
 
 #: ../calendar/gui/e-itip-control.c:1991
 msgid "Object is invalid and cannot be updated\n"
-msgstr "Kohde on virheellinen eikä sitä voida päivittää\n"
+msgstr "Kohde on virheellinen eikä sitä voi päivittää\n"
 
 #: ../calendar/gui/e-itip-control.c:2008
 msgid "This response is not from a current attendee. Add as an attendee?"
@@ -7636,8 +7632,7 @@
 #: ../calendar/gui/e-itip-control.c:2057
 #: ../plugins/itip-formatter/itip-formatter.c:1251
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Läsnäolon tilaa ei voida päivittää, koska kohdetta ei enää ole olemassa"
+msgstr "Läsnäolon tilaa ei voi päivittää, koska kohdetta ei enää ole olemassa"
 
 #: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
 msgid "Item sent!\n"
@@ -7793,7 +7788,7 @@
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
 #: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../plugins/itip-formatter/itip-formatter.c:2035
 msgid "Delegated"
 msgstr "Valtuutettu"
 
@@ -8257,9 +8252,9 @@
 msgstr "Tehtävien '%s' muunnos epäonnistui"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
 msgid "Notes"
 msgstr "Muistilaput"
 
@@ -8497,35 +8492,35 @@
 msgid "Task Source Selector"
 msgstr "Tehtävien lähteen valinta"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1326
 msgid "New task"
 msgstr "Uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1328
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1334
 msgid "New assigned task"
 msgstr "Uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Assigne_d Task"
 msgstr "Tehtäväksi_anto"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1336
 msgid "Create a new assigned task"
 msgstr "Luo uusi tehtäväksianto"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1342
 msgid "New task list"
 msgstr "Uusi tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Tas_k list"
 msgstr "_Tehtävälista"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1344
 msgid "Create a new task list"
 msgstr "Luo uusi tehtävälista"
 
@@ -8555,7 +8550,7 @@
 
 #: ../calendar/importers/icalendar-importer.c:337
 #: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../plugins/itip-formatter/itip-formatter.c:1570
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
@@ -10134,39 +10129,39 @@
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
 #. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
+#: ../composer/e-msg-composer-hdrs.c:236
 msgid "Si_gnature:"
 msgstr "_Allekirjoitus:"
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-msg-composer-hdrs.c:341
 msgid "Fr_om:"
 msgstr "_Lähettäjä:"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-msg-composer-hdrs.c:347
 msgid "_Reply-To:"
 msgstr "_Vastausosoite:"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-msg-composer-hdrs.c:353
 msgid "_To:"
 msgstr "Vastaan_ottaja:"
 
-#: ../composer/e-msg-composer-hdrs.c:337
+#: ../composer/e-msg-composer-hdrs.c:355
 msgid "Enter the recipients of the message"
 msgstr "Syötä viestin vastaanottajat"
 
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-msg-composer-hdrs.c:361
 msgid "_Cc:"
 msgstr "_Kopiot:"
 
-#: ../composer/e-msg-composer-hdrs.c:342
+#: ../composer/e-msg-composer-hdrs.c:363
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin lähetetään kopio viestistä (Cc)"
 
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-msg-composer-hdrs.c:370
 msgid "_Bcc:"
 msgstr "_Piilokopiot:"
 
-#: ../composer/e-msg-composer-hdrs.c:348
+#: ../composer/e-msg-composer-hdrs.c:372
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10174,11 +10169,11 @@
 "Anna osoitteet, joihin lähetetään kopiot viestistä ilman että muut "
 "vastaanottajat näkevät vastaanottajia"
 
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-msg-composer-hdrs.c:380
 msgid "_Post To:"
 msgstr "_Postita:"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-msg-composer-hdrs.c:386
 msgid "S_ubject:"
 msgstr "_Aihe:"
 
@@ -10194,7 +10189,7 @@
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
-"Lähtevää viestiä ei voida allekirjoittaa: allekirjoitusvarmennetta ei ole "
+"Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
 #: ../composer/e-msg-composer.c:826
@@ -10202,7 +10197,7 @@
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
-"Lähtevää viestiä ei voida salata: Salausvarmennetta ei ole asetettu tälle "
+"Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
 #: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
@@ -10224,7 +10219,7 @@
 
 #: ../composer/e-msg-composer.c:1533
 msgid "Unable to retrieve message from editor"
-msgstr "Viestiä ei voida hakea muokkaimelta"
+msgstr "Viestiä ei voi hakea muokkaimelta"
 
 #: ../composer/e-msg-composer.c:1820
 msgid "Untitled Message"
@@ -10308,7 +10303,7 @@
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
-msgstr "Hakemistoja ei voida liittää viesteihin."
+msgstr "Hakemistoja ei voi liittää viesteihin."
 
 #: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
@@ -10345,7 +10340,7 @@
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
-"Tiedosto `{0}' ei ole tavallinen tiedosto eikä sitä voida lähettää viestissä."
+"Tiedosto `{0}' ei ole tavallinen tiedosto eikä sitä voi lähettää viestissä."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid ""
@@ -10456,11 +10451,11 @@
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
-msgstr "Tiedostoa &quot;{0}&quot; ei voida avata."
+msgstr "Tiedostoa &quot;{0}&quot; ei voi avata."
 
 #: ../e-util/e-system.error.xml.h:3
 msgid "Cannot save file &quot;{0}&quot;."
-msgstr "Tiedostoa &quot;{0}&quot; ei voida tallentaa."
+msgstr "Tiedostoa &quot;{0}&quot; ei voi avata."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
@@ -10468,7 +10463,7 @@
 
 #: ../e-util/e-system.error.xml.h:5
 msgid "File exists &quot;{0}&quot;."
-msgstr "Tiedosto &quot;{0}&quot;on jo olemassa."
+msgstr "Tiedosto &quot;{0}&quot; on jo olemassa."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -11012,18 +11007,18 @@
 msgid "Signature(s)"
 msgstr "Allekirjoitukset"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:902 ../mail/em-format-quote.c:399
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1713
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1750
+#: ../mail/em-composer-utils.c:1760
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11031,7 +11026,7 @@
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:1901
 msgid "-----Original Message-----"
 msgstr "-----Alkuperäinen viesti-----"
 
@@ -11319,7 +11314,7 @@
 msgid "Stop Processing"
 msgstr "Pysäytä käsittely"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1710
 #: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
 #: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
 #: ../mail/message-tag-followup.c:337
@@ -11501,7 +11496,7 @@
 
 #: ../mail/em-folder-tree.c:917
 msgid "Cannot drop message(s) into toplevel store"
-msgstr "Viestiä ei voida tiputtaa ylätason taltioon"
+msgstr "Viestiä ei voi tiputtaa ylätason taltioon"
 
 #: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
@@ -11662,7 +11657,7 @@
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:500
 msgid "_None"
 msgstr "_Ei mitään"
 
@@ -11723,7 +11718,7 @@
 
 #: ../mail/em-folder-view.c:2529
 msgid "Unable to retrieve message"
-msgstr "Viestiä ei voida hakea"
+msgstr "Viestiä ei voi hakea"
 
 #: ../mail/em-folder-view.c:2548
 msgid "Retrieving Message..."
@@ -11760,33 +11755,33 @@
 msgstr "Napsauta piilottaaksesi tai näyttääksesi osoitteet"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:517
 #, c-format
 msgid "Matches: %d"
 msgstr "Osumia: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:661
 msgid "Fin_d:"
 msgstr "Et_si:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:685
 msgid "_Previous"
 msgstr "_Edellinen"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:690
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:695
 msgid "M_atch case"
 msgstr "Täsmää _kirjainkoko"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:642
 msgid "Unsigned"
 msgstr "Allekirjoittamaton"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:994
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11794,11 +11789,11 @@
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:643
 msgid "Valid signature"
 msgstr "Hyväksytty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:993
+#: ../mail/em-format-html-display.c:995
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11806,35 +11801,35 @@
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on hyvin "
 "todennäköisesti aito."
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:644
 msgid "Invalid signature"
 msgstr "Hylätty allekirjoitus"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:996
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
-"Tämän viestin allekirjoitusta ei voida tarkistaa, se on ehkä muuttunut "
-"siirron aikana."
+"Tämän viestin allekirjoitusta ei voi tarkistaa, se on ehkä muuttunut siirron "
+"aikana."
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:997 ../mail/em-format-html.c:645
 msgid "Valid signature, but cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voi varmistaa"
 
-#: ../mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:997
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
-"viestin lähettäjää ei voida varmistaa."
+"viestin lähettäjää ei voi varmistaa."
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:998 ../mail/em-format-html.c:646
 msgid "Signature exists, but need public key"
 msgstr "Allekirjoitus löytyi, mutta tarvitsee julkisen avaimen"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:998
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11842,11 +11837,11 @@
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjän julkista avainta ei löydy."
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:652
 msgid "Unencrypted"
 msgstr "Salaamaton"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:1005
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11854,11 +11849,11 @@
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen kulkiessa "
 "Internetin läpi."
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:653
 msgid "Encrypted, weak"
 msgstr "Heikosti salattu"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../mail/em-format-html-display.c:1006
 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 "
@@ -11868,11 +11863,11 @@
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaan viestin sisällön "
 "melko lyhyessä ajassa."
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:1007 ../mail/em-format-html.c:654
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../mail/em-format-html-display.c:1007
 msgid ""
 "This message is encrypted. It would be difficult for an outsider to view "
 "the content of this message."
@@ -11880,11 +11875,11 @@
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:1008 ../mail/em-format-html.c:655
 msgid "Encrypted, strong"
 msgstr "Salattu vahvalla algoritmilla"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:1008
 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 "
@@ -11894,92 +11889,92 @@
 "vaikea purkaa salausta ja nähdä tämän viestin sisältöä missään "
 "käytännöllisessä ajassa."
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1109 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1124
 msgid "This certificate is not viewable"
-msgstr "Tätä varmennetta ei voida näyttää"
+msgstr "Tätä varmennetta ei voi näyttää"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1445
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Valmistui %B %d, %Y, %l.%M %p"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1453
 msgid "Overdue:"
 msgstr "Eräpäivä ylitetty:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1456
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "kirjoittanut %d %l.%M %p"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1534
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1535
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1536
 msgid "_Fit to Width"
 msgstr "Sovita _leveyteen"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1537
 msgid "Show _Original Size"
 msgstr "Näytä alkuperäinen k_oko"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1987 ../mail/em-format-html-display.c:2629
 #: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Liite"
 
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:2203
 msgid "Save attachment as"
 msgstr "Tallenna liite nimellä"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:2207
 msgid "Select folder to save all attachments"
 msgstr "Valitse kansio, johon kaikki liitteet tallennetaan"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2258
 msgid "_Save Selected..."
 msgstr "_Tallenna valinta..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2325
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d lii_te"
 msgstr[1] "%d lii_tettä"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2332 ../mail/em-format-html-display.c:2421
 msgid "S_ave"
 msgstr "T_allenna"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2343
 msgid "S_ave All"
 msgstr "Tallenna _kaikki"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2417
 msgid "No Attachment"
 msgstr "Ei liitteitä"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2564 ../mail/em-format-html-display.c:2602
 msgid "View _Unformatted"
 msgstr "Näytä _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2566
 msgid "Hide _Unformatted"
 msgstr "Piilota _muotoilematon"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2621
 msgid "O_pen With"
 msgstr "Avaa _ohjelmalla"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2692
 msgid ""
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
@@ -11992,89 +11987,89 @@
 msgid "Page %d of %d"
 msgstr "Sivu %d / %d"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:496 ../mail/em-format-html.c:505
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Haetaan %s"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:917
 msgid "Unknown external-body part."
 msgstr "Tuntematon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:925
 msgid "Malformed external-body part."
 msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:955
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Osoitin FTP-palvelimelle (%s)"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:966
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:968
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Osoitin paikalliseen tiedostoon (%s)"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:989
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1000
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 "Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1228
 msgid "Formatting message"
 msgstr "Muotoillaan viestiä"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1402
 msgid "Formatting Message..."
 msgstr "Muotoillaan viestiä..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1554 ../mail/em-format-html.c:1618
+#: ../mail/em-format-html.c:1640 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
 msgid "Cc"
 msgstr "Kopiot"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1555 ../mail/em-format-html.c:1624
+#: ../mail/em-format-html.c:1643 ../mail/em-format-quote.c:209
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
 msgid "Bcc"
 msgstr "Piilokopiot"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
+#: ../mail/em-format-html.c:1714 ../mail/em-format-quote.c:331
 #: ../mail/em-mailer-prefs.c:1458
 msgid "Mailer"
 msgstr "Postittaja"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../mail/em-format-html.c:1741
 msgid " (%a, %R %Z)"
 msgstr " (%a. %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1738
+#: ../mail/em-format-html.c:1746
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
+#: ../mail/em-format-html.c:1758 ../mail/em-format-quote.c:338
 #: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
 #: ../widgets/misc/e-dateedit.c:368
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
+#: ../mail/em-format-html.c:1781 ../mail/em-format.c:893
 #: ../mail/em-mailer-prefs.c:97
 msgid "Newsgroups"
 msgstr "Uutisryhmät"
@@ -12082,7 +12077,7 @@
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1866
+#: ../mail/em-format-html.c:1874
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Tämä viesti lähetettiin %s käyttäjän %s puolesta"
@@ -12226,7 +12221,7 @@
 #: ../mail/em-migrate.c:1650
 #, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr "Kansiota '%s' ei voida luoda: %s"
+msgstr "Kansiota '%s' ei voi luoda: %s"
 
 #: ../mail/em-migrate.c:1676
 #, c-format
@@ -12876,14 +12871,15 @@
 
 #: ../mail/evolution-mail.schemas.in.h:115
 msgid "Specifies the header to check for junk."
-msgstr "Määrittää otsakkeen, jota käytetään roskapostin tunnistamiseen."
+msgstr "Määrittää roskapostin tunnistukseen käytetyn otsakkeen."
 
 #: ../mail/evolution-mail.schemas.in.h:116
 msgid ""
 "Specifies the header to check for junk. The format is headername=value in "
 "gconf."
 msgstr ""
-"Määrittää roskapostiotsakkeen. Asetuksen muoto gconf:issa on otsakenimi=arvo."
+"Määrittää roskapostin tunnistukseen käytetyn otsakeen. Asetuksen muoto gconf:"
+"issa on otsakenimi=arvo."
 
 #: ../mail/evolution-mail.schemas.in.h:117
 msgid "Spell check inline"
@@ -13312,7 +13308,7 @@
 
 #: ../mail/mail-component.c:1645
 msgid "seconds."
-msgstr "sekunnin ajan."
+msgstr "sekuntia."
 
 #: ../mail/mail-component.c:1655
 msgid "Log Messages:"
@@ -13578,7 +13574,7 @@
 
 #: ../mail/mail-config.glade.h:71
 msgid "Do _not mark messages as junk if sender is in my addressbook"
-msgstr "Älä merkitse viestejä _roskapostiksi, jos lähettäjä on osoitekirjassa"
+msgstr "Älä merkitse _roskapostiksi, jos lähettäjä on osoitekirjassa"
 
 #: ../mail/mail-config.glade.h:72
 msgid "Do not format text contents in messages if the text si_ze exceeds"
@@ -14247,7 +14243,7 @@
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
-"Tulostiedostoa ei voida luoda: %s:\n"
+"Tulostiedostoa ei voi luoda: %s:\n"
 "%s"
 
 #: ../mail/mail-ops.c:2076
@@ -14384,12 +14380,12 @@
 #: ../mail/mail.error.xml.h:1
 msgid ""
 "A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "Kansio nimeltä &quot;{1}&quot; on jo olemassa. Valitse toinen nimi."
+msgstr "Kansio &quot;{1}&quot; on jo olemassa. Valitse toinen nimi."
 
 #: ../mail/mail.error.xml.h:2
 msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "Kansio nimeltä &quot;{1}&quot; on jo olemassa. Valitse toinen nimi."
+msgstr "Kansio &quot;{1}&quot; on jo olemassa. Valitse toinen nimi."
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
@@ -14414,7 +14410,8 @@
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
-msgstr "Nimellä &quot;{0}&quot; on jo allekirjoitus. Anna toinen nimi."
+msgstr ""
+"Nimellä &quot;{0}&quot; on jo määritelty allekirjoitus. Anna toinen nimi."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14487,52 +14484,52 @@
 
 #: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Hakunäkymää &quot;{0}&quot; ei voida lisätä."
+msgstr "Hakunäkymää &quot;{0}&quot; ei voi lisätä."
 
 #: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Kansiota &quot;{0}&quot; ei voida kopioida kohtaan &quot;{1}&quot;."
+msgstr "Kansiota &quot;{0}&quot; ei voi kopioida kohteeseen &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Kansiota &quot;{0}&quot; ei voida luoda."
+msgstr "Kansiota &quot;{0}&quot; ei voi luoda."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
-msgstr "Väliaikaista hakemistoa ei voida luoda."
+msgstr "Väliaikaista hakemistoa ei voi luoda."
 
 #: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "Tallennushakemisto ei voida luoda, syy: &quot;{1}&quot;"
+msgstr "Tallennuskansiota ei voi luoda, syy: &quot;{1}&quot;"
 
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "Kansiota &quot;{0}&quot; ei voida poistaa."
+msgstr "Kansiota &quot;{0}&quot; ei voi poistaa."
 
 #: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "Järjestelmäkansiota &quot;{0}&quot; ei voida poistaa."
+msgstr "Järjestelmäkansiota &quot;{0}&quot; ei voi poistaa."
 
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
-"Hakunäkymää &quot;{0}&quot; ei voida muokata, koska sitä ei ole olemassa."
+"Hakunäkymää &quot;{0}&quot; ei voi muokata, koska sitä ei ole olemassa."
 
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Kansiota &quot;{0}&quot; ei voida siirtää kohtaan &quot;{1}&quot;."
+msgstr "Kansiota &quot;{0}&quot; ei voi siirtää kohteeseen &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
-msgstr "Lähdettä &quot;{1}&quot; ei voida avata."
+msgstr "Lähdettä &quot;{1}&quot; ei voi avata."
 
 #: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
-msgstr "Lähdettä &quot;{2}&quot; ei voida avata."
+msgstr "Lähdettä &quot;{2}&quot; ei voi avata."
 
 #: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
-msgstr "Kohdetta &quot;{2}&quot; ei voida avata."
+msgstr "Kohdetta &quot;{2}&quot; ei voi avata."
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
@@ -14540,33 +14537,34 @@
 "problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
-"Lisenssitiedostoa &quot;{0}&quot; ei voida lukea asennusongelman takia. Et "
-"voi käyttää tätä lähdettä ennen kuin voit hyväksyä lisenssin."
+"Lisenssitiedostoa &quot;{0}&quot; ei voi lukea asennusongelman takia. Et voi "
+"käyttää tätä lähdettä, ennen kuin voit hyväksyä lisenssin."
 
 #: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; ei voida nimetä uudestaan nimelle &quot;{1}&quot;."
+msgstr ""
+"Tiedostoa &quot;{0}&quot; ei voi nimetä uudestaan nimellä &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr ""
-"Järjestelmäkansiota &quot;{0}&quot; ei voida siirtää tai nimetä uudestaan."
+"Järjestelmäkansiota &quot;{0}&quot; ei voi siirtää tai nimetä uudestaan."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
-msgstr "Muutoksia tiliin ei voida tallentaa."
+msgstr "Muutoksia tiliin ei voi tallentaa."
 
 #: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "Hakemistoon &quot;{0}&quot; ei voida tallentaa."
+msgstr "Kansioon &quot;{0}&quot; ei voi tallentaa."
 
 #: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "Tiedostoon &quot;{0}&quot; ei voida tallentaa."
+msgstr "Tiedostoon &quot;{0}&quot; ei voi tallentaa."
 
 #: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "Allekirjoitus-skriptiä &quot;{0}&quot; ei voida asettaa."
+msgstr "Allekirjoitus-skriptiä &quot;{0}&quot; ei voi asettaa."
 
 #: ../mail/mail.error.xml.h:41
 msgid ""
@@ -14651,7 +14649,7 @@
 
 #: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
-msgstr "Tiedosto on jo olemassa, mutta sitä ei voida ylikirjoittaa."
+msgstr "Tiedosto on jo olemassa, mutta sitä ei voi ylikirjoittaa."
 
 #: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
@@ -14822,7 +14820,7 @@
 "be renamed, moved, or deleted."
 msgstr ""
 "Järjestelmäkansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä "
-"voida nimetä uudestaan, siirtää tai poistaa."
+"voi nimetä uudestaan, siirtää tai poistaa."
 
 #: ../mail/mail.error.xml.h:98
 msgid ""
@@ -14852,7 +14850,7 @@
 "Seuraavat hakunäkymät:\n"
 "{0}\n"
 "käyttivät poistettua kansiota:\n"
-" &quot;{0}&quot;\n"
+" &quot;{1}&quot;\n"
 "ja ne on päivitetty."
 
 #: ../mail/mail.error.xml.h:106
@@ -14886,13 +14884,13 @@
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
-"Viestiä ei voida lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
+"Viestiä ei voi lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
 "käytössä"
 
 #: ../mail/mail.error.xml.h:115
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
-msgstr "Viestiä ei voida lähettää, koska et ole määritellyt vastaanottajia"
+msgstr "Viestiä ei voi lähettää, koska et ole määritellyt vastaanottajia"
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
@@ -14982,7 +14980,7 @@
 #: ../mail/mail.error.xml.h:134
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
-"Kirjautumisesi palvelimelle &quot;{0}&quot; käyttäjänä &quot;{0}&quot; "
+"Kirjautuminen palvelimelle &quot;{0}&quot; käyttäjänä &quot;{0}&quot; "
 "epäonnistui."
 
 #: ../mail/mail.error.xml.h:135
@@ -15500,11 +15498,11 @@
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
 msgid "Bogofilter junk plugin"
-msgstr "Bogofilter-roskapostisuodatin"
+msgstr "Bogofilter-roskapostiliitännäinen"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
-msgstr "Suodattaa roskaposteja käyttäen Bogofilteriä."
+msgstr "Suodattaa roskaposteja käyttäen bogofilteriä."
 
 #: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
@@ -16108,11 +16106,11 @@
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "Cannot Delete"
-msgstr "Ei voida poistaa"
+msgstr "Ei voi poistaa"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Edit"
-msgstr "Ei voida muokata"
+msgstr "Ei voi muokata"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Create items"
@@ -16254,7 +16252,7 @@
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot display folders."
-msgstr "Kansioita ei voida näyttää."
+msgstr "Kansioita ei voi näyttää."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot perform the operation."
@@ -16661,7 +16659,7 @@
 msgid "Google sources"
 msgstr "Google-lähteet"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
 msgid "Checklist"
 msgstr "Muistilista"
 
@@ -17108,7 +17106,7 @@
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
-msgstr "_iPodin synkronointi"
+msgstr "iPod-synkronointi"
 
 #: ../plugins/itip-formatter/itip-formatter.c:444
 #: ../plugins/itip-formatter/itip-formatter.c:569
@@ -17227,13 +17225,13 @@
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Muistilapun tietoja ei voitu lähettää, koska muistilappua ei löydy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1374
 msgid "The calendar attached is not valid"
 msgstr "Liitetty kalenteri ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../plugins/itip-formatter/itip-formatter.c:1364
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17241,15 +17239,15 @@
 "Viesti väittää sisältävänsä kalenterin, mutta kalenteri ei ole kelvollinen "
 "iCalendar-tiedosto."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1510
 msgid "The item in the calendar is not valid"
 msgstr "Kalenterin sisältö ei ole kelvollinen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../plugins/itip-formatter/itip-formatter.c:1411
+#: ../plugins/itip-formatter/itip-formatter.c:1429
+#: ../plugins/itip-formatter/itip-formatter.c:1511
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17257,11 +17255,11 @@
 "Viesti sisältää kalenterin, mutta kalenterissa ei ole tapahtumia, tehtäviä "
 "tai vapaa/varattu-tietoja."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1440
 msgid "The calendar attached contains multiple items"
 msgstr "Liitetyssä kalenterissa on useita kohtia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1441
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17269,37 +17267,37 @@
 "Jos haluat käsitellä kaikki nämä kohdat, tiedosto täytyy tallentaa ja avata "
 "tuomalla tiedosto kalenteriin"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2140
 msgid "This meeting recurs"
 msgstr "Tapaaminen on _toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2143
 msgid "This task recurs"
 msgstr "Tehtävä on toistuva"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2146
 msgid "This memo recurs"
 msgstr "Muistilappu on toistuva"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2375
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2385
+#: ../plugins/itip-formatter/itip-formatter.c:2417
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2400
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../widgets/misc/e-cell-date-edit.c:241
 msgid "Today"
 msgstr "Tänään"
 
@@ -17971,7 +17969,7 @@
 #: ../plugins/mail-to-task/mail-to-task.c:270
 #, c-format
 msgid "Cannot open calendar. %s"
-msgstr "Kalenteria ei voida avata: %s"
+msgstr "Kalenteria ei voi avata: %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:275
 msgid ""
@@ -18171,7 +18169,7 @@
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
-msgstr "Merkitse kaikki _luetuksi"
+msgstr "Merkitse kaikki luetuksi"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
 msgid "Mark Me_ssages as Read"
@@ -18275,19 +18273,19 @@
 msgid "Prefer plain-text"
 msgstr "Suosi raakatekstiä"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:158
 msgid "Show HTML if present"
 msgstr "Näytä HTML:ää, jos se on saatavilla"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:159
 msgid "Prefer PLAIN"
 msgstr "Näytä mieluummin raakatekstiä"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:160
 msgid "Only ever show PLAIN"
 msgstr "Näytä ainoastaan raakatekstiä"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:203
 msgid "HTML _Mode"
 msgstr "HTML-_tila"
 
@@ -18986,7 +18984,6 @@
 "Ilkka Tuohela, 2002-2008\n"
 "Sami Pesonen, 2001-2003\n"
 "Jarkko Ranta, 2000-2001\n"
-"Timo Jyrinki, 2008\n"
 "\n"
 "http://gnome.fi/"
 
@@ -19040,7 +19037,7 @@
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
@@ -19968,7 +19965,7 @@
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Tallenna yhteystiedot valitussa kansiossa VCardina"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Valitse kaikki"
 
@@ -21219,7 +21216,7 @@
 
 #: ../ui/evolution-message-composer.xml.h:19
 msgid "R_equest Read Receipt"
-msgstr "Pyydä _kuittausta"
+msgstr "Pyydä luku_kuittausta"
 
 #: ../ui/evolution-message-composer.xml.h:20
 msgid "S/MIME En_crypt"
@@ -21782,7 +21779,7 @@
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Lähennä kartalla vasemmalla hiiren napilla haluamallesi alueelle ja valitse "
+"Lähennä kartalla hiiren ykkösnapilla haluamallesi alueelle ja valitse "
 "aikavyöhyke.\n"
 "Loitonna kartalla oikealla hiiren napilla."
 
@@ -21808,7 +21805,7 @@
 msgstr "Määrittele %s näkymät"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
@@ -21932,23 +21929,23 @@
 msgstr "Kuukausikalenteri"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Täytön väri"
 
 #: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "GDK:n täyttöväri"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Täytön kuviopeite"
 
@@ -21991,11 +21988,11 @@
 msgid "Spacing"
 msgstr "Välistys"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:233
 msgid "Now"
 msgstr "Nyt"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:797
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
@@ -22117,19 +22114,19 @@
 msgid "Combo box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:486
 msgid "No_w"
 msgstr "N_yt"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:492
 msgid "_Today"
 msgstr "_Tänään"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1657
 msgid "Invalid Date Value"
 msgstr "Virheellinen päivämäärä"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1686
 msgid "Invalid Time Value"
 msgstr "Virheellinen ajan kuvaus"
 
@@ -22298,8 +22295,8 @@
 msgid "Item ID"
 msgstr "Kohteen ID"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Teksti"
 
@@ -22508,7 +22505,7 @@
 msgid "categories"
 msgstr "luokat"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "ponnahduslista"
 
@@ -22528,23 +22525,23 @@
 msgid "Unselected Column"
 msgstr "Valitsematon sarake"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr "Yliviivattu sarake"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "Alleviivaa sarake"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr "Vahva sarake"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr "Värillinen sarake"
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr "Taustan värinen sarake"
 
@@ -22582,7 +22579,7 @@
 msgstr "Valittavat kentät:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Nouseva"
 
@@ -22595,7 +22592,7 @@
 msgstr "Tyhjennä k_aikki"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Laskeva"
 
@@ -22658,14 +22655,14 @@
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:634
 #: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "DnD-koodi"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:641
 #: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "Täysi otsake"
 
@@ -22777,73 +22774,73 @@
 msgid "Frozen"
 msgstr "Jäädytetty"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Muokkaa nykyistä näkymää"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "järjestä _nousevasti"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "Järjestä _laskevasti"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "Poista _järjestys"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "Ryhmittele tämän _kentän mukaan"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "Ryhmittele _laatikoittain"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "Poista tämä sa_rake"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "Lisää sarake..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "_Tasaus"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "_Paras sovitus"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "Muotoile _sarakkeet..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "_Mukauta nykyistä näkymää..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Järjestystapa"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_Oma"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Kirjasimen kuvaus"
 
-#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-header-item.c:1915
 #: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Tietoja järjestyksestä"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-table-header-item.c:1929
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
@@ -22882,262 +22879,106 @@
 msgid "Draw lines and +/- expanders."
 msgstr "Piirrä viivat ja +/- laajentimet."
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Syötemenetelmät"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Tapahtumaprosessori"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Vahva"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Yliviivattu"
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Ankkuri"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Asemointi"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Leikkeen leveys"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Leikkeen korkeus"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Leike"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "Täytä leikkauksen suorakulmio"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X-offset"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y-offset"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Tekstin leveys"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Tekstin korkeus"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Käytä ellipsejä"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Ellipsit"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Rivitys"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Katkaisevat merkit"
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Rivejä enintään"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Piirrä reunat"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Salli rivinvaihdot"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Piirrä tausta"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Piirrä nappi"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Kohdistimen sijainti"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM-konteksti"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
-
-#~ msgid "Display"
-#~ msgstr "Näytä"
-
-#~ msgid "Server Information"
-#~ msgstr "Palvelimen tiedot"
-
-#~ msgid "Select Drafts Folder"
-#~ msgstr "Valitse luonnosten kansio"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "Valitse lähetettyjen kansio"
-
-#~ msgid "_Categories..."
-#~ msgstr "_Luokat..."
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "Add an email to the List"
-#~ msgstr "Lisää sähköposti listalle"
-
-#~ msgid "Insert email addresses from Address Book"
-#~ msgstr "Lisää sähköpostiosoite osoitekirjasta"
-
-#~ msgid "Members"
-#~ msgstr "Jäsenet"
-
-#~ msgid "Remove an email address from the List"
-#~ msgstr "Poista sähköpostiosoite listalta"
-
-#~ msgid "_Select"
-#~ msgstr "_Valitse"
-
-#~ msgid "Or_ganiser:"
-#~ msgstr "_Järjestäjä:"
-
-#~ msgid "Task sort"
-#~ msgstr "Tehtävän tyyppi"
-
-#~ msgid "Memo sort"
-#~ msgstr "Muistilappujen järjestys"
-
-#~ msgid "SMTWTFS"
-#~ msgstr "SMTKTPL"
-
-#~ msgid "Post To:"
-#~ msgstr "_Postita:"
-
-#~ msgid "The Evolution PIM and Email Client"
-#~ msgstr "Evolution, sähköposti- ja ajanhallintaohjelma"
-
-#~ msgid "_Search name:"
-#~ msgstr "_Haun nimi::"
-
-#~ msgid "Di_sable"
-#~ msgstr "_Ei käytössä"
-
-#~ msgid "Automatic smiley recognition"
-#~ msgstr "_Havaitse hymiöt automaattisesti"
-
-#~ msgid "New Mail Notify sound file"
-#~ msgstr "Uudesta postista huomauttava äänitiedosto"
-
-#~ msgid "New Mail Notify type"
-#~ msgstr "Uutta postia -huomautuksen tyyppi"
-
-#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
-#~ msgstr ""
-#~ "Määrittelee saapuneiden viestien huomautuksen, jota käyttäjä haluaa "
-#~ "käyttää."
-
-#~ msgid "Labels and Colors"
-#~ msgstr "Merkinnät ja värit"
-
-#~ msgid "New Mail Notification"
-#~ msgstr "Huomautus uusista viesteistä"
-
-#~ msgid "HTML Mail"
-#~ msgstr "HTML-viesti"
-
-#~ msgid "Se_lect..."
-#~ msgstr "_Valitse..."
-
-#~ msgid "_Beep when new mail arrives"
-#~ msgstr "_Piippaa, kun uusia viestejä saapuu"
-
-#~ msgid "_Do not notify me when new mail arrives"
-#~ msgstr "_Älä huomauta uuden sähköpostin saapumisesta"
-
-#~ msgid "Attachment Reminder Preferences"
-#~ msgstr "Liitemuistuttajan ominaisuudet"
-
-#~ msgid "Select a (48*48) png of size < 720bytes"
-#~ msgstr "Valitse (48x48) png-tiedosto, jonka koko on <720 tavua"
-
-#~ msgid "_Contacts..."
-#~ msgstr "_Yhteystiedot..."
-
-#~ msgid "Every time a new mail arrives, pop up a libnotify notification."
-#~ msgstr "Aina kun uusi viesti saapuu, ponnauta libnotify-huomautusikkuna."
-
-#~ msgid "Make the status icon blink"
-#~ msgstr "Laita tilakuvake vilkkumaan"
-
-#~ msgid "When the new-mail status icon is visible, make it blink."
-#~ msgstr "Laita uusien viestien tilakuvake vilkkumaan, kun on näkyvissä."
-
-#~ msgid "System error: %s"
-#~ msgstr "Järjestelmävirhe: %s"
-
-#~ msgid "Camel error: %s"
-#~ msgstr "Camelin virhe: %s"
-
-#~ msgid "Account cannot send e-mail"
-#~ msgstr "Tili ei voi lähettää sähköpostia"
-
-#~ msgid "No store available"
-#~ msgstr "Ei tallennustilaa käytettävissä"
-
-#~ msgid ""
-#~ "A plugin which implements a CORBA interface for accessing mail data "
-#~ "remotely."
-#~ msgstr ""
-#~ "Liitännäinen, joka toteuttaa CORBA-rajapinnan sähköpostin lukemiseen "
-#~ "muista ohjelmista."
-
-#~ msgid "Mail Remote"
-#~ msgstr "Sähköpostin etäkäyttö"
-
-#~ msgid "New Mail Notification"
-#~ msgstr "Huomautus uudesta sähköpostista"
-
-#~ msgid "Configure"
-#~ msgstr "Määrittele"
-
-#~ msgid "Download messages for offline"
-#~ msgstr "Nouda viestit yhteydetöntä käyttöä varten"
-
-#~ msgid "_Phone List"
-#~ msgstr "_Puhelinnumerot"
-
-#~ msgid "MTWTFSS"
-#~ msgstr "MTKTPLS"
-
-#~ msgid "<- _Remove"
-#~ msgstr "<- _Poista"
-
-#~ msgid "Sh_ow these fields in order:"
-#~ msgstr "_Näytä nämä kentät järjestyksessä:"
-
-#~ msgid "_Add ->"
-#~ msgstr "_Lisää ->"
-
-#~ msgid "Emulate label resize"
-#~ msgstr "Emuloi otsikon koon muutosta"
Index: po/hu.po
===================================================================
--- po/hu.po	(revision 35318)
+++ po/hu.po	(working copy)
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-23 20:44+0000\n"
-"PO-Revision-Date: 2008-03-06 02:10+0100\n"
+"POT-Creation-Date: 2008-03-27 11:30+0000\n"
+"PO-Revision-Date: 2008-04-07 14:57+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@fsf.hu>\n"
 "MIME-Version: 1.0\n"
@@ -171,7 +171,7 @@
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../calendar/gui/calendar-component.c:750
 #: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2158
+#: ../calendar/gui/e-day-view.c:2162
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -205,7 +205,7 @@
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../calendar/gui/calendar-component.c:776
 #: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2174
+#: ../calendar/gui/e-day-view.c:2178
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
@@ -350,7 +350,9 @@
 msgid ""
 "'{0}' is a read-only address book source. Switch to Contacts View and "
 "highlight an address book that can accept contacts."
-msgstr "„{0}” egy csak olvasható címjegyzékforrás. Váltson a Névjegyek nézetre és jelöljön ki egy olyan címjegyzéket, amely elfogadhatja a névjegyeket."
+msgstr ""
+"„{0}” egy csak olvasható címjegyzékforrás. Váltson a Névjegyek nézetre és "
+"jelöljön ki egy olyan címjegyzéket, amely elfogadhatja a névjegyeket."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -727,13 +729,13 @@
 msgstr "A _címjegyzék tartalmáról helyi másolat készítése kapcsolat nélküli munkához"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2343
+#: ../plugins/itip-formatter/itip-formatter.c:2353
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Általános"
@@ -753,7 +755,7 @@
 msgstr "Hitelesítés"
 
 #: ../addressbook/gui/component/addressbook-config.c:991
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Részletek"
@@ -768,7 +770,7 @@
 msgstr "Letöltés"
 
 #: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Címjegyzék tulajdonságai"
 
@@ -862,10 +864,10 @@
 #: ../addressbook/gui/component/addressbook-view.c:958
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1385
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/e-calendar-table.c:1387
+#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
 #: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1346
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -976,103 +978,95 @@
 msgstr "Hitelesítés"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "Display"
-msgstr "Megjelenítés"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Downloading"
 msgstr "Letöltés"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "Searching"
 msgstr "Keresés"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Server Information"
-msgstr "Kiszolgálóinformáció"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Type:"
 msgstr "Típus: "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Címjegyzék hozzáadása"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 #: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "Mindig"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Névtelenül"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Basic"
 msgstr "Alap"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Distinguished name"
 msgstr "Megkülönböztető név"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Email address"
 msgstr "E-mail cím"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "Az Evolution ezt az e-mail címet használja majd hitelesítéshez a kiszolgálón."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Find Possible Search Bases"
 msgstr "Lehetséges keresési alapok keresése"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Lo_gin:"
 msgstr "_Bejelentkezés:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "Soha"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../mail/em-account-editor.c:304
 msgid "No encryption"
 msgstr "Nincs titkosítás"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "One"
 msgstr "Egy"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:312
 msgid "SSL encryption"
 msgstr "SSL titkosítás"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search Filter"
 msgstr "Keresési szűrő"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "_Keresés kiindulópontja:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search _filter:"
 msgstr "Keresési s_zűrő:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search filter"
 msgstr "Keresési szűrő"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by default search will be performed on "
@@ -1082,7 +1076,7 @@
 "Ennek módosítása nélkül a keresés a „személy” objektumosztályán lesz "
 "végrehajtva."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1090,7 +1084,7 @@
 "Ha engedélyezi ezt a beállítást, akkor az Evolution csak akkor kapcsolódik "
 "az LDAP-kiszolgálóhoz, ha az támogatja az SSL protokollt."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1099,7 +1093,7 @@
 "az LDAP-kiszolgálóhoz, ha az támogatja a TLS protokollt."
 
 # fixme exploitra magyar kifejezés?
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1109,23 +1103,23 @@
 "a TLS protokollt. Emiatt a kapcsolat nem lesz biztonságos és sebezhetővé "
 "válik a biztonsági hibákkal szemben."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Támogatott keresési típusok"
 
 #. 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
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 #: ../mail/em-account-editor.c:308
 msgid "TLS encryption"
 msgstr "TLS titkosítás"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1135,7 +1129,7 @@
 "kezdődik majd. Amennyiben üresen hagyja, a keresés a könyvtárfa gyökerében "
 "fog kezdődni."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1144,16 +1138,16 @@
 msgstr ""
 "A keresés hatóköre meghatározza, hogy milyen mélységben szeretne keresni "
 "lefelé a könyvtárszerkezetben. Egy „sub” keresési hatókör tartalmazza az "
-"összes bejegyzést a keresési alaptól lefelé. Egy „one” keresési hatókör "
-"csak egy szinttel fog a keresési alap alá menni."
+"összes bejegyzést a keresési alaptól lefelé. Egy „one” keresési hatókör csak "
+"egy szinttel fog a keresési alap alá menni."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ez az LDAP-kiszolgáló teljes neve. Például „ldap.encegem.hu”."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1161,18 +1155,18 @@
 "A letöltendő bejegyzések maximális száma. Ha túl nagyra állítja ezt az "
 "értéket, akkor lelassul a címjegyzéke."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the method Evolution will use to authenticate you. Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 "Az Evolution az itt megjelölésre kerülő eljárást használja az Ön "
-"hitelesítésére. Ne felejtse el, hogy az „E-mail cím használatával” "
-"beállítás igényli az azonosító nélküli bejelentkezési lehetőséget az Ön LDAP "
+"hitelesítésére. Ne felejtse el, hogy az „E-mail cím használatával” beállítás "
+"igényli az azonosító nélküli bejelentkezési lehetőséget az Ön LDAP "
 "kiszolgálóján."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1180,7 +1174,7 @@
 "A kiszolgáló ezen a néven jelenik majd meg az Evolution mappalistájában. "
 "Ennek csak a megjelenítésben van szerepe. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1190,35 +1184,35 @@
 "LDAP-kiszolgálóhoz. Az általános portok megtalálhatók a listában. Kérdezze \n"
 "meg a rendszergazdát, hogy melyik portot kell beállítania."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Megkülönböztető névvel (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "E-mail cím használatával"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Whenever Possible"
 msgstr "Amikor csak lehetséges"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Address Book"
 msgstr "_Címjegyzék hozzáadása"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Letöltési korlát:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Find Possible Search Bases"
 msgstr "_Lehetséges keresési alapok keresése"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Login method:"
 msgstr "_Bejelentkezési mód:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 #: ../calendar/gui/dialogs/calendar-setup.c:229
 #: ../mail/mail-config.glade.h:164
 #: ../plugins/groupwise-features/properties.glade.h:11
@@ -1226,33 +1220,33 @@
 msgid "_Name:"
 msgstr "_Név:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "_Search scope:"
 msgstr "_Keresés hatóköre:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 #: ../mail/mail-config.glade.h:172
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Kiszolgáló:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Timeout:"
 msgstr "_Várakozási idő:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Use secure connection:"
 msgstr "_Biztonságos kapcsolat használata:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "cards"
 msgstr "kártya"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
@@ -2950,8 +2944,8 @@
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:935
 #: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1363
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:922
+#: ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Megnyitás"
@@ -3007,9 +3001,9 @@
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
 #: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:930
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
+#: ../calendar/gui/e-calendar-table.c:1373
+#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:996
 #: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
@@ -3424,12 +3418,12 @@
 msgstr "Webnapló"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2327
+#: ../calendar/gui/e-calendar-view.c:2335
 msgid "Birthday"
 msgstr "Születésnap"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2328
+#: ../calendar/gui/e-calendar-view.c:2336
 msgid "Anniversary"
 msgstr "Évforduló"
 
@@ -4099,7 +4093,9 @@
 msgid ""
 "'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
 "a calendar that can accept appointments."
-msgstr "„{0}” egy csak olvasható naptárforrás. Váltson a Naptár nézetre és jelöljön ki egy olyan naptárat, amely elfogadhatja az értekezleteket."
+msgstr ""
+"„{0}” egy csak olvasható naptárforrás. Váltson a Naptár nézetre és jelöljön "
+"ki egy olyan naptárat, amely elfogadhatja az értekezleteket."
 
 #: ../calendar/calendar.error.xml.h:3
 msgid ""
@@ -4504,7 +4500,7 @@
 msgstr "Nem írható a pilot ToDo alkalmazásblokkja"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2334
+#: ../plugins/itip-formatter/itip-formatter.c:2344
 msgid "Calendar and Tasks"
 msgstr "Naptár és feladatok"
 
@@ -4550,7 +4546,7 @@
 msgstr "_Feljegyzések"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
 #: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
 #: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
 #: ../calendar/gui/memos-control.c:372
@@ -4558,7 +4554,7 @@
 msgstr "Feljegyzések"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1441
+#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
 #: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
 #: ../calendar/gui/tasks-component.c:539
 #: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
@@ -5061,7 +5057,9 @@
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Az alapértelmezett emlékeztetőhöz használt időegység, lehetséges értékek: „minutes” (perc), „hours” (óra) vagy „days” (nap)."
+msgstr ""
+"Az alapértelmezett emlékeztetőhöz használt időegység, lehetséges értékek: "
+"„minutes” (perc), „hours” (óra) vagy „days” (nap)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
@@ -5283,14 +5281,14 @@
 
 #: ../calendar/gui/calendar-component.c:606
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2085
 msgid "_Copy..."
 msgstr "_Másolás..."
 
 #: ../calendar/gui/calendar-component.c:612
 #: ../calendar/gui/dialogs/comp-editor.c:1130
 #: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
+#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2099
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "T_ulajdonságok"
@@ -5920,13 +5918,13 @@
 msgstr[1] "%d mellékelt üzenet"
 
 #: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
 #: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
 msgid "_Move"
 msgstr "Á_thelyezés"
 
 #: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
+#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2068
 msgid "Cancel _Drag"
 msgstr "_Mégsem mozgatom"
 
@@ -6234,7 +6232,7 @@
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:205
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2011
+#: ../plugins/itip-formatter/itip-formatter.c:2021
 #: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
 #: ../widgets/misc/e-dateedit.c:1745
 #: ../widgets/misc/e-signature-combo-box.c:50
@@ -6904,8 +6902,8 @@
 #: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
 #: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
 #: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:405
-#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../plugins/itip-formatter/itip-formatter.c:2046
 #: ../plugins/plugin-manager/plugin-manager.c:84
 #: ../widgets/misc/e-attachment-bar.c:721
 #: ../widgets/misc/e-charset-picker.c:64
@@ -6933,8 +6931,8 @@
 msgid "untitled_image.%s"
 msgstr "Névtelen_kép.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
+#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
 #: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
 msgid "_Save As..."
 msgstr "M_entés másként..."
@@ -7002,77 +7000,77 @@
 msgid "Deleting selected objects"
 msgstr "Kijelölt objektumok törlése"
 
-#: ../calendar/gui/e-calendar-table.c:952
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-table.c:954
+#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "Objektumok frissítése"
 
-#: ../calendar/gui/e-calendar-table.c:1137
-#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:819
+#: ../calendar/gui/e-calendar-table.c:1139
+#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
 #: ../composer/e-msg-composer.c:1472
 msgid "Save as..."
 msgstr "Mentés másként..."
 
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-table.c:1362
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "New _Task"
 msgstr "Új fela_dat"
 
-#: ../calendar/gui/e-calendar-table.c:1364 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "_Weboldal megnyitása"
 
-#: ../calendar/gui/e-calendar-table.c:1366
-#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "N_yomtatás..."
 
-#: ../calendar/gui/e-calendar-table.c:1370
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Kivágás"
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1666
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1374
+#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Beillesztés"
 
-#: ../calendar/gui/e-calendar-table.c:1376 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Feladat kiosztása"
 
-#: ../calendar/gui/e-calendar-table.c:1377 ../calendar/gui/e-memo-table.c:935
+#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Továbbítás iCalendar-ként"
 
-#: ../calendar/gui/e-calendar-table.c:1378
+#: ../calendar/gui/e-calendar-table.c:1380
 msgid "_Mark as Complete"
 msgstr "Me_gjelölés készként"
 
-#: ../calendar/gui/e-calendar-table.c:1379
+#: ../calendar/gui/e-calendar-table.c:1381
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Kijelölt feladatok megjelölése készként"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1382
 msgid "_Mark as Incomplete"
 msgstr "Megjelölés _befejezetlenként"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1383
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Kijelölt fel_adatok megjelölése befejezetlenként"
 
-#: ../calendar/gui/e-calendar-table.c:1386
+#: ../calendar/gui/e-calendar-table.c:1388
 msgid "_Delete Selected Tasks"
 msgstr "_Kijelölt feladatok törlése"
 
-#: ../calendar/gui/e-calendar-table.c:1623
+#: ../calendar/gui/e-calendar-table.c:1625
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kattintson ide új feladat hozzáadásához"
@@ -7110,105 +7108,105 @@
 msgid "Status"
 msgstr "Állapot"
 
-#: ../calendar/gui/e-calendar-view.c:1346
+#: ../calendar/gui/e-calendar-view.c:1352
 msgid "Moving items"
 msgstr "Elemek áthelyezése"
 
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1354
 msgid "Copying items"
 msgstr "Elemek másolása"
 
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "New _Appointment..."
 msgstr "Új érte_kezlet..."
 
-#: ../calendar/gui/e-calendar-view.c:1658
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "New All Day _Event"
 msgstr "Ú_j egész napos esemény"
 
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1665
 msgid "New _Meeting"
 msgstr "Új _találkozó"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1676
 msgid "_Current View"
 msgstr "_Jelenlegi nézet"
 
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1678
 msgid "Select T_oday"
 msgstr "_Mai nap kiválasztása"
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1679
 msgid "_Select Date..."
 msgstr "Dátum _kiválasztása..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "Pri_nt..."
 msgstr "N_yomtatás..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "Cop_y to Calendar..."
 msgstr "Na_ptárba másolás..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Mo_ve to Calendar..."
 msgstr "Á_thelyezés naptárba..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "_Delegate Meeting..."
 msgstr "_Találkozó átruházása..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1698
 msgid "_Schedule Meeting..."
 msgstr "Találkozó _ütemezése..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1699
 msgid "_Forward as iCalendar..."
 msgstr "_Továbbítás iCalendar-ként..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1700
 msgid "_Reply"
 msgstr "_Válasz"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1336
+#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
 #: ../mail/em-popup.c:576 ../mail/em-popup.c:587
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Vál_asz mindenkinek"
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1706
 msgid "Make this Occurrence _Movable"
 msgstr "Ezen előfordulás _mozgathatóvá tétele"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Az _előfordulás törlése"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1708
 msgid "Delete _All Occurrences"
 msgstr "Az ö_sszes előfordulás törlése"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2202
+#: ../calendar/gui/e-calendar-view.c:2208
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Szervező: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2206
+#: ../calendar/gui/e-calendar-view.c:2212
 #, c-format
 msgid "Organizer: %s"
 msgstr "Szervező: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
 #, c-format
 msgid "Location: %s"
 msgstr "Hely: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2262
 #, c-format
 msgid "Time: %s %s"
 msgstr "Idő: %s %s"
@@ -7248,21 +7246,21 @@
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:1359
-#: ../calendar/gui/e-day-view.c:2141
+#: ../calendar/gui/e-day-view.c:2145
 #: ../calendar/gui/e-week-view-main-item.c:310
 #: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%B %d, %A"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:766 ../calendar/gui/e-day-view.c:1119
-#: ../calendar/gui/e-week-view.c:507 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:770 ../calendar/gui/e-day-view.c:1123
+#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
 msgid "am"
 msgstr "de"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
-#: ../calendar/gui/e-week-view.c:510 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
+#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "du"
 
@@ -7408,12 +7406,12 @@
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
 #: ../calendar/gui/itip-utils.c:728
-#: ../plugins/itip-formatter/itip-formatter.c:2024
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "Elfogadva"
 
 #: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
-#: ../plugins/itip-formatter/itip-formatter.c:2027
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Feltételesen elfogadva"
 
@@ -7421,7 +7419,7 @@
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
 #: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
-#: ../plugins/itip-formatter/itip-formatter.c:2030
+#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Declined"
 msgstr "Elutasítva"
 
@@ -7616,74 +7614,74 @@
 msgid "The attachment has no viewable calendar items"
 msgstr "A melléklet nem tartalmaz megnézhető naptárelemet"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1957
 msgid "Update complete\n"
 msgstr "Frissítés kész\n"
 
-#: ../calendar/gui/e-itip-control.c:1988
+#: ../calendar/gui/e-itip-control.c:1991
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Az objektum érvénytelen és nem frissíthető\n"
 
-#: ../calendar/gui/e-itip-control.c:2005
+#: ../calendar/gui/e-itip-control.c:2008
 msgid "This response is not from a current attendee. Add as an attendee?"
 msgstr "A válasz olyantól érkezett, aki nem résztvevő. Hozzáadja a résztvevőkhöz?"
 
-#: ../calendar/gui/e-itip-control.c:2023
+#: ../calendar/gui/e-itip-control.c:2026
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "A résztvevő állapotát nem lehetett frissíteni, mert az állapot érvénytelen!\n"
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2050
 msgid "Attendee status updated\n"
 msgstr "A résztvevő állapota frissítve\n"
 
-#: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1242
+#: ../calendar/gui/e-itip-control.c:2057
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "A résztvevő állapotát nem lehetett frissíteni, mert az elem nem létezik többé"
 
-#: ../calendar/gui/e-itip-control.c:2085 ../calendar/gui/e-itip-control.c:2142
+#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
 msgid "Item sent!\n"
 msgstr "Elküldve!\n"
 
-#: ../calendar/gui/e-itip-control.c:2091 ../calendar/gui/e-itip-control.c:2150
+#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
 msgid "The item could not be sent!\n"
 msgstr "Az elemet nem lehetett elküldeni!\n"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2233
 msgid "Choose an action:"
 msgstr "Válasszon egy műveletet:"
 
-#: ../calendar/gui/e-itip-control.c:2301
+#: ../calendar/gui/e-itip-control.c:2304
 msgid "Update"
 msgstr "Frissítés"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2332
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Elfogadva"
 
-#: ../calendar/gui/e-itip-control.c:2330
+#: ../calendar/gui/e-itip-control.c:2333
 msgid "Tentatively accept"
 msgstr "Feltételes elfogadás"
 
-#: ../calendar/gui/e-itip-control.c:2331
+#: ../calendar/gui/e-itip-control.c:2334
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Elutasítva"
 
-#: ../calendar/gui/e-itip-control.c:2360
+#: ../calendar/gui/e-itip-control.c:2363
 msgid "Send Free/Busy Information"
 msgstr "Időbeosztás küldése"
 
-#: ../calendar/gui/e-itip-control.c:2388
+#: ../calendar/gui/e-itip-control.c:2391
 msgid "Update respondent status"
 msgstr "Válaszoló állapotának frissítése"
 
-#: ../calendar/gui/e-itip-control.c:2416
+#: ../calendar/gui/e-itip-control.c:2419
 msgid "Send Latest Information"
 msgstr "Legutóbbi információ küldése"
 
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Mégsem"
@@ -7795,7 +7793,7 @@
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
 #: ../calendar/gui/itip-utils.c:737
-#: ../plugins/itip-formatter/itip-formatter.c:2033
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "Átruházva"
 
@@ -7928,15 +7926,15 @@
 msgid "Member"
 msgstr "Tag"
 
-#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-memo-table.c:942
 msgid "_Delete Selected Memos"
 msgstr "_Kijelölt feljegyzés törlése"
 
-#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Kattintson ide új feljegyzés hozzáadásához"
 
-#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
+#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
 #: ../calendar/gui/gnome-cal.c:2871
 #, c-format
 msgid ""
@@ -7946,33 +7944,33 @@
 "Hiba a következőben %s:\n"
 "%s"
 
-#: ../calendar/gui/e-memos.c:839
+#: ../calendar/gui/e-memos.c:840
 msgid "Loading memos"
 msgstr "Feljegyzések betöltése"
 
-#: ../calendar/gui/e-memos.c:920
+#: ../calendar/gui/e-memos.c:921
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Feljegyzések megnyitása %s-kor"
 
-#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1333
+#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
 msgid "Deleting selected objects..."
 msgstr "Kijelölt objektumok törlése..."
 
-#: ../calendar/gui/e-tasks.c:975
+#: ../calendar/gui/e-tasks.c:976
 msgid "Loading tasks"
 msgstr "Feladatok betöltése"
 
-#: ../calendar/gui/e-tasks.c:1065
+#: ../calendar/gui/e-tasks.c:1066
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Feladatok megnyitása %s-kor"
 
-#: ../calendar/gui/e-tasks.c:1310
+#: ../calendar/gui/e-tasks.c:1311
 msgid "Completing tasks..."
 msgstr "Feladatok befejezése..."
 
-#: ../calendar/gui/e-tasks.c:1360
+#: ../calendar/gui/e-tasks.c:1361
 msgid "Expunging"
 msgstr "Tisztítás"
 
@@ -8134,7 +8132,7 @@
 msgid "iCalendar information"
 msgstr "iCalendar információ"
 
-#: ../calendar/gui/itip-utils.c:1008
+#: ../calendar/gui/itip-utils.c:1009
 msgid "You must be an attendee of the event."
 msgstr "Részt kell vennie az eseményen."
 
@@ -8552,7 +8550,7 @@
 
 #: ../calendar/importers/icalendar-importer.c:337
 #: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1570
+#: ../plugins/itip-formatter/itip-formatter.c:1580
 msgid "Opening calendar"
 msgstr "Naptár megnyitása"
 
@@ -10387,7 +10385,7 @@
 msgid "_Do not Recover"
 msgstr "_Ne állítsa helyre"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
 msgid "_Recover"
 msgstr "_Helyreállítás"
 
@@ -10399,7 +10397,7 @@
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution levelező és naptár"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
 msgid "Groupware Suite"
 msgstr "Csoportmunka-szoftver"
 
@@ -11434,7 +11432,7 @@
 msgstr "Piszkozatok"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
+#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2535
 #: ../mail/mail-component.c:156
 #: ../plugins/exchange-operations/exchange-delegates-user.c:88
 #: ../plugins/exchange-operations/exchange-folder.c:593
@@ -11501,20 +11499,20 @@
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nem lehet üzeneteket egy felsőszintű tárolóba helyezni"
 
-#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "Másolás ma_ppába"
 
-#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Át_helyezés mappába"
 
-#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mappák pásztázása a következőn: „%s”"
 
-#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
@@ -11522,32 +11520,32 @@
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2078
 msgid "Open in _New Window"
 msgstr "Megnyitás ú_j ablakban"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2083
 msgid "_New Folder..."
 msgstr "Új _mappa..."
 
-#: ../mail/em-folder-tree.c:2103
+#: ../mail/em-folder-tree.c:2086
 msgid "_Move..."
 msgstr "Á_thelyezés..."
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "Á_tnevezés..."
 
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2094
 msgid "Re_fresh"
 msgstr "_Frissítés"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2095
 msgid "Fl_ush Outbox"
 msgstr "_Postázandók elküldése"
 
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "K_uka ürítése"
 
@@ -12331,7 +12329,9 @@
 
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "Allows evolution to display text part of limited size"
-msgstr "Lehetővé teszi az Evolution számára korlátozott méretű szöveges rész megjelenítését"
+msgstr ""
+"Lehetővé teszi az Evolution számára korlátozott méretű szöveges rész "
+"megjelenítését"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "Always request read receipt"
@@ -12448,9 +12448,10 @@
 "can be slow, if remote addressbooks (like ldap) are marked for "
 "autocompletion."
 msgstr ""
-"Meghatározza, hogy a címjegyzékben megkeresendő-e a feladó e-mail címe"
-"Ha megtalálható, akkor ez nem levélszemét. Ez az automatikus kiegészítésre "
-"megjelölt címjegyzékekben keres. Ez lassú lehet, ha távoli címjegyzékek (például ldap) vannak megjelölve az automatikus kiegészítéshez."
+"Meghatározza, hogy a címjegyzékben megkeresendő-e a feladó e-mail címeHa "
+"megtalálható, akkor ez nem levélszemét. Ez az automatikus kiegészítésre "
+"megjelölt címjegyzékekben keres. Ez lassú lehet, ha távoli címjegyzékek "
+"(például ldap) vannak megjelölve az automatikus kiegészítéshez."
 
 #: ../mail/evolution-mail.schemas.in.h:29
 msgid "Determines whether to use custom headers to check for junk"
@@ -12462,15 +12463,17 @@
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 msgstr ""
-"Meghatározza, hogy egyéni fejlécek használandók-e a szemét vizsgálatához."
-"Ha engedélyezett és a fejlécek is meg lettek adva, akkor ez javítani fogja a "
+"Meghatározza, hogy egyéni fejlécek használandók-e a szemét vizsgálatához.Ha "
+"engedélyezett és a fejlécek is meg lettek adva, akkor ez javítani fogja a "
 "szemét ellenőrzési sebességét."
 
 #: ../mail/evolution-mail.schemas.in.h:31
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
-msgstr "Meghatározza, hogy a függőleges nézet „Üzenetek” oszlopában ugyanazok a betűkészletek használandók-e a „Feladó” és „Tárgy” sorokban."
+msgstr ""
+"Meghatározza, hogy a függőleges nézet „Üzenetek” oszlopában ugyanazok a "
+"betűkészletek használandók-e a „Feladó” és „Tárgy” sorokban."
 
 #: ../mail/evolution-mail.schemas.in.h:32
 msgid "Directory for loading/attaching files to composer."
@@ -12536,8 +12539,8 @@
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr ""
-"A szóköz billentyű használatának engedélyezése az üzenetek görgetéséhez az előnézetben, az "
-"üzenetlistában és a mappákban."
+"A szóköz billentyű használatának engedélyezése az üzenetek görgetéséhez az "
+"előnézetben, az üzenetlistában és a mappákban."
 
 #: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable to render message text part of limited size."
@@ -12596,8 +12599,8 @@
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
 msgstr ""
-"Engedélyezi/tiltja az ismétlődő kérdéseket, amely ismételten rákérdez az offline "
-"szinkronizálás szükségességére kapcsolat nálküli módra váltás előtt."
+"Engedélyezi/tiltja az ismétlődő kérdéseket, amely ismételten rákérdez az "
+"offline szinkronizálás szükségességére kapcsolat nálküli módra váltás előtt."
 
 #: ../mail/evolution-mail.schemas.in.h:56
 msgid ""
@@ -12605,9 +12608,9 @@
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr ""
-"Engedélyezi/tiltja az ismétlődő kérdéseket, amelyek arra figyelmeztetnek, hogy az "
-"üzenetek törlése a keresőmappából véglegesen törli az üzeneteket, nem "
-"egyszerűen csak a keresőmappából távolítja el."
+"Engedélyezi/tiltja az ismétlődő kérdéseket, amelyek arra figyelmeztetnek, "
+"hogy az üzenetek törlése a keresőmappából véglegesen törli az üzeneteket, "
+"nem egyszerűen csak a keresőmappából távolítja el."
 
 #: ../mail/evolution-mail.schemas.in.h:57
 msgid "Last time empty junk was run"
@@ -12851,7 +12854,9 @@
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
-msgstr "Feladó e-mail címének megjelenítése az üzenetlista egy külön összegzés oszlopában."
+msgstr ""
+"Feladó e-mail címének megjelenítése az üzenetlista egy külön összegzés "
+"oszlopában."
 
 #: ../mail/evolution-mail.schemas.in.h:114
 msgid "Show the photo of the sender in the message reading pane."
@@ -12913,7 +12918,9 @@
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
-msgstr "Három lehetséges értéke van: 0 (hiba), 1 (figyelmeztetés), 2 (hibakeresési üzenetek)."
+msgstr ""
+"Három lehetséges értéke van: 0 (hiba), 1 (figyelmeztetés), 2 (hibakeresési "
+"üzenetek)."
 
 #: ../mail/evolution-mail.schemas.in.h:128
 msgid ""
@@ -12981,8 +12988,9 @@
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
-"Meghatározza, hogy a szálak alapértelmezésben szálankénti utolsó üzenet alapján "
-"legyenek-e sorba rendezve az üzenetek dátuma helyett. Az Evolution-t újra kell indítani."
+"Meghatározza, hogy a szálak alapértelmezésben szálankénti utolsó üzenet "
+"alapján legyenek-e sorba rendezve az üzenetek dátuma helyett. Az Evolution-t "
+"újra kell indítani."
 
 #: ../mail/evolution-mail.schemas.in.h:136
 msgid "Thread the message list."
@@ -13721,9 +13729,9 @@
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
-"Adja meg a nevét és az e-mail címét. Az „Opcionális információk” mezőket csak akkor "
-"kell kitöltenie, ha szeretné feltüntetni ezeket az adatokat a kimenő "
-"leveleiben."
+"Adja meg a nevét és az e-mail címét. Az „Opcionális információk” mezőket "
+"csak akkor kell kitöltenie, ha szeretné feltüntetni ezeket az adatokat a "
+"kimenő leveleiben."
 
 #: ../mail/mail-config.glade.h:114
 msgid "Please select among the following options"
@@ -14735,8 +14743,8 @@
 "HTML email:\n"
 "{0}"
 msgstr ""
-"Ellenőrizze, hogy a következő címzettek akarnak-e és tudnak-e HTML "
-"formátumú leveleket fogadni:\n"
+"Ellenőrizze, hogy a következő címzettek akarnak-e és tudnak-e HTML formátumú "
+"leveleket fogadni:\n"
 "{0}"
 
 #: ../mail/mail.error.xml.h:85
@@ -14915,8 +14923,8 @@
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"Figyelmeztetés: üzenetek keresőmappából való törlése törölni fogja a tényleges "
-"üzenetet a helyi vagy távoli mappák egyikéből.\n"
+"Figyelmeztetés: üzenetek keresőmappából való törlése törölni fogja a "
+"tényleges üzenetet a helyi vagy távoli mappák egyikéből.\n"
 "Biztosan ezt akarja tenni?"
 
 #: ../mail/mail.error.xml.h:127
@@ -15471,6 +15479,10 @@
 msgstr "Bogofilter beállításai"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Bogofilter levélszemét-szűrő"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "A levélszemét szűrése Bogofilter segítségével."
 
@@ -15614,7 +15626,7 @@
 msgstr "Szeretné beállítani az Evolutiont alapértelmezett e-mail kliensnek?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:626
+#: ../shell/main.c:690
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -15780,7 +15792,9 @@
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
-msgstr "A megadott jelszó nem egyezik a fiókjához tartozó létező jelszóval. Adja meg a helyes jelszót"
+msgstr ""
+"A megadott jelszó nem egyezik a fiókjához tartozó létező jelszóval. Adja meg "
+"a helyes jelszót"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
 msgid "The two passwords do not match. Please re-enter the passwords."
@@ -16844,11 +16858,11 @@
 msgid "_Proxy Login..."
 msgstr "_Proxy bejelentkezés..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "A Proxy lap csak a felhasználói fiókhoz való kapcsolódás után lesz elérhető."
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:708
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "A Proxy lap csak a felhasználói fiók engedélyezése után lesz elérhető."
 
@@ -17072,128 +17086,128 @@
 msgid "iPod Synchronization"
 msgstr "iPod szinkronizáció"
 
-#: ../plugins/itip-formatter/itip-formatter.c:439
-#: ../plugins/itip-formatter/itip-formatter.c:564
+#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:569
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "A(z) „%s” naptár betöltése meghiúsult"
 
-#: ../plugins/itip-formatter/itip-formatter.c:584
+#: ../plugins/itip-formatter/itip-formatter.c:589
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "A(z) %s naptár egyik értekezlete ütközik ezzel a találkozóval"
 
-#: ../plugins/itip-formatter/itip-formatter.c:610
+#: ../plugins/itip-formatter/itip-formatter.c:615
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Az értekezlet megtalálható a(z) „%s” naptárban"
 
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:691
 msgid "Unable to find any calendars"
 msgstr "Nem található egyetlen naptár sem"
 
-#: ../plugins/itip-formatter/itip-formatter.c:693
+#: ../plugins/itip-formatter/itip-formatter.c:698
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ez a találkozó nem található egyik naptárban sem"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:702
 msgid "Unable to find this task in any task list"
 msgstr "A feladat nem található meg egyetlen feladatlistában sem"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:706
 msgid "Unable to find this memo in any memo list"
 msgstr "A feljegyzés nem található meg egyetlen feljegyzéslistában sem"
 
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Searching for an existing version of this appointment"
 msgstr "Ezen értekezlet egy létező változatának keresése"
 
-#: ../plugins/itip-formatter/itip-formatter.c:935
+#: ../plugins/itip-formatter/itip-formatter.c:943
 msgid "Unable to parse item"
 msgstr "Nem dolgozható fel az elem"
 
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:1001
 #, c-format
 msgid "Unable to send item to calendar '%s'. %s"
 msgstr "Nem küldhető el az elem a(z) „%s” naptárnak: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:1013
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "„%s” naptárnak elküldve elfogadottként"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1009
+#: ../plugins/itip-formatter/itip-formatter.c:1017
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "„%s” naptárnak elküldve feltételesként"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1014
+#: ../plugins/itip-formatter/itip-formatter.c:1022
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "„%s” naptárnak elküldve elutasítottként"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1027
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "„%s” naptárnak elküldve lemondottként"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1113
+#: ../plugins/itip-formatter/itip-formatter.c:1121
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "A szervező eltávolította %s meghatalmazottat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Lemondási értesítés elküldve a meghatalmazottnak"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1122
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nem sikerült elküldeni a lemondási értesítést a meghatalmazottnak"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1207
+#: ../plugins/itip-formatter/itip-formatter.c:1216
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "A résztvevő állapotát nem lehetett frissíteni, mert az állapot érvénytelen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1243
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nem frissíthető a résztvevő: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1247
 msgid "Attendee status updated"
 msgstr "A résztvevő állapota frissítve"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Meeting information sent"
 msgstr "A találkozóinformációk elküldve"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 msgid "Task information sent"
 msgstr "A feladatinformációk elküldve"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid "Memo information sent"
 msgstr "A feljegyzésinformációk elküldve"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1288
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "A találkozóinformációk nem küldhetők el, a találkozó nem létezik"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1291
 msgid "Unable to send task information, the task does not exist"
 msgstr "A feladatinformációk nem küldhetők el, a feladat nem létezik"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1284
+#: ../plugins/itip-formatter/itip-formatter.c:1294
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "A feljegyzésinformációk nem küldhetők el, a feljegyzés nem létezik"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1359
-#: ../plugins/itip-formatter/itip-formatter.c:1374
+#: ../plugins/itip-formatter/itip-formatter.c:1369
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "The calendar attached is not valid"
 msgstr "A csatolt naptár érvénytelen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1360
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1370
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17201,15 +17215,15 @@
 "Az üzenet azt állítja, hogy egy naptárt tartalmaz, de a naptár nem egy "
 "érvényes iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
-#: ../plugins/itip-formatter/itip-formatter.c:1428
-#: ../plugins/itip-formatter/itip-formatter.c:1510
+#: ../plugins/itip-formatter/itip-formatter.c:1420
+#: ../plugins/itip-formatter/itip-formatter.c:1438
+#: ../plugins/itip-formatter/itip-formatter.c:1520
 msgid "The item in the calendar is not valid"
 msgstr "Az elem a naptárban érvénytelen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1411
-#: ../plugins/itip-formatter/itip-formatter.c:1429
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1439
+#: ../plugins/itip-formatter/itip-formatter.c:1521
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17217,11 +17231,11 @@
 "Az üzenet tartalmaz egy naptárt, de az nem tartalmaz eseményeket, "
 "feladatokat vagy időbeosztásokat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1440
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 msgid "The calendar attached contains multiple items"
 msgstr "A csatolt naptár több elemet tartalmaz"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1441
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17229,31 +17243,31 @@
 "Ezen elemek mindegyikének feldolgozásához a fájlt el kell menteni és a "
 "naptárt importálni"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2138
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Ez az értekezlet ismétlődik"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2141
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Ez a feladat ismétlődik"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2144
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Ez a feljegyzés ismétlődik"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2369
 msgid "_Delete message after acting"
 msgstr "Üzenet _törlése reagálás után"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2369
-#: ../plugins/itip-formatter/itip-formatter.c:2401
+#: ../plugins/itip-formatter/itip-formatter.c:2379
+#: ../plugins/itip-formatter/itip-formatter.c:2411
 msgid "Conflict Search"
 msgstr "Ütközéskeresés"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2394
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Válassza ki a naptárt ütköző találkozók kereséséhez"
 
@@ -17792,9 +17806,7 @@
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "If true, then beep, otherwise will play sound file when new messages arrive."
-msgstr ""
-"Ha igaz, akkor hangjelzés, egyébként hang lejátszása új "
-"üzenet érkezésekor."
+msgstr "Ha igaz, akkor hangjelzés, egyébként hang lejátszása új üzenet érkezésekor."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -17810,7 +17822,9 @@
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "Új üzenet érkezésekor az új üzenet ikon megjelenítése az értesítési területen."
+msgstr ""
+"Új üzenet érkezésekor az új üzenet ikon megjelenítése az értesítési "
+"területen."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
@@ -17946,8 +17960,8 @@
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
-"A kiválasztott forrás csak olvasható, ezért itt nem hozható létre "
-"feladat. Válasszon másik forrást."
+"A kiválasztott forrás csak olvasható, ezért itt nem hozható létre feladat. "
+"Válasszon másik forrást."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
@@ -18019,9 +18033,8 @@
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
-"Egy e-mail üzenet kerül elküldésre a következő URL címre: „{0}”. Az "
-"üzenetet elküldheti automatikusan, vagy előtte megnézheti és "
-"megváltoztathatja.\n"
+"Egy e-mail üzenet kerül elküldésre a következő URL címre: „{0}”. Az üzenetet "
+"elküldheti automatikusan, vagy előtte megnézheti és megváltoztathatja.\n"
 "\n"
 "Az üzenet elküldése után hamarosan meg kell kapnia a levelezőlista válaszát."
 
@@ -18738,7 +18751,7 @@
 msgid "Skip recovery warning dialog"
 msgstr "A helyreállításra figyelmeztető párbeszédablak átugrása"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
+#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:576
 msgid "Start in offline mode"
 msgstr "Indítás kapcsolat nélküli módban"
 
@@ -18779,7 +18792,10 @@
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
-msgstr "Az ablak gombjainak stílusa. Lehetséges értékek: „text” (szöveg), „icons” (ikonok), „both” (mindkettő), „toolbar” (eszköztár). Ha a „toolbar” van beállítva, a gombok stílusa a GNOME hasonló beállításához igazodik."
+msgstr ""
+"Az ablak gombjainak stílusa. Lehetséges értékek: „text” (szöveg), "
+"„icons” (ikonok), „both” (mindkettő), „toolbar” (eszköztár). Ha a „toolbar” "
+"van beállítva, a gombok stílusa a GNOME hasonló beállításához igazodik."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Toolbar is visible"
@@ -18950,7 +18966,7 @@
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:744
 msgid "translator-credits"
 msgstr ""
 "Bán Szabolcs <shooby@gnome.hu>\n"
@@ -18960,23 +18976,23 @@
 "Tímár András <timar@gnome.hu>\n"
 "Zsiráf <zsiraf@mylinux.hu>"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:755
 msgid "Evolution Website"
 msgstr "Az Evolution weboldala"
 
-#: ../shell/e-shell-window-commands.c:692
+#: ../shell/e-shell-window-commands.c:773
 msgid "Error opening the FAQ webpage."
 msgstr "Hiba történt a GYIK honlap megnyitása közben."
 
-#: ../shell/e-shell-window-commands.c:889
+#: ../shell/e-shell-window-commands.c:970
 msgid "_Work Online"
 msgstr "M_unka a hálózatban"
 
-#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "K_apcsolat nélküli munka"
 
-#: ../shell/e-shell-window-commands.c:915
+#: ../shell/e-shell-window-commands.c:996
 msgid "Work Offline"
 msgstr "Kapcsolat nélküli munka"
 
@@ -19083,7 +19099,7 @@
 "importálásának folyamatán."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:228
+#: ../shell/main.c:233
 #, no-c-format
 msgid ""
 "Hi. Thanks for taking the time to download this preview release\n"
@@ -19119,7 +19135,7 @@
 "Reméljük, élvezni fogja kemény munkánk eredményét, és várjuk\n"
 "hozzájárulását! \n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19127,19 +19143,19 @@
 "Köszönettel\n"
 "Az Evolution Csapat\n"
 
-#: ../shell/main.c:259
+#: ../shell/main.c:264
 msgid "Do not tell me again"
 msgstr "Ne jelenítse meg többé"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:314
 msgid "Evolution Crash Detection"
 msgstr "Evolution összeomlás-érzékelés"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:316
 msgid "Ig_nore"
 msgstr "Ki_hagyás"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:331
 #, no-c-format
 msgid ""
 "Evolution appears to have exited unexpectedly the last time it was\n"
@@ -19150,43 +19166,43 @@
 "Elővigyázatosságból az összes előnézeti ablaktábla rejtett lesz.\n"
 "A Nézet menüből helyreállíthatja az előnézeti ablaktáblákat.\n"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:342
 msgid "_Do not show this message again"
 msgstr "_Ne jelenjen meg többé ez az üzenet"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:574
 msgid "Start Evolution activating the specified component"
 msgstr "Az Evolution indítása a megadott összetevő aktiválásával"
 
-#: ../shell/main.c:573
+#: ../shell/main.c:578
 msgid "Start in online mode"
 msgstr "Indítás online módban"
 
-#: ../shell/main.c:576
+#: ../shell/main.c:581
 msgid "Forcibly shut down all Evolution components"
 msgstr "Az összes Evolution-összetevő kényszerített bezárása"
 
-#: ../shell/main.c:580
+#: ../shell/main.c:585
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Evolution 1.4-ről költöztetés kényszerítése"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:588
 msgid "Send the debugging output of all components to a file."
 msgstr "Minden összetevő hibakereső üzeneteit fájlba irányítja."
 
-#: ../shell/main.c:585
+#: ../shell/main.c:590
 msgid "Disable loading of any plugins."
 msgstr "Minden bővítmény betöltésének kikapcsolása."
 
-#: ../shell/main.c:587
+#: ../shell/main.c:592
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "A levelező, névjegyek és feladatok előnézeti ablaktáblájának letiltása."
 
-#: ../shell/main.c:617
+#: ../shell/main.c:677
 msgid "- The Evolution PIM and Email Client"
 msgstr "– Az Evolution PIM- és levelezőkliens"
 
-#: ../shell/main.c:630
+#: ../shell/main.c:694
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19287,7 +19303,8 @@
 "\n"
 "Click help for details"
 msgstr ""
-"Az Ön rendszerének konfigurációja nem egyezik az Evolution konfigurációjával.\n"
+"Az Ön rendszerének konfigurációja nem egyezik az Evolution "
+"konfigurációjával.\n"
 "\n"
 "Kattintson a Súgó gombra a részletekért."
 
@@ -21864,13 +21881,13 @@
 msgid "Attachment Bar"
 msgstr "Mellékletsáv"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../widgets/misc/e-attachment.c:317 ../widgets/misc/e-attachment.c:332
+#: ../widgets/misc/e-attachment.c:533 ../widgets/misc/e-attachment.c:550
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nem csatolható a fájl: %s: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:325 ../widgets/misc/e-attachment.c:542
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nem csatolható a fájl: %s: nem közönséges fájl"

Places

File evolution-po-update.patch of Package evolution (Revision 3e76e621bdea67b3559dc0b1c5e92832)

Places