Fixed invalid translation. Thanks to Matej Krizan.

2007-11-13 Marcel Telka <marcel@telka.sk> * sk.po: Fixed invalid translation. Thanks to Matej Krizan. svn path=/trunk/; revision=34533
author: Marcel Telka <marcel@telka.sk> 2007-11-14 05:10:43 +0800
committer: Marcel Telka <marcel@src.gnome.org> 2007-11-14 05:10:43 +0800
commit: 301a69d41491e3d65dbe312e008b610b53eaa955 (patch)
tree: 5db030b10df5fc769fc969bb7e607664c964e798
parent: df7b5b4b43b1befbf42b084954a6987cdc8d554a (diff)
download: gsoc2013-evolution-301a69d41491e3d65dbe312e008b610b53eaa955.tar.gz
gsoc2013-evolution-301a69d41491e3d65dbe312e008b610b53eaa955.tar.zst
gsoc2013-evolution-301a69d41491e3d65dbe312e008b610b53eaa955.zip
2 files changed, 9413 insertions, 5733 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 7562fab62d..b9c05fa2aa 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-13  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Fixed invalid translation. Thanks to Matej Krizan.
+
 2007-11-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
         * es.po: Updated Spanish translation
diff --git a/po/sk.po b/po/sk.po
index 2034dc8361..497b26e2d3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,22 +1,18 @@
-# translation of evolution.evolution-1-4-branch.sk.po to Slovak
 # translation of evolution.HEAD.sk.po to Slovak
-# translation of evolution.evolution-1-2-branch.sk.po to Slovak
 # translation of sk.po to Slovak
 # evolution Slovak translation.
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001-2002,2003.
 # Stanislav Visnovsky <visnovsky@kde.org>, 2003.
 # Lukas Lipka <lukas@pmad.net>, 2005.
-# Marcel Telka <marcel@telka.sk>, 2005.
-#
-# $Id: sk.po,v 1.92 2005/09/11 15:41:57 kloczek Exp $
+# Marcel Telka <marcel@telka.sk>, 2005, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2005-08-01 20:36+0200\n"
+"POT-Creation-Date: 2007-11-13 21:43+0100\n"
+"PO-Revision-Date: 2007-11-13 22:07+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -26,31 +22,30 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:169
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution addressbook"
 msgstr "adresár evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Nový zoznam kontaktov"
 
-#: ../a11y/addressbook/ea-minicard-view.c:152
-#, c-format
-msgid "current addressbook folder has %d card"
-msgid_plural "current addressbook folder has %d cards"
+#: ../a11y/addressbook/ea-minicard-view.c:162
+#, fuzzy, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "aktuálny priečinok adresára má %d kariet"
 msgstr[1] "aktuálny priečinok adresára má %d kartu"
 msgstr[2] "aktuálny priečinok adresára má %d karty"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:953
-#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Otvoriť"
 
@@ -67,61 +62,63 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "_Okno Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Má opakovania."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Je to stretnutie."
 
-#: ../a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Udalosť v kalendári: Súhrn je %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Udalosti v kalendári: Nemá súhrn."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:300
 msgid "calendar view event"
 msgstr "udalosti pohľadu kalendára"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Získať ohnisko"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "Nová schôdzka"
 
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "Nová celodenná udalosť"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "Nové stretnutie"
 
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "Prejsť na dnešný dátum"
 
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "Prejsť na dátum"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-day-view-main-item.c:303
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "tabuľka na zobrazenie a výber aktuálne rozsahu času"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -129,30 +126,38 @@ msgstr[0] "Obsahuje %d udalostí."
 msgstr[1] "Obsahuje %d udalosť."
 msgstr[2] "Obsahuje %d udalosti."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Nemá udalosti."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:162
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Pohľad na pracovný týždeň: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:168
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Pohľad na deň: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:199
 msgid "calendar view for a work week"
 msgstr "pohľad na kalendár pre pracovný týždeň"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:201
 msgid "calendar view for one or more days"
 msgstr "pohľad na kalendár pre jeden alebo viac dní"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:660
+#: ../a11y/calendar/ea-gnome-calendar.c:188
+#: ../calendar/gui/calendar-component.c:743
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -162,30 +167,32 @@ msgstr "%A %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
-#: ../calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../calendar/gui/calendar-component.c:746
+#: ../calendar/gui/e-day-view-top-item.c:1358
+#: ../calendar/gui/e-day-view.c:2188
+#: ../calendar/gui/e-week-view-main-item.c:319
+#: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:192
-#: ../a11y/calendar/ea-gnome-calendar.c:197
-#: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/calendar-component.c:670
-#: ../calendar/gui/calendar-component.c:672
+#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:198
+#: ../a11y/calendar/ea-gnome-calendar.c:200
+#: ../calendar/gui/calendar-component.c:748
+#: ../calendar/gui/calendar-component.c:753
+#: ../calendar/gui/calendar-component.c:755
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:216
-#: ../a11y/calendar/ea-gnome-calendar.c:222
-#: ../a11y/calendar/ea-gnome-calendar.c:228
-#: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:691
-#: ../calendar/gui/calendar-component.c:697
-#: ../calendar/gui/calendar-component.c:699
+#: ../a11y/calendar/ea-gnome-calendar.c:217
+#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:229
+#: ../a11y/calendar/ea-gnome-calendar.c:231
+#: ../calendar/gui/calendar-component.c:767
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/calendar-component.c:780
+#: ../calendar/gui/calendar-component.c:782
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -194,16 +201,18 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../calendar/gui/calendar-component.c:772
+#: ../calendar/gui/e-day-view-top-item.c:1362
+#: ../calendar/gui/e-day-view.c:2204
+#: ../calendar/gui/e-week-view-main-item.c:333
+#: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:738
+#: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "Kalendár Gnome"
 
@@ -223,21 +232,21 @@ msgstr "Tlačidlo skoku"
 msgid "Click here, you can find more events."
 msgstr "Kliknutím sem môžete nájsť viac udalostí."
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Pohľad na mesiac: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Pohľad na týždeň: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "pohľad na kalendár pre mesiac"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "pohľad na kalendár pre jeden alebo viac týždňov"
 
@@ -250,11 +259,11 @@ msgstr "prekryť"
 msgid "popup a child"
 msgstr "prekryť potomka"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
 msgid "edit"
 msgstr "upraviť"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
 msgid "begin editing this cell"
 msgstr "začať úpravu tejto bunky"
 
@@ -267,19 +276,19 @@ msgstr "prepnúť"
 msgid "toggle the cell"
 msgstr "prepnúť bunku"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
 msgid "expand"
 msgstr "rozbaliť"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
 msgid "expands the row in the ETree containing this cell"
 msgstr "rozbaliť riadok v ETree obsahujúci túto bunku"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
 msgid "collapse"
 msgstr "zbaliť"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
 msgid "collapses the row in the ETree containing this cell"
 msgstr "zbaliť riadok v ETree obsahujúci túto bunku"
 
@@ -289,7 +298,7 @@ msgstr "Bunka tabuľky"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:575
+#: ../widgets/table/e-table-click-to-add.c:581
 msgid "click to add"
 msgstr "pridať kliknutím"
 
@@ -301,17 +310,17 @@ msgstr "kliknúť"
 msgid "sort"
 msgstr "triediť"
 
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:306
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalendár: od %s do %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:341
 msgid "evolution calendar item"
 msgstr "položka kalendára evolution"
 
@@ -327,6 +336,16 @@ msgstr "Aktivovať štandardné"
 msgid "Popup Menu"
 msgstr "Vyskakovacie menu"
 
+#: ../a11y/widgets/ea-expander.c:40
+#, fuzzy
+msgid "Toggle Attachment Bar"
+msgstr "Príloha"
+
+#: ../a11y/widgets/ea-expander.c:50
+#, fuzzy
+msgid "activate"
+msgstr "Súkromný"
+
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -363,63 +382,86 @@ msgid "Could not remove addressbook."
 msgstr "Nepodarilo sa odstrániť adresár."
 
 #: ../addressbook/addressbook.error.xml.h:8
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
 msgstr "Odstrániť adresár '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Error loading addressbook."
 msgstr "Chyba pri načítavaní adresára."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Chyba pri ukladaní {0} do {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Failed to authenticate with LDAP server."
 msgstr "Nepodarilo sa overiť totožnosť na LDAP serveri"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#. Unknown error
+#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1705
+#, fuzzy
+msgid "Failed to delete contact"
+msgstr "Odstrániť vybrané kontakty"
+
+#: ../addressbook/addressbook.error.xml.h:14
+#, fuzzy
+msgid "GroupWise Address book creation:"
+msgstr "Komponent Adresár Evolution"
+
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server neodpovedal platnou informáciou o schéme."
 
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:16
+#, fuzzy
+msgid "Permission Denied."
+msgstr "Prístup zamietnutý"
+
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Server Version"
 msgstr "Verzia servera"
 
-#: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Adresár Evolution skončil neočakávane."
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:20
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:21
 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:18
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book will be removed permanently."
 msgstr "Tento adresár bude odstránený trvale."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This addressbook could not be opened."
 msgstr "Tento adresár nemohol byť otvorený."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "Tento adresárový server nemá žiadne navrhované databázy hľadania."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -427,27 +469,27 @@ msgstr ""
 "Tento adresárový server môže byť nedosiahnuteľný, názov servera môže byť "
 "nesprávne zadané, alebo môže byť vaše sieťové pripojenie rozpojené."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Tento server nepodporuje informácie schém LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open addressbook"
 msgstr "Nepodarilo sa otvoriť adresár"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "Nepodarilo sa vykonať vyhľadanie."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "Nepodarilo sa uložiť {0}."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "Chcete uložiť vaše zmeny?"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:31
 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?"
@@ -455,42 +497,56 @@ msgstr ""
 "Pokúšate sa presunúť kontakt z jedného adresára do druhého, ale tento "
 "kontakt nemohol byť odstránený zo zdroja. Chcete namiesto toho uložiť kópiu?"
 
-#: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:59
+#: ../addressbook/addressbook.error.xml.h:32
 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:29
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Vaše kontakty pre {0} nebudú dostupné kým nereštartujete Evolution."
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:512
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Pridať"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: ../addressbook/addressbook.error.xml.h:33
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../addressbook/addressbook.error.xml.h:37
+msgid "_Do not save"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:38
+#, fuzzy
+msgid "_Resize"
+msgstr "Belize"
+
+#: ../addressbook/addressbook.error.xml.h:39
+msgid "_Use as it is"
+msgstr ""
+
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:43
 msgid "{1}"
 msgstr "{1}"
 
@@ -498,13 +554,13 @@ msgstr "{1}"
 msgid "Default Sync Address:"
 msgstr "Štandardná adresa pre synchronizáciu:"
 
-#: ../addressbook/conduit/address-conduit.c:1183
-#: ../addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1319
+#: ../addressbook/conduit/address-conduit.c:1320
 msgid "Could not load addressbook"
 msgstr "Nepodarilo sa načítať adresár"
 
-#: ../addressbook/conduit/address-conduit.c:1252
-#: ../addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1397
+#: ../addressbook/conduit/address-conduit.c:1400
 msgid "Could not read pilot's Address application block"
 msgstr "Nie je možné prečítať blok aplikácie Adresa z pilota"
 
@@ -526,29 +582,36 @@ msgstr "Tu nastaviť automatické dopĺňanie"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1133
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../addressbook/gui/component/addressbook-view.c:1336
+#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
 msgstr "Kontakty"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
+#, fuzzy
+msgid "Evolution Address Book"
 msgstr "Adresár Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
+#, fuzzy
+msgid "Evolution Address Book address pop-up"
 msgstr "Okno adries adresára Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
+#, fuzzy
+msgid "Evolution Address Book address viewer"
 msgstr "Prehliadač adries adresára Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
+#, fuzzy
+msgid "Evolution Address Book card viewer"
 msgstr "Prehliadač kariet adresára Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
+#, fuzzy
+msgid "Evolution Address Book component"
 msgstr "Komponent Adresár Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
@@ -566,12 +629,14 @@ msgstr "Tu spravovať vaše S/MIME certifikáty"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
-#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:497
+#: ../calendar/gui/calendar-component.c:237
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
+#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
+#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:302
+#: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Na tomto počítači"
 
@@ -580,129 +645,134 @@ msgstr "Na tomto počítači"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:505
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../calendar/gui/calendar-component.c:248
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:491
+#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
+#: ../calendar/gui/tasks-component.c:205 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Osobný"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:515
 msgid "On LDAP Servers"
 msgstr "Na LDAP serveroch"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Vytvoriť nový kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "Contact _List"
 msgstr "_Zoznam kontaktov"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Vytvoriť nový zoznam kontaktov"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1118
-#: ../addressbook/gui/component/addressbook-view.c:763
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "Nový adresár"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "Address _Book"
 msgstr "_Adresár"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Vytvoriť nový adresár"
 
-#: ../addressbook/gui/component/addressbook-component.c:385
-msgid "Failed upgrading Addressbook settings or folders."
+#: ../addressbook/gui/component/addressbook-component.c:409
+#, fuzzy
+msgid "Failed upgrading Address Book settings or folders."
 msgstr "Zlyhala aktualizácia nastavení alebo priečinkov Adresára."
 
-#: ../addressbook/gui/component/addressbook-config.c:313
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Základ"
 
-#: ../addressbook/gui/component/addressbook-config.c:508
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../addressbook/gui/component/addressbook-config.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:172
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../addressbook/gui/component/addressbook-config.c:607
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "Kopírovať obsah adresára lokálne pre prácu bez pripojenia"
 
-#: ../addressbook/gui/component/addressbook-config.c:902
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:2315
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Všeobecné"
 
-#: ../addressbook/gui/component/addressbook-config.c:903
-#: ../mail/importers/pine-importer.c:393
-msgid "Addressbook"
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:557
+#: ../mail/importers/pine-importer.c:392
+msgid "Address Book"
 msgstr "Adresár"
 
-#: ../addressbook/gui/component/addressbook-config.c:907
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Informácie o serveri"
 
-#: ../addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Overenie totožnosti"
 
-#: ../addressbook/gui/component/addressbook-config.c:912
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaily"
 
-#: ../addressbook/gui/component/addressbook-config.c:913
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../mail/em-folder-browser.c:862
 msgid "Searching"
 msgstr "Hľadám"
 
-#: ../addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Sťahujem"
 
-#: ../addressbook/gui/component/addressbook-config.c:1116
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Vlastnosti adresára"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
 #, fuzzy
 msgid "Migrating..."
 msgstr "Čakám..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Prehľadávam %s"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:643
 msgid "LDAP Servers"
 msgstr "LDAP servery"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:758
 msgid "Autocompletion Settings"
 msgstr "Nastavenia automatického dopĺňania"
 
@@ -735,22 +805,54 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-view.c:764
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Odstrániť"
+#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../mail/em-folder-utils.c:504
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../mail/em-folder-utils.c:506
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Vytvoriť nový priečinok"
+
+#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../mail/em-folder-utils.c:512
+#, fuzzy
+msgid "Folder names cannot contain '/'"
+msgstr "Meno priečinku nesmie obsahovať znak \"/\"."
+
+#: ../addressbook/gui/component/addressbook-view.c:954
+#, fuzzy
+msgid "_New Address Book"
+msgstr "Nový adresár"
+
+#. FIXME: need to disable for undeletable folders
+#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:607
+#: ../calendar/gui/e-calendar-table.c:1347
+#: ../calendar/gui/e-calendar-view.c:1696 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
+#: ../mail/em-folder-tree.c:2122 ../mail/em-folder-view.c:1290
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "_Odstrániť"
+
+#: ../addressbook/gui/component/addressbook-view.c:957
+#, fuzzy
+msgid "Save As Vcard..."
+msgstr "Uložiť ako VCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:766
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "Properties..."
+#: ../addressbook/gui/component/addressbook-view.c:959
+#, fuzzy
+msgid "_Properties..."
 msgstr "Vlastnosti..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1144
+#: ../addressbook/gui/component/addressbook-view.c:1347
 msgid "Contact Source Selector"
 msgstr "Výber zdroja kontaktov"
 
@@ -758,231 +860,250 @@ msgstr "Výber zdroja kontaktov"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Používam server LDAP anonymne"
 
-#: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../addressbook/gui/component/addressbook.c:197
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
 msgid "Failed to authenticate.\n"
 msgstr "Nepodarilo sa prihlásiť.\n"
 
-#: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
+#: ../addressbook/gui/component/addressbook.c:204
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Zadajte heslo pre %s (používateľ %s)"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "Dĺžka automatického dopĺňania"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
 msgstr "Zobraziť panel náhľadu"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Vertikálna poloha panelu"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "Či zobraziť panel náhľadu."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>Overenie totožnosti</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Display</b>"
 msgstr "<b>Displej</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>Sťahovanie</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Searching</b>"
 msgstr "<b>Hľadám</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Server Information</b>"
 msgstr "<b>Informácie o serveri</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Type:</b>"
 msgstr "<b>Typ:</b> "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "Add Address Book"
 msgstr "Pridať adresár"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "Vždy"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 msgid "Anonymously"
 msgstr "Anonymne"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Základné"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Známe meno:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "Emailová adresa"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution použije túto e-mailovú adresu pre overení vašej totožnosti pri "
 "prihlásení na server."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Nájsť možné databáze hľadania"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "Pri_hlásenie:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../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
+#: ../mail/em-account-editor.c:304
+#, fuzzy
+msgid "No encryption"
+msgstr "Popis"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:26
 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
+#: ../mail/em-account-editor.c:312
+#, fuzzy
+msgid "SSL encryption"
+msgstr "popis"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Search Filter"
+msgstr "Prehľadať pr_iečinky"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search _base:"
 msgstr "_Oblasť hľadania:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Search _filter:"
+msgstr "Prehľadať pr_iečinky"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
+msgid "Search filter"
+msgstr "Editor hľadania"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:32
+msgid ""
+"Search filter is the type of the objects searched for, while performing the "
+"search. If this is not modified, by  default search will be performed on "
+"objectclass of the type \"person\"."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL."
 msgstr ""
 "Výber tejto voľby znamená, že Evolution bude váš server LDAP používať iba ak "
 "sever podporuje SSL alebo TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
 msgstr ""
-"Zapnutie tejto voľby znamená, že Evolution sa bude pokúšať použiť\n"
-"SSL/TLS iba v nezabezpečenom prostredí. napríklad, ak je váš\n"
-"server LDAP za firewallom, Evolution nemusí tieto protokoly používať,\n"
-"pretože vaše spojenie už zabezpečené je."
+"Výber tejto voľby znamená, že Evolution bude váš server LDAP používať iba ak "
+"sever podporuje SSL alebo TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 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. "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
 msgstr ""
 "Táto voľba znamená, že váš server nepodporuje ani SSL ani TLS.\n"
 "Preto bude vaše spojenie nezabezpečené proti útokom."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Pod"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Podporované databáze hľadania"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:308
+#, fuzzy
+msgid "TLS encryption"
+msgstr "Popis:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
+"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 ""
@@ -990,7 +1111,7 @@ msgstr ""
 "položky, kde hľadanie začne. Ak ho necháte prázdne, bude sa\n"
 "hľadať v celom adresárovom strome."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 #, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
@@ -1004,13 +1125,13 @@ msgstr ""
 "Rozsah hľadania \"jedna\" zahrnie iba položky, ktoré sú jednu úroveň\n"
 "pod vašim základnom hľadania.\n"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Toto je plné meno vášho serveru LDAP. Napríklad \"ldap.mojafirma.sk\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1018,7 +1139,7 @@ msgstr ""
 "Toto je maximálny počet sťahovaných položiek. Ak nastavíte príliš veľké "
 "číslo, tento adresár bude pomalý."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
@@ -1028,7 +1149,7 @@ msgstr ""
 "Toto je metóda, ktorú Evolution použije pre prihlásenie. Uvedmte si, že "
 "použitie voľby \"E-mailová adresa\" vyžaduje anonymný prístup k serveru LDAP."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1038,7 +1159,7 @@ msgstr ""
 "Evolution.\n"
 "Používa sa iba na zobrazovanie."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 #, fuzzy
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
@@ -1049,1391 +1170,1409 @@ msgstr ""
 "Zoznam štandardných portov je predvyplnený. Číslo portu by vám\n"
 "mal poskytnúť váš administrátor."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Použiť známe meno (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Použiť e-mailovú adresu"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-#: ../mail/em-account-editor.c:301
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Ak je to možné"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Pridať adresár"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "Obmedzenie _sťahovania:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Nájsť prípadné databázy hľadania"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "Spôsob _prihlásenia:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-#: ../calendar/gui/dialogs/calendar-setup.c:244
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:164
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:229
+#: ../mail/mail-config.glade.h:171
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_Rozsah hľadania:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-#: ../mail/mail-config.glade.h:171
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:178
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "Ča_sový limit:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "Použiť _bezpečné pripojenie:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "karty"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
-#: ../plugins/calendar-http/calendar-http.c:263
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../mail/em-account-editor.c:2064
+#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-weather/calendar-weather.c:561
+#: ../plugins/google-account-setup/google-source.c:380
 msgid "minutes"
 msgstr "minút"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
 msgstr "<b>Elektronická pošta</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Home</b>"
 msgstr "<b>Domov</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Priama komunikácia</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Job</b>"
 msgstr "<b>Práca</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Rôzne</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Other</b>"
 msgstr "<b>Ostatné</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefón</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Web Addresses</b>"
 msgstr "<b>WWW adresy</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Work</b>"
 msgstr "<b>Práca</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:182
+#: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Full _Name..."
 msgstr "_Celé meno..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Image"
 msgstr "Obrázok"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Poslať správu"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Mailing Address"
 msgstr "Poštová adresa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Ni_ckname:"
 msgstr "Pre_zývka:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Personal Information"
 msgstr "Osobné informácie"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Telephone"
 msgstr "Telefón"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../mail/mail-config.glade.h:158
 msgid "Work"
 msgstr "Práca"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Anniversary:"
 msgstr "_Výročie:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Assistant:"
 msgstr "_Asistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Birthday:"
 msgstr "Dátum na_rodenia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../calendar/gui/dialogs/event-page.c:901
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1840
 msgid "_Calendar:"
 msgstr "_Kalendár:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories"
-msgstr "_Kategórie"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "_Categories..."
+msgstr "Ka_tegórie..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "_Mesto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Company:"
 msgstr "_Firma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Country:"
 msgstr "_Krajina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Department:"
 msgstr "_Oddelenie:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_File under:"
 msgstr "_Súbor pod:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Free/Busy:"
 msgstr "_Voľno/Zaneprázdnený:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home Page:"
 msgstr "_Domovská stránka:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Manager:"
 msgstr "_Manažér:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Notes:"
 msgstr "_Poznámky:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Office:"
 msgstr "_Kancelária:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Profession:"
 msgstr "_Povolanie:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Spouse:"
 msgstr "Ma_nžel(ka):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Štát/Provincia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titul:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Video Chat:"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Wants to receive HTML mail"
 msgstr "_Chce prijímať HTML poštu"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 #, fuzzy
 msgid "_Web Log:"
 msgstr "Adresa _WWW stránky:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr "_Kde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "_Zip/Postal Code:"
 msgstr "_PSČ:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: ../addressbook/gui/widgets/eab-contact-display.c:367
-#: ../addressbook/gui/widgets/eab-contact-display.c:382
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
 msgid "Address"
 msgstr "Adresa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../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-list-editor/e-contact-list-editor.c:188
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:520
-#: ../addressbook/gui/widgets/e-minicard.c:175
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
-#: ../widgets/text/e-text.c:3585
+#: ../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:1832 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3680
 msgid "Editable"
 msgstr "Upraviteľný"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "United States"
 msgstr "Spojené štáty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Afghanistan"
 msgstr "Afgánistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Albania"
 msgstr "Albánsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Algeria"
 msgstr "Alžírsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "American Samoa"
 msgstr "Americká Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antarctica"
 msgstr "Antarktída"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Antigua And Barbuda"
 msgstr "Antigua a Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Argentina"
 msgstr "Argentína"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Armenia"
 msgstr "Arménsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Australia"
 msgstr "Austrália"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Austria"
 msgstr "Rakúsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Azerbaijan"
 msgstr "Azerbajdžansko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahamas"
 msgstr "Bahamy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bahrain"
 msgstr "Bahrajn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bangladesh"
 msgstr "Bangladéš"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belarus"
 msgstr "Bielorusko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belgium"
 msgstr "Belgicko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bermuda"
 msgstr "Bermudy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bhutan"
 msgstr "Bútán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bolivia"
 msgstr "Bolívia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bosnia And Herzegowina"
 msgstr "Bosna a Herzegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Bouvet Island"
 msgstr "Bouvet Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brazil"
 msgstr "Brazília"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "British Indian Ocean Territory"
 msgstr "Britské teritórium v Indickom oceáne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Bulgaria"
 msgstr "Bulharsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cayman Islands"
 msgstr "Kajmanské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Central African Republic"
 msgstr "Stredoafrická republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chad"
 msgstr "Čad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "China"
 msgstr "Čína"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Christmas Island"
 msgstr "Vianočné ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosové ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Comoros"
 msgstr "Komory"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Kongo, Demokratická republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cook Islands"
 msgstr "Cookove ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Cote d'Ivoire"
 msgstr "Pobrežie slonoviny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Croatia"
 msgstr "Chorvátsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cuba"
 msgstr "Kuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Cyprus"
 msgstr "Cyprus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Czech Republic"
 msgstr "Česká republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Denmark"
 msgstr "Dánsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Djibouti"
 msgstr "Džibuti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominica"
 msgstr "Dominikánska republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Dominican Republic"
 msgstr "Dominikánska republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ecuador"
 msgstr "Ekvádor"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Egypt"
 msgstr "Egypt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "El Salvador"
 msgstr "Salvádor"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Equatorial Guinea"
 msgstr "Rovníková Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Estonia"
 msgstr "Estónsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Falkland Islands"
 msgstr "Falklandské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Faroe Islands"
 msgstr "Farejské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Fiji"
 msgstr "Fidži"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Finland"
 msgstr "Fínsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "France"
 msgstr "Francúzsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Guiana"
 msgstr "Francúzska Guajana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Polynesia"
 msgstr "Francúzska Polynézia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "French Southern Territories"
 msgstr "Francúzske južné teritóriá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Georgia"
 msgstr "Gruzínsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Germany"
 msgstr "Nemecko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greece"
 msgstr "Grécko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Greenland"
 msgstr "Grónsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guinea-bissau"
 msgstr "Guinea-bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Guyana"
 msgstr "Guajana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Heard And McDonald Islands"
 msgstr "Heardove a McDonaldove ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Holy See"
 msgstr "Svätá stolica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Hungary"
 msgstr "Maďarsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "India"
 msgstr "India"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Indonesia"
 msgstr "Indonézia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iran"
 msgstr "Irán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Ireland"
 msgstr "Írsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Isle of Man"
 msgstr "Ostrov Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Italy"
 msgstr "Taliansko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Jamaica"
 msgstr "Jamajka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Japan"
 msgstr "Japonsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Jordan"
 msgstr "Jordánsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kazakhstan"
 msgstr "Kazachstán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kenya"
 msgstr "Keňa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 #, fuzzy
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Kórejská ľudovodemokratická republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Korea, Republic Of"
 msgstr "Kórejská republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Kyrgyzstan"
 msgstr "Kirgizstán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Latvia"
 msgstr "Lotyšsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Liberia"
 msgstr "Libéria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Libya"
 msgstr "Líbya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Liechtenstein"
 msgstr "Lichtenštajnsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Lithuania"
 msgstr "Litva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Luxembourg"
 msgstr "Luxembursko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Macedonia"
 msgstr "Macedónsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Malaysia"
 msgstr "Malajzia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Maldives"
 msgstr "Maledivy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Marshall Islands"
 msgstr "Marshallove ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Martinique"
 msgstr "Martinik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritania"
 msgstr "Mauretánia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mauritius"
 msgstr "Maurícius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Micronesia"
 msgstr "Mikronézia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Moldova, Republic Of"
 msgstr "Moldavská republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Monaco"
 msgstr "Monako"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Mongolia"
 msgstr "Mongolsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Namibia"
 msgstr "Namíbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nepal"
 msgstr "Nepál"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands"
 msgstr "Holandsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Netherlands Antilles"
 msgstr "Holandské Antily"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Caledonia"
 msgstr "Nová Kaledónia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "New Zealand"
 msgstr "Nový Zéland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Nigeria"
 msgstr "Nigéria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Norfolk Island"
 msgstr "Ostrov Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Northern Mariana Islands"
 msgstr "Severné Mariánske ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Norway"
 msgstr "Nórsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Oman"
 msgstr "Omán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Palestinian Territory"
 msgstr "Palestínske územia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Papua New Guinea"
 msgstr "Papua Nová Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Paraguay"
 msgstr "Paraguaj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Philippines"
 msgstr "Filipíny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Poland"
 msgstr "Poľsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Portugal"
 msgstr "Portugalsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Puerto Rico"
 msgstr "Portoriko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Qatar"
 msgstr "Katar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Reunion"
 msgstr "Reunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Romania"
 msgstr "Rumunsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Russian Federation"
 msgstr "Ruská federácia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Kitts And Nevis"
 msgstr "Sv. Kitts a Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Lucia"
 msgstr "Sv. Lucia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Saint Vincent And The Grenadines"
 msgstr "Sv. Vincent a Grenadíny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome a Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Saudi Arabia"
 msgstr "Saudská Arábia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Serbia And Montenegro"
 msgstr "Srbsko a Čierna hora"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Seychelles"
 msgstr "Seychelly"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovakia"
 msgstr "Slovensko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Slovenia"
 msgstr "Slovinsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Solomon Islands"
 msgstr "Solomon Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Somalia"
 msgstr "Somálsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Africa"
 msgstr "Južná Afrika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Južná Georgia a Južné Sandwich ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Spain"
 msgstr "Španielsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Sri Lanka"
 msgstr "Srí Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Helena"
 msgstr "Sv. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "St. Pierre And Miquelon"
 msgstr "Sv. Pierre a Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Sudan"
 msgstr "Sudán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard a Jan Mayenove ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Swaziland"
 msgstr "Svazijsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Switzerland"
 msgstr "Švajčiarsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Syria"
 msgstr "Sýria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tajikistan"
 msgstr "Tadžíkistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tanzania, United Republic Of"
 msgstr "Spojená republika Tanzánia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Thailand"
 msgstr "Thajsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Trinidad And Tobago"
 msgstr "Trinidad a Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Tunisia"
 msgstr "Tunis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkey"
 msgstr "Turecko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turkmenistan"
 msgstr "Turkménistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Turks And Caicos Islands"
 msgstr "Turecké a Caicoské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Ukraine"
 msgstr "Ukrajina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Arab Emirates"
 msgstr "Spojené Arabské Emiráty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United Kingdom"
 msgstr "Spojené kráľovstvo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uruguay"
 msgstr "Uruguaj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, British"
 msgstr "Britské panenské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Virgin Islands, U.S."
 msgstr "Americké paneské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis And Futuna Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Western Sahara"
 msgstr "Západná Sahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zambia"
 msgstr "Zambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
-#: ../widgets/menus/gal-view-new-dialog.c:73
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
+#: ../plugins/exchange-operations/exchange-delegates.c:958
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/plugin-manager/plugin-manager.c:54
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-view-new-dialog.c:65
 msgid "Name"
 msgstr "Meno"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "AOL Instant Messenger"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "Yahoo Messenger"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:350
+#, fuzzy
+msgid "Gadu-Gadu Messenger"
+msgstr "_Poslať správu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:553
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
 msgid "Service"
 msgstr "Služba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:400
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../plugins/publish-calendar/publish-calendar.c:514
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
 msgid "Username"
 msgstr "Meno používateľa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Domov"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "Iné"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:352
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
+msgid "Gadu-Gadu"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:552
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Source Book"
 msgstr "Zdrojová kniha"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 msgid "Target Book"
 msgstr "Cieľová kniha"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Is New Contact"
 msgstr "Je nový kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Writable Fields"
 msgstr "Zapisovateľné polia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Required Fields"
 msgstr "Vyžadované polia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
 msgid "Changed"
 msgstr "Zmenené"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
 #, fuzzy, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor kontaktov"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
 msgid "Please select an image for this contact"
 msgstr "Prosím, vyberte si obrázok pre tento kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
-msgid "No image"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#, fuzzy
+msgid "_No image"
 msgstr "Bez obrázka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3088
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2441,36 +2580,59 @@ msgstr ""
 "Údaje kontaku sú neplatné:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3092
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3114
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3125
+#, c-format
+msgid "%s'%s' is empty"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3140
 msgid "Invalid contact."
 msgstr "Neplatný kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Rýchly kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:301
 msgid "_Edit Full"
 msgstr "_Upraviť celé"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
-msgid "_Full name:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+#, fuzzy
+msgid "_Full name"
 msgstr "_Celé meno:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "E_mail:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#, fuzzy
+msgid "E_mail"
+msgstr "E-mail"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:369
+#, fuzzy
+msgid "_Select Address Book"
+msgstr "Nový adresár"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s) ?"
+"to delete contact list (%s)?"
 msgstr ""
 "Ste si istý, že chcete\n"
 "odstrániť zoznam kontaktov (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2478,16 +2640,16 @@ msgstr ""
 "Ste si istý, že chcete\n"
 "odstrániť tieto zoznamy kontaktov?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s) ?"
+"to delete contact (%s)?"
 msgstr ""
 "Ste si istý, že chcete\n"
 "odstrániť kontakt (%s) ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2495,108 +2657,109 @@ msgstr ""
 "Ste si istý, že chcete\n"
 "odstrániť tieto kontaky?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresa _2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Ci_ty:"
 msgstr "_Mesto:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Countr_y:"
 msgstr "Kra_jina:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Full Address"
 msgstr "Celá adresa"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_PSČ:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Dr."
 msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Esq."
 msgstr "Váž. pán"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Celé meno"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "ml."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "sl."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Pán"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Pani"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Sl."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "st."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Krstné:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Priezvisko:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Stredné:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Prípona:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:1
 #, fuzzy
 msgid "Add IM Account"
 msgstr "Poštové účty"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "_Account name:"
 msgstr "_Názov účtu:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_IM Service:"
 msgstr "Služba _IM:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:215
-#: ../plugins/exchange-operations/exchange-contacts.c:193
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Umiestnenie:"
 
@@ -2604,61 +2767,61 @@ msgstr "_Umiestnenie:"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Add an email to the List"
 msgstr "Pridať email do zoznamu"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:943
 msgid "Contact List Editor"
 msgstr "Editor zoznamu kontaktov"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Insert email addresses from Address Book"
 msgstr "Pridať email adresu z adresára"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Members"
 msgstr "Členovia"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Remove an email address from the List"
 msgstr "Odstrániť email adresu zo zoznamu"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skryť adresy pri posielaní pošty do tohto zoznamu"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_List name:"
 msgstr "Meno _zoznamu:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_Select"
 msgstr "_Vybrať"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Za_dajte emailovú adresu, alebo do zoznamu pretiahnite kontakt myšou:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
+#: ../addressbook/gui/widgets/e-addressbook-view.c:217
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:506
+#: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "Kniha"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
 msgid "Is New List"
 msgstr "Je nový zoznam"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:764
 msgid "_Members"
 msgstr "Čle_novia"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:767
 msgid "Contact List Members"
 msgstr "Členovia zoznamu kontaktov"
 
@@ -2676,12 +2839,13 @@ msgid "Duplicate Contact Detected"
 msgstr "Nájdený duplikát kontaktu"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#, fuzzy
 msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
 msgstr ""
-"Zmenený e-mail alebo meno pre tento kontakt už v tomto\n"
-"priečinku existuje. Chcete ho aj tak pridať?"
+"Meno alebo e-mail pre tento kontakt už v tomto priečinku\n"
+"existuje. Chcete ho aj tak pridať?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2699,17 +2863,47 @@ msgstr ""
 "Meno alebo e-mail pre tento kontakt už v tomto priečinku\n"
 "existuje. Chcete ho aj tak pridať?"
 
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: ../widgets/misc/e-filter-bar.c:156
-msgid "Advanced Search"
-msgstr "Pokročilé hľadanie"
+#: ../addressbook/gui/merging/eab-contact-merging.c:190
+#, fuzzy
+msgid "Merge Contact"
+msgstr "Nový kontakt"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#, fuzzy
+msgid "_Merge"
+msgstr "_Správa"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "E-mail"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:165
+#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+msgid "Any field contains"
+msgstr "Ľubovoľné pole obsahuje"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+msgid "Email begins with"
+msgstr "E-mail končí na"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:163
+msgid "Name begins with"
+msgstr "Meno začína na"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
 msgstr "Bez kontaktov"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2717,157 +2911,149 @@ msgstr[0] "%d kontaktov"
 msgstr[1] "%d kontakt"
 msgstr[2] "%d kontakty"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:303
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:513
+#: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
 msgstr "Dotaz"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr "Chyba pri vytváraní pohľadu na adresár"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-selection-model.c:303
+#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3543
+#: ../widgets/text/e-text.c:3544
 msgid "Model"
 msgstr "Model"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
 msgid "Error modifying card"
 msgstr "Chyba pri zmene karty"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
-msgid "Name begins with"
-msgstr "Meno začína na"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Email begins with"
-msgstr "E-mail končí na"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Category is"
-msgstr "Kategória je"
-
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:48
-msgid "Any field contains"
-msgstr "Ľubovoľné pole obsahuje"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
-msgid "Advanced..."
-msgstr "Pokročilé..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:244
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:370
+#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-meeting-list-view.c:500
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Typ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:544
-msgid "Address Book"
-msgstr "Adresár"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:814
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1924
+#: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Uložiť ako VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1154
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/e-calendar-table.c:1325
+#: ../calendar/gui/e-calendar-view.c:1674 ../calendar/gui/e-memo-table.c:920
+#: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "New Contact..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#, fuzzy
+msgid "_New Contact..."
 msgstr "Nový kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact List..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#, fuzzy
+msgid "New Contact _List..."
 msgstr "Nový zoznam kontaktov..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "_Save as VCard..."
+msgstr "_Uložiť ako vKartu..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#, fuzzy
+msgid "_Forward Contact"
 msgstr "Predať ďalej kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "Forward Contacts"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#, fuzzy
+msgid "_Forward Contacts"
 msgstr "Predať ďalej kontakty"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send Message to Contact"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#, fuzzy
+msgid "Send _Message to Contact"
 msgstr "Poslať správu kontaktu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "Send Message to List"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#, fuzzy
+msgid "Send _Message to List"
 msgstr "Poslať správu do zoznamu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send Message to Contacts"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#, fuzzy
+msgid "Send _Message to Contacts"
 msgstr "Poslať správu kontaktom"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
-#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#, fuzzy
+msgid "_Print"
 msgstr "Tlačiť"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Copy to Address Book..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#, fuzzy
+msgid "Cop_y to Address Book..."
 msgstr "Kopírovať do adresára..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Move to Address Book..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#, fuzzy
+msgid "Mo_ve to Address Book..."
 msgstr "Presunúť do adresára..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Vystrihnúť"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+msgid "Cu_t"
+msgstr "Vy_strihnúť"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopírovať"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:463
+#: ../calendar/gui/e-calendar-table.c:1333
+#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:928
+#: ../composer/e-msg-composer.c:3209 ../mail/em-folder-tree.c:1001
+#: ../mail/em-folder-view.c:1275 ../mail/message-list.c:1969
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "_Kopírovať"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#, fuzzy
+msgid "P_aste"
 msgstr "Vložiť"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
-#: ../calendar/gui/cal-search-bar.c:346
+#: ../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
 msgid "Any Category"
 msgstr "Ľubovoľná kategória"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
-msgid "Print cards"
-msgstr "Tlačiť karty"
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1705
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+msgid "Other error"
+msgstr "Iná chyba"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Assistant"
 msgstr "Asistent"
 
@@ -2896,92 +3082,89 @@ msgid "Car Phone"
 msgstr "Telefón v aute"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-component-memo-preview.c:169
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Categories"
 msgstr "Kategórie"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Firemný felefón"
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#, fuzzy
+msgid "Company"
+msgstr "_Firma:"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-mail"
+msgid "Company Phone"
+msgstr "Firemný felefón"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "Priezvisko"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Uložiť ako"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 #, fuzzy
 msgid "Given Name"
 msgstr "Meno poľa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Domáci fax"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "Telefón domov"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "Telefón domov 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN telefón"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "Žurnál"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Manager"
 msgstr "Manažér"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
 msgid "Mobile Phone"
 msgstr "Mobilný telefón"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:392
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
 msgid "Note"
 msgstr "Poznámka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kancelária"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Organization"
-msgstr "Organizácia"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Ďalší fax"
@@ -3003,14 +3186,14 @@ msgid "Radio"
 msgstr "Rádio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:378
+#: ../calendar/gui/e-meeting-list-view.c:511
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "Rola"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Spouse"
 msgstr "Manžel(ka)"
 
@@ -3041,38 +3224,38 @@ msgid "Web Site"
 msgstr "WWW stránka"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:138
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
+#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/table/e-table-click-to-add.c:524
+#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
 msgid "Width"
 msgstr "Šírka"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:145
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
+#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/table/e-table-click-to-add.c:531
+#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Height"
 msgstr "Výška"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:153
+#: ../addressbook/gui/widgets/e-minicard.c:165
 msgid "Has Focus"
 msgstr "Je aktívny"
 
@@ -3096,7 +3279,7 @@ msgstr "Maximálna dĺžka mena poľa"
 msgid "Column Width"
 msgstr "Šírka stĺpca"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:172
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
 "\n"
@@ -3110,7 +3293,7 @@ msgstr ""
 "\n"
 "alebo dvojitým kliknutím vytvoríte nový kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3124,7 +3307,7 @@ msgstr ""
 "\n"
 "Dvojitým kliknutím vytvoríte nový kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3134,7 +3317,7 @@ msgstr ""
 "\n"
 "Vyhľadať kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3144,104 +3327,179 @@ msgstr ""
 "\n"
 "V tomto pohľade nie je čo ukázať."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:499
+#: ../addressbook/gui/widgets/e-minicard-view.c:501
 msgid "Adapter"
 msgstr "Adaptér"
 
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#, fuzzy
+msgid "Work Email"
+msgstr "E-mail"
+
+#: ../addressbook/gui/widgets/e-minicard.c:103
+#, fuzzy
+msgid "Home Email"
+msgstr "Domáci fax"
+
+#: ../addressbook/gui/widgets/e-minicard.c:104
+#, fuzzy
+msgid "Other Email"
+msgstr "Ďalší fax"
+
+#: ../addressbook/gui/widgets/e-minicard.c:173
 msgid "Selected"
 msgstr "Výbrané"
 
-#: ../addressbook/gui/widgets/e-minicard.c:168
+#: ../addressbook/gui/widgets/e-minicard.c:180
 msgid "Has Cursor"
 msgstr "Má kurzor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:135
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#, fuzzy
+msgid "_Open Link in Browser"
+msgstr "Otvoriť odkaz v prehliadači"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2671
+#, fuzzy
+msgid "_Copy Link Location"
+msgstr "Kopírovať umiestnenie odkazu"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#, fuzzy
+msgid "_Send New Message To..."
+msgstr "Poslať _správu zoznamu..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#, fuzzy
+msgid "Copy _Email Address"
+msgstr "_E-mailová adresa:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:359
 msgid "(map)"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:145
-#: ../addressbook/gui/widgets/eab-contact-display.c:211
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
 msgid "map"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:276
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:456
+#: ../addressbook/gui/widgets/eab-contact-display.c:763
 msgid "List Members"
 msgstr "Zoznam členov"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:339
-#: ../addressbook/gui/widgets/eab-contact-display.c:341
-msgid "E-mail"
-msgstr "E-mail"
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#, fuzzy
+msgid "Department"
+msgstr "_Oddelenie:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#, fuzzy
+msgid "Profession"
+msgstr "_Povolanie:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Position"
 msgstr "Pozícia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
-msgid "Video Conferencing"
-msgstr "Videokonferencia"
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Video Chat"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../calendar/gui/calendar-commands.c:99
+#: ../calendar/gui/calendar-component.c:791
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2379
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../plugins/hula-account-setup/camel-hula-listener.c:378
+#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Kalendár"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:365
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/event-editor.c:369
+#: ../ui/evolution-event-editor.xml.h:8
+#, fuzzy
+msgid "Free/Busy"
+msgstr "Voľno/zaneprázdnený URL:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:590
 msgid "Phone"
 msgstr "Telefón"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-msgid "work"
-msgstr "zamestnanie"
+#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Home Page"
+msgstr "_Domovská stránka:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
-msgid "WWW"
-msgstr "WWW"
+#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#, fuzzy
+msgid "Web Log"
+msgstr "Adresa _WWW stránky:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Blog"
-msgstr ""
+#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../calendar/gui/e-calendar-view.c:2318
+#, fuzzy
+msgid "Birthday"
+msgstr "Dátum na_rodenia:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:385
-msgid "personal"
-msgstr "osobné"
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../calendar/gui/e-calendar-view.c:2319
+#, fuzzy
+msgid "Anniversary"
+msgstr "_Výročie:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:781
 #, fuzzy
 msgid "Job Title"
 msgstr "Činnosť/po_zícia:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:812
 msgid "Home page"
 msgstr "Domovská stránka"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:820
+msgid "Blog"
+msgstr ""
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Success"
 msgstr "Úspech"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Address Book does not exist"
 msgstr "Adresár neexistuje"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Nový zoznam kontaktov"
@@ -3249,88 +3507,84 @@ msgstr "Nový zoznam kontaktov"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact not found"
 msgstr "Kontakt nenájdený"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Contact ID already exists"
 msgstr "ID kontaktu už existuje"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Protocol not supported"
 msgstr "Protokol nepodporovaný"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
-msgid "Cancelled"
+#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-model-tasks.c:350
+#: ../calendar/gui/e-cal-model-tasks.c:665
+#: ../calendar/gui/e-calendar-table.c:403 ../calendar/gui/print.c:2419
+#, fuzzy
+msgid "Canceled"
 msgstr "Zrušený"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Could not cancel"
 msgstr "Nepodarilo sa zrušiť"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/comp-editor-factory.c:438
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/comp-editor-factory.c:422
 msgid "Authentication Failed"
 msgstr "Overenie totožnosti zlyhalo"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Authentication Required"
 msgstr "Vyžadované overenie totožnosti"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "TLS not Available"
 msgstr "TLS nie je k dispozícii"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "No such source"
 msgstr "Taký zdroj neexistuje"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #, fuzzy
 msgid "Not available in offline mode"
 msgstr "Spustiť v režime off-line"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "Other error"
-msgstr "Iná chyba"
-
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 #, fuzzy
 msgid "Invalid server version"
 msgstr "Verzia servera"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:95
 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:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3339,7 +3593,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. Prosím, overte, že cesta %sexistuje a že "
 "máte dostatočné práva na prístup k nej."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3347,7 +3601,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste zadali neplatné "
 "URI, alebo LDAP server je nedosiahnuteľný."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:115
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -3358,7 +3612,7 @@ msgstr ""
 "Ak chcete LDAP v Evolution používať, musíte ho prekompilovať\n"
 "z CVS po získaní OpenLDAP z tohto odkazu.\n"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -3367,7 +3621,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
 "zadali neplatné URI, alebo server nefunguje."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3379,7 +3633,7 @@ msgstr ""
 "dotaz alebo zvýšte obmedzenie v nastavení adresárového\n"
 "serveru pre tento adresár."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:151
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
 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"
@@ -3390,45 +3644,45 @@ msgstr ""
 "alebo pre tento adresár. Prosím, upresnite hľadanie alebo zvýšte\n"
 "časový limit v nastavení adresárového serveru pre tento adresár."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:157
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Podpora tohto adresára nedokázala spracovať tento dotaz."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:163
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Podpora tohto adresára odmietla vykonať tento dotaz."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:166
 msgid "This query did not complete successfully."
 msgstr "Tento dotaz nebol dokončený úspešne."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error adding list"
 msgstr "Chyba pri pridávaní zoznamu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
-#: ../addressbook/gui/widgets/eab-gui-util.c:693
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:666
 msgid "Error adding contact"
 msgstr "Chyba pri pridávaní kontaktu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
 msgid "Error modifying list"
 msgstr "Chyba pri zmene zoznamu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:199
 msgid "Error modifying contact"
 msgstr "Chyba pri zmene kontaktu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error removing list"
 msgstr "Chyba pri odstraňovaní zoznamu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:648
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:616
 msgid "Error removing contact"
 msgstr "Chyba pri odstraňovaní kontaktu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:290
+#: ../addressbook/gui/widgets/eab-gui-util.c:293
 #, fuzzy, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3443,7 +3697,18 @@ msgstr[1] ""
 "Požadujete, aby sa %d kariet otvorilo v %d nových oknách.\n"
 "Naozaj chcete zobraziť všetky tieto karty?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:301
+#, fuzzy
+msgid "_Don't Display"
+msgstr "_Zobrazenie"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:302
+#, fuzzy
+msgid "Display _All Contacts"
+msgstr "Vybrať všetky kontakty"
+
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:328
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3452,15 +3717,15 @@ msgstr ""
 "%s už existuje.\n"
 "Chcete ho prepísať?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:332
 msgid "Overwrite"
 msgstr "Prepísať"
 
 #. 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:368
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:375
+#: ../addressbook/gui/widgets/eab-gui-util.c:378
 #, fuzzy
 msgid "contact"
 msgid_plural "contacts"
@@ -3469,80 +3734,61 @@ msgstr[1] "kontakt"
 msgstr[2] "kontakty"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:418
+#: ../addressbook/gui/widgets/eab-gui-util.c:424
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:461
+#, fuzzy
+msgid "Select Address Book"
+msgstr "Nový adresár"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:575
 msgid "list"
 msgstr "zoznam"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:727
 msgid "Move contact to"
 msgstr "Presunúť kontakt do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:729
 msgid "Copy contact to"
 msgstr "Kopírovať kontakt do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:759
+#: ../addressbook/gui/widgets/eab-gui-util.c:732
 msgid "Move contacts to"
 msgstr "Presunúť kontakty do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:734
 msgid "Copy contacts to"
 msgstr "Kopírovať kontakty do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:764
-msgid "Select target addressbook."
-msgstr "Vybrať cieľový adresár."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:987
+#: ../addressbook/gui/widgets/eab-gui-util.c:960
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:990
+#: ../addressbook/gui/widgets/eab-gui-util.c:963
 #, c-format
 msgid "VCard for %s"
 msgstr "VKarta pre %s"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(nič)"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-msgid "Primary Email"
-msgstr "Primárny e-mail"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "Vyberte akciu"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Vytvoriť nový kontakt \"%s\""
+#: ../addressbook/gui/widgets/eab-gui-util.c:1004
+#: ../addressbook/gui/widgets/eab-gui-util.c:1022
+#, fuzzy
+msgid "Contact information"
+msgstr "Informácie o denníku"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Pridať adresu do existujúceho kontaktu \"%s\""
+#: ../addressbook/gui/widgets/eab-gui-util.c:1024
+#, fuzzy, c-format
+msgid "Contact information for %s"
+msgstr "Informácie o denníku"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:289
 #, fuzzy
 msgid "Querying Address Book..."
 msgstr "Otázka pre adresár..."
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr "Zliať e-mailovú adresu"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
@@ -3550,18 +3796,18 @@ msgstr[0] "Je %d iný kontaktov."
 msgstr[1] "Je jeden iný kontakt."
 msgstr[2] "Sú %d iné kontakty."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
 #, fuzzy
 msgid "Show Full VCard"
 msgstr "Zobraziť ú_plné hlavičky"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
 #, fuzzy
 msgid "Show Compact VCard"
 msgstr "Uložiť kontakt ako VCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
 msgid "Save in addressbook"
 msgstr "Uložiť do adresára"
 
@@ -3569,48 +3815,56 @@ msgstr "Uložiť do adresára"
 msgid "Card View"
 msgstr "Karta"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "Stromový pohľad GTK"
+#: ../addressbook/importers/evolution-csv-importer.c:624
+#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+msgid "Importing..."
+msgstr "Importujem..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:826
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:827
+#, fuzzy
+msgid "Outlook CSV and Tab Importer"
+msgstr "Import VCard do Evolution"
+
+#: ../addressbook/importers/evolution-csv-importer.c:835
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:836
+msgid "Mozilla CSV and Tab Importer"
+msgstr ""
 
-#: ../addressbook/importers/evolution-ldif-importer.c:486
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:844
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:845
 #, fuzzy
-msgid "Importing ..."
-msgstr "Importujem..."
+msgid "Evolution CSV and Tab Importer"
+msgstr "Import VCard do Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:653
+#: ../addressbook/importers/evolution-ldif-importer.c:667
 msgid "Evolution LDIF importer"
 msgstr "Import LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:529
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:530
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Import VCard do Evolution"
 
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "Tlačiť obálku"
-
-#: ../addressbook/printing/e-contact-print.c:1001
-msgid "Print contacts"
-msgstr "Tlačiť kontakty"
-
-#: ../addressbook/printing/e-contact-print.c:1066
-#: ../addressbook/printing/e-contact-print.c:1093
-msgid "Print contact"
-msgstr "Tlačiť kontakt"
-
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 bd. Tahoma"
@@ -3652,12 +3906,12 @@ msgid "Format"
 msgstr "Formát"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
-#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
-#: ../widgets/table/e-table-selection-model.c:318
+#: ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-field-chooser-dialog.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:648
+#: ../widgets/table/e-table-field-chooser.c:81
+#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "Hlavička"
 
@@ -3710,7 +3964,6 @@ msgid "Options"
 msgstr "Nastavenie"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Orientácia"
 
@@ -3760,9 +4013,9 @@ msgstr "Tieňovanie"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
-#: ../plugins/exchange-operations/exchange-calendar.c:205
-#: ../plugins/exchange-operations/exchange-contacts.c:176
+#: ../plugins/exchange-operations/exchange-account-setup.c:964
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Veľkosť:"
 
@@ -3779,7 +4032,7 @@ msgid "Top:"
 msgstr "Vrchný:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
+#: ../calendar/gui/dialogs/calendar-setup.c:156
 msgid "Type:"
 msgstr "Typ:"
 
@@ -3797,7 +4050,7 @@ msgid "Contact Print Style Editor Test"
 msgstr "Editor zoznamu kontaktov"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-print.c:44
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Autorské práva © 2000, Ximian, Inc."
 
@@ -3805,221 +4058,206 @@ msgstr "Autorské práva © 2000, Ximian, Inc."
 msgid "This should test the contact print style editor widget"
 msgstr ""
 
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:43
 #, fuzzy
 msgid "Contact Print Test"
 msgstr "Zoznam _kontaktov"
 
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:46
 msgid "This should test the contact print code"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Nie je možné otvoriť súbor"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 #, fuzzy
 msgid "Couldn't get list of addressbooks"
 msgstr "Nie je možné načítať %s: %s"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "Nie je možné otvoriť adresár"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 #, fuzzy
 msgid "List local addressbook folders"
 msgstr "pre všetky lokálne a aktívne vzdialené priečinky"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Export in asynchronous mode"
 msgstr "Export v asynchrónnom režime"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:102
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:116
 msgid "Only support csv or vcard format."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "In normal mode, there is no need for the size option."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:164
 msgid "Unhandled error"
 msgstr "Nezachytená chyba"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Chyba pri načítavaní štandardného adresára"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Vstupný súbor"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "Nezadané meno súboru."
-
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
+"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:2
 msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
+"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:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
-"of what your task is about."
+msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"All information in these journal entries will be deleted and can not be "
+"All information on these appointments will be deleted and can not be "
 "restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:6
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:7
 msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+"All information on this appointment will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:8
-msgid "All information on these tasks will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:10
-msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
+msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr ""
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Naozaj chcete odstrániť úlohu `%s'?"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
 
 #: ../calendar/calendar.error.xml.h:13
 #, fuzzy
-msgid "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Naozaj chcete odstrániť úlohu `%s'?"
 
 #: ../calendar/calendar.error.xml.h:14
 #, fuzzy
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
 
 #: ../calendar/calendar.error.xml.h:15
 #, fuzzy
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Naozaj chcete odstrániť úlohu `%s'?"
 
 #: ../calendar/calendar.error.xml.h:16
 #, fuzzy
-msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Naozaj chcete odstrániť úlohu `%s'?"
 
 #: ../calendar/calendar.error.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Naozaj chcete odstrániť %d schôdzok?"
 
 #: ../calendar/calendar.error.xml.h:18
+#: ../calendar/gui/dialogs/delete-comp.c:183
 #, fuzzy
-msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "Naozaj chcete odstrániť úlohu `%s'?"
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
 
 #: ../calendar/calendar.error.xml.h:19
+#: ../calendar/gui/dialogs/delete-comp.c:189
 #, fuzzy
-msgid "Are you sure you want to delete this appointment?"
-msgstr "Naozaj chcete odstrániť %d schôdzok?"
+msgid "Are you sure you want to delete this memo?"
+msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
 
 #: ../calendar/calendar.error.xml.h:20
+#: ../calendar/gui/dialogs/delete-comp.c:186
 #, fuzzy
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "Naozaj chcete odstrániť %d položiek denníka?"
+msgid "Are you sure you want to delete this task?"
+msgstr "Naozaj chcete odstrániť %d úloh?"
 
 #: ../calendar/calendar.error.xml.h:21
 #, fuzzy
-msgid "Are you sure you want to delete this meeting?"
-msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
 #: ../calendar/calendar.error.xml.h:22
 #, fuzzy
-msgid "Are you sure you want to delete this task?"
-msgstr "Naozaj chcete odstrániť %d úloh?"
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
 #: ../calendar/calendar.error.xml.h:23
 #, fuzzy
-msgid "Are you sure you want to send the appointment without a summary?"
+msgid "Are you sure you want to send the task without a summary?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
 #: ../calendar/calendar.error.xml.h:24
 #, fuzzy
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
+msgid "Cannot create a new event"
+msgstr "Vytvorí novú úlohu"
 
 #: ../calendar/calendar.error.xml.h:25
 #, fuzzy
@@ -4028,17 +4266,17 @@ msgstr "Odstrániť \"%s\""
 
 #: ../calendar/calendar.error.xml.h:26
 #, fuzzy
-msgid "Delete task list '{0}'?"
+msgid "Delete memo list '{0}'?"
 msgstr "Odstrániž tento zoznam"
 
 #: ../calendar/calendar.error.xml.h:27
 #, fuzzy
-msgid "Discard Changes"
-msgstr "_Zahodiť zmeny"
+msgid "Delete task list '{0}'?"
+msgstr "Odstrániž tento zoznam"
 
 #: ../calendar/calendar.error.xml.h:28
 #, fuzzy
-msgid "Don't Send"
+msgid "Do _not Send"
 msgstr "Neodstraňovať"
 
 #: ../calendar/calendar.error.xml.h:29
@@ -4057,13 +4295,13 @@ msgstr "Tento adresár nemohol byť otvorený."
 
 #: ../calendar/calendar.error.xml.h:32
 msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:33
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:34
@@ -4073,52 +4311,58 @@ msgstr "Chyba pri otváraní kalendára"
 
 #: ../calendar/calendar.error.xml.h:35
 #, fuzzy
-msgid "Error loading task list"
+msgid "Error loading memo list"
 msgstr "Chyba pri pridávaní zoznamu"
 
 #: ../calendar/calendar.error.xml.h:36
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
-msgstr ""
+#, fuzzy
+msgid "Error loading task list"
+msgstr "Chyba pri pridávaní zoznamu"
 
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
+"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:39
-#, fuzzy
-msgid "Save Changes"
-msgstr "Lake Charles"
+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:40
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "Poslať"
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:41
-#, fuzzy
-msgid "Send Notice"
-msgstr "Adresát:"
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:43
 msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:44
+msgid "Some features may not work properly with your current server."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:45
@@ -4127,131 +4371,214 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Databáza pre lokálny kalendár Evolution"
 
 #: ../calendar/calendar.error.xml.h:46
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr ""
+#, fuzzy
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "Databáza pre lokálny kalendár Evolution"
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
+msgid "The Evolution tasks have quit unexpectedly."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "The task list is not marked for offline usage"
-msgstr ""
+#, fuzzy
+msgid "The calendar is not marked for offline usage."
+msgstr "_Označiť kalendár pre off-line použitie"
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "This calendar will be removed permanently."
+msgid "The memo list is not marked for offline usage"
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:50
+#, fuzzy
+msgid "The task list is not marked for offline usage."
+msgstr "_Označiť kalendár pre off-line použitie"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "This calendar will be removed permanently."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:52
+#, fuzzy
+msgid "This memo list will be removed permanently."
+msgstr "Tento adresár bude odstránený trvale."
+
+#: ../calendar/calendar.error.xml.h:53
 msgid "This task list will be removed permanently."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
 #, fuzzy
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Chcete uložiť zmeny?"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
+#, fuzzy
+msgid "Would you like to save your changes to this memo?"
+msgstr "Chcete uložiť zmeny?"
+
+#: ../calendar/calendar.error.xml.h:56
 #, fuzzy
 msgid "Would you like to save your changes to this task?"
 msgstr "Chcete uložiť zmeny?"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 #, fuzzy
-msgid "Would you like to send a cancellation notice for this journal entry?"
+msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
-#: ../calendar/calendar.error.xml.h:54
-msgid "Would you like to send all the participants a cancellation notice?"
-msgstr ""
+#: ../calendar/calendar.error.xml.h:58
+#, fuzzy
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send meeting invitations to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send this task to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
+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:64
+msgid ""
+"You have a read-only calendar source selected. Change to Calendar View and "
+"highlight a calendar that can accept appointments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:65
 #, fuzzy
-msgid "You have made changes to this appointment, but not yet saved them."
+msgid "You have changed this appointment, but not yet saved it."
 msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:66
 #, fuzzy
-msgid "You have made changes to this task, but not yet saved them."
+msgid "You have changed this task, but not yet saved it."
 msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:67
+#, fuzzy
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
+
+#: ../calendar/calendar.error.xml.h:68
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:69
+#, fuzzy
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr "Vaše kontakty pre {0} nebudú dostupné kým nereštartujete Evolution."
+
+#: ../calendar/calendar.error.xml.h:70
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:64
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "_Zahodiť zmeny"
+
+#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:59
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
+#: ../calendar/calendar.error.xml.h:73
+#, fuzzy
+msgid "_Save Changes"
+msgstr "Lake Charles"
+
+#: ../calendar/calendar.error.xml.h:74
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:143
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 #, fuzzy
 msgid "_Send"
 msgstr "Poslať"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:75
+#, fuzzy
+msgid "_Send Notice"
+msgstr "Adresát:"
+
+#: ../calendar/calendar.error.xml.h:76
 msgid "{0}."
 msgstr ""
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
-#: ../smime/gui/component.c:48
+#: ../calendar/common/authentication.c:50
+#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../smime/gui/component.c:50
 #, fuzzy
 msgid "Enter password"
 msgstr "Zadajte heslo"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:254
 msgid "Split Multi-Day Events:"
 msgstr "Rozdeliť viacdňové udalosti:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1365
-#: ../calendar/conduits/calendar/calendar-conduit.c:1366
-#: ../calendar/conduits/todo/todo-conduit.c:879
-#: ../calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1515
+#: ../calendar/conduits/calendar/calendar-conduit.c:1516
+#: ../calendar/conduits/memo/memo-conduit.c:816
+#: ../calendar/conduits/memo/memo-conduit.c:817
+#: ../calendar/conduits/todo/todo-conduit.c:1014
+#: ../calendar/conduits/todo/todo-conduit.c:1015
 #, fuzzy
 msgid "Could not start evolution-data-server"
 msgstr "Nie je možné spustiť server wombat"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1474
-#: ../calendar/conduits/calendar/calendar-conduit.c:1477
+#: ../calendar/conduits/calendar/calendar-conduit.c:1623
+#: ../calendar/conduits/calendar/calendar-conduit.c:1626
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie je možné prečítať blok aplikácie Calendar pilota"
 
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/memo/memo-conduit.c:910
+#: ../calendar/conduits/memo/memo-conduit.c:913
+#, fuzzy
+msgid "Could not read pilot's Memo application block"
+msgstr "Nie je možné prečítať blok aplikácie ToDo pilota"
+
+#: ../calendar/conduits/memo/memo-conduit.c:957
+#: ../calendar/conduits/memo/memo-conduit.c:960
+#, fuzzy
+msgid "Could not write pilot's Memo application block"
+msgstr "Nie je možné prečítať blok aplikácie ToDo pilota"
+
+#: ../calendar/conduits/todo/todo-conduit.c:238
 msgid "Default Priority:"
 msgstr "Štandardná priorita:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:959
-#: ../calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:1098
+#: ../calendar/conduits/todo/todo-conduit.c:1101
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je možné prečítať blok aplikácie ToDo pilota"
 
+#: ../calendar/conduits/todo/todo-conduit.c:1143
+#: ../calendar/conduits/todo/todo-conduit.c:1146
+#, fuzzy
+msgid "Could not write pilot's ToDo application block"
+msgstr "Nie je možné prečítať blok aplikácie ToDo pilota"
+
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:2306
 msgid "Calendar and Tasks"
 msgstr "Kalendár a úlohy"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1388
 #, fuzzy
 msgid "Calendars"
 msgstr "Kalendár"
@@ -4283,27 +4610,50 @@ msgstr "Komponent kalendára a úloh Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 #, fuzzy
-msgid "Evolution's Tasks component"
+msgid "Evolution's Memos component"
 msgstr "Testovací komponent Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Testovací komponent Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Memo_s"
+msgstr "Členovia"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1162
+#: ../calendar/gui/gnome-cal.c:1697 ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:1096 ../calendar/gui/memos-control.c:356
+#: ../calendar/gui/memos-control.c:372
+#, fuzzy
+msgid "Memos"
+msgstr "Členovia"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/e-tasks.c:1430
+#: ../calendar/gui/gnome-cal.c:1569 ../calendar/gui/print.c:1875
+#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:1085 ../calendar/gui/tasks-control.c:494
+#: ../calendar/gui/tasks-control.c:510
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 #, fuzzy
 msgid "_Calendars"
 msgstr "Kalendár"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "Ú_lohy"
@@ -4312,25 +4662,32 @@ msgstr "Ú_lohy"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Služba pripomenutia kalendára Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
 #, fuzzy
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minút"
 msgstr[1] "minút"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:562
+#: ../plugins/google-account-setup/google-source.c:381
+#, fuzzy
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "hodín"
+msgstr[1] "hodín"
+msgstr[2] "hodín"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 #, fuzzy
 msgid "Start time"
 msgstr "Čas _začiatku:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-msgstr ""
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 #, fuzzy
@@ -4339,8 +4696,10 @@ msgstr "Schôdzka"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1621
+#: ../calendar/gui/e-itip-control.c:1155
+#: ../plugins/itip-formatter/itip-view.c:1001
 msgid "Location:"
 msgstr "Umiestnenie:"
 
@@ -4350,17 +4709,17 @@ msgid "Snooze _time:"
 msgstr "Čas opakovania (minúty)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:35
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:165
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:43 ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Upraviť"
 
@@ -4369,54 +4728,38 @@ msgstr "_Upraviť"
 msgid "_Snooze"
 msgstr "O_pakovať"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#, fuzzy
-msgid "description of appointment"
-msgstr "začiatok schôdzky"
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #, fuzzy
 msgid "location of appointment"
 msgstr "začiatok schôdzky"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:954
-msgid "Dismiss"
-msgstr ""
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:955
-msgid "Dismiss All"
-msgstr ""
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
 #, fuzzy
 msgid "No summary available."
 msgstr "Popis nie je k dispozícii."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1483
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No description available."
 msgstr "Popis nie je k dispozícii."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1493
 #, fuzzy
 msgid "No location information available."
 msgstr "Popis nie je k dispozícii."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
 #, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
+msgid "You have %d alarms"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4427,7 +4770,7 @@ msgstr ""
 "pomocou e-mailu, ale toto upozornenie tak bolo nastavené.\n"
 "Evolution preto zobrazí normálny dialóg."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4444,7 +4787,7 @@ msgstr ""
 "\n"
 "Chcete tento program spustiť?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
 msgid "Do not ask me about this program again."
 msgstr "Pre tento program túto správu už nezobrazovať."
 
@@ -4452,376 +4795,549 @@ msgstr "Pre tento program túto správu už nezobrazovať."
 msgid "Could not initialize Bonobo"
 msgstr "Nie je možné inicializovať Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
-msgid "Could not create the alarm notify service factory"
+#: ../calendar/gui/alarm-notify/notify-main.c:153
+#, fuzzy
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
 msgstr "Nie je možné vytvoriť vytváracie rozhranie pre službu pripomínania"
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
 msgstr "neplatný čas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/misc.c:113
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hodín"
+msgstr[1] "%d hodín"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/misc.c:119
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minút"
+msgstr[1] "%d minút"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/misc.c:123
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekúnd"
+msgstr[1] "%d sekúnd"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 #, fuzzy
 msgid "Alarm programs"
 msgstr "Spustiť program"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 #, fuzzy
 msgid "Ask for confirmation when deleting items"
 msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 #, fuzzy
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Farba pre úlohy do dnešného dňa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 #, fuzzy
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Farba pre úlohy do dnešného dňa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Kalendáre pre beh pripomenutí pre"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 #, fuzzy
 msgid "Compress weekends in month view"
 msgstr "Z_hustiť víkendy v mesačnom pohľade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 #, fuzzy
 msgid "Confirm expunge"
 msgstr "_Potvrdenie pri čistení priečinku"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 #, fuzzy
 msgid "Default appointment reminder"
 msgstr "Odstrániť schôdzku"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 #, fuzzy
 msgid "Default reminder units"
 msgstr "Štandardná priorita:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 #, fuzzy
 msgid "Default reminder value"
 msgstr "Š_týl odpovede:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+msgid "Directory for saving alarm audio files"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#, fuzzy
+msgid "Event Gradient"
+msgstr "informácie o udalosti"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+msgid "Event Transparency"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 #, fuzzy
-msgid "Free/busy server urls"
+msgid "Free/busy server URLs"
 msgstr "Požiadavka na informácie o voľnom čase"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 #, fuzzy
-msgid "Free/busy template url"
+msgid "Free/busy template URL"
 msgstr "Odpoveď s informácio o voľnom čase"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+msgid "Gradient of the events in calendar views."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 #, fuzzy
 msgid "Hide completed tasks"
 msgstr "_Skryť dokončené úlohy po"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 #, fuzzy
 msgid "Hide task units"
 msgstr "Zoznam úloh"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 #, fuzzy
 msgid "Last alarm time"
 msgstr "Čas _začiatku:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "List of server urls for free/busy publishing."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+msgid "List of server URLs for free/busy publishing."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Number of units for determining for a default reminder."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Number of units for determining a default reminder."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 #, fuzzy
 msgid "Overdue tasks color"
 msgstr "Úlohy _po termíne:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+msgid "Save directory for alarm audio"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 #, fuzzy
 msgid "Show appointment end times in week and month views"
 msgstr "Zobraziť _koncové časy schôdzok v týždennom a mesačnom pohľade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Show the \"Preview\" pane"
+msgstr "Zobraziť panel \"Náhľad\""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 #, fuzzy
 msgid "Show week numbers in date navigator"
 msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 #, fuzzy
 msgid "Tasks due today color"
 msgstr "Úlohy s _dnešným termínom:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#, no-c-format
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#, no-c-format
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 #, fuzzy
 msgid "Time divisions"
 msgstr "Ro_zdelenie času:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:108
 #, fuzzy
 msgid "Timezone"
 msgstr "Časová zóna "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 #, fuzzy
 msgid "Week start"
 msgstr "_Týždeň začína:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 #, fuzzy
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 #, fuzzy
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 #, fuzzy
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Zobraziť _koncové časy schôdzok v týždennom a mesačnom pohľade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 #, fuzzy
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Odstrániť dokončené úlohy"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 #, fuzzy
 msgid "Whether to set a default reminder for appointments."
 msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#, fuzzy
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#, fuzzy
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#, fuzzy
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#, fuzzy
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#, fuzzy
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#, fuzzy
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 #, fuzzy
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+msgid "Whether to use daylight savings time while displaying events."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 #, fuzzy
 msgid "Work days"
 msgstr "Pracovné dni:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Workday end hour"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 #, fuzzy
 msgid "Workday end minute"
 msgstr "Pracovať _on-line"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Workday start hour"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Workday start minute"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+msgid "daylight savings time"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Summary contains"
 msgstr "Súhrn obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Description contains"
 msgstr "Popis obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:75
+msgid "Category is"
+msgstr "Kategória je"
+
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Comment contains"
 msgstr "Komentár obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:77
 #, fuzzy
 msgid "Location contains"
 msgstr "Popis obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
+#: ../calendar/gui/cal-search-bar.c:685
 msgid "Unmatched"
 msgstr "Nenájdené"
 
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2094
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
-msgid "Calendar"
-msgstr "Kalendár"
+#: ../calendar/gui/cal-search-bar.c:631
+msgid "Next 7 Days' Tasks"
+msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/cal-search-bar.c:635
+#, fuzzy
+msgid "Active Tasks"
+msgstr "Priradiť úlohu"
+
+#: ../calendar/gui/cal-search-bar.c:639
+#, fuzzy
+msgid "Overdue Tasks"
+msgstr "Úlohy _po termíne:"
+
+#: ../calendar/gui/cal-search-bar.c:643
+#, fuzzy
+msgid "Completed Tasks"
+msgstr "Dokončený "
+
+#: ../calendar/gui/cal-search-bar.c:647
+#, fuzzy
+msgid "Tasks with Attachments"
+msgstr "Prílohy"
+
+#: ../calendar/gui/cal-search-bar.c:693
+#, fuzzy
+msgid "Active Appointments"
+msgstr "Schôdzka"
+
+#: ../calendar/gui/cal-search-bar.c:697
+#, fuzzy
+msgid "Next 7 Days' Appointments"
+msgstr "_Celodenná Schôdzka"
+
+#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Tlačiť"
+
+#: ../calendar/gui/calendar-commands.c:324
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -4833,114 +5349,131 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: ../calendar/gui/calendar-commands.c:360
+#: ../calendar/gui/calendar-commands.c:330
 #, fuzzy
 msgid "Purge events older than"
 msgstr "vráti menej než"
 
-#: ../calendar/gui/calendar-commands.c:365
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
-#: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/google-account-setup/google-source.c:382
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "dní"
 
 #. Create the On the web source group
+#. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:511
+#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:258
+#: ../calendar/gui/calendar-component.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Počasie"
 
-#: ../calendar/gui/calendar-component.c:535
-#: ../calendar/gui/dialogs/calendar-setup.c:449
+#: ../calendar/gui/calendar-component.c:605
 #, fuzzy
-msgid "New Calendar"
+msgid "_New Calendar"
 msgstr "Nová Kaledónia"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2115
+msgid "_Copy..."
+msgstr "_Kopírovať..."
+
+#: ../calendar/gui/calendar-component.c:608
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/memos-component.c:467 ../calendar/gui/tasks-component.c:458
+#: ../composer/e-msg-composer.c:3740 ../mail/em-folder-tree.c:2129
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
+#, fuzzy
+msgid "_Properties"
+msgstr "Vlastnosti"
+
+#: ../calendar/gui/calendar-component.c:935
 #, fuzzy
 msgid "Failed upgrading calendars."
 msgstr "Načítavam kalendár..."
 
-#: ../calendar/gui/calendar-component.c:1154
+#: ../calendar/gui/calendar-component.c:1234
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1170
+#: ../calendar/gui/calendar-component.c:1250
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1363
 #, fuzzy
 msgid "Calendar Source Selector"
 msgstr "Informácie o kalendári"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1581
 msgid "New appointment"
 msgstr "Nová schôdzka"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1582
 msgid "_Appointment"
 msgstr "S_chôdzka"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1583
 msgid "Create a new appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1589
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1590
 msgid "M_eeting"
 msgstr "_Stretnutie"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1591
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Vytvorí novú požiadavku na stretnutie"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1597
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nová celodenná schôdzka"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1598
 #, fuzzy
 msgid "All Day A_ppointment"
 msgstr "_Celodenná Schôdzka"
 
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1599
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1605
 #, fuzzy
 msgid "New calendar"
 msgstr "Nová Kaledónia"
 
-#: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/calendar-component.c:1606
 #, fuzzy
 msgid "Cale_ndar"
 msgstr "Kalendár"
 
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1607
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Vytvoriť nový priečinok"
@@ -4961,22 +5494,39 @@ msgstr "Týždeň"
 msgid "Month View"
 msgstr "Mesiac"
 
-#: ../calendar/gui/comp-editor-factory.c:420
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2
+#, fuzzy
+msgid "Description Contains"
+msgstr "Popis obsahuje"
+
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:3
+#, fuzzy
+msgid "Summary Contains"
+msgstr "Súhrn obsahuje"
+
+#: ../calendar/gui/comp-editor-factory.c:404
 msgid "Error while opening the calendar"
 msgstr "Chyba pri otváraní kalendára"
 
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../calendar/gui/comp-editor-factory.c:410
 msgid "Method not supported when opening the calendar"
 msgstr "Nepodporovaná metóda pri otváraní kalendára"
 
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../calendar/gui/comp-editor-factory.c:416
 msgid "Permission denied to open the calendar"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1285
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#, fuzzy
+msgid "Edit Alarm"
+msgstr "Pridať pripomenutie"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Pripomenutie</b>"
@@ -5006,86 +5556,86 @@ msgid "Mes_sage:"
 msgstr "_Správa:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Play a sound"
 msgstr "Prehrať zvuk"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Pop up an alert"
 msgstr ""
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:458
 msgid "Run a program"
 msgstr "Spustiť program"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#, fuzzy
+msgid "Select A File"
+msgstr "Vybrať súbor"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "Adresát:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "Poslať e-mail"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
 msgstr "_Parametre:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
 msgstr "_Opakovať pripomenutie"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
 msgstr "_Zvuk:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "po"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "pred"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "dňa/í"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "koniec schôdzky"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "extra oprakovanie každých"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-msgid "hour(s)"
-msgstr "hodín"
-
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
+msgid "hour(s)"
 msgstr "hodín"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minút"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "začiatok schôdzky"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
 msgid "Action/Trigger"
 msgstr ""
 
@@ -5094,513 +5644,318 @@ msgid "A_dd"
 msgstr "_Pridať"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Pripomenutia"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
-#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr "príloha"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../calendar/gui/dialogs/meeting-page.c:887
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3400
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "_Odstrániť"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1084
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
-#: ../ui/evolution-mail-list.xml.h:29
-#, fuzzy
-msgid "_Properties"
-msgstr "Vlastnosti"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1086
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3403
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
+#: ../composer/e-msg-composer-select-file.c:93
 #, fuzzy
-msgid "_Add attachment..."
-msgstr "Pridať prílohu..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:963
-#, fuzzy
-msgid "Attachment Bar"
-msgstr "Príloha"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:6
-#: ../composer/e-msg-composer-select-file.c:97
-#: ../composer/e-msg-composer-select-file.c:117
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
+msgid "_Suggest automatic display of attachment"
 msgstr "Navrhnúť automatické zobrazovanie príloh"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:241
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
 msgid "Attach file(s)"
 msgstr "Priložiť súbor"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:210
-#: ../calendar/gui/dialogs/cal-attachment.c:226
-#: ../calendar/gui/dialogs/cal-attachment.c:319
-#: ../calendar/gui/dialogs/cal-attachment.c:335
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Nie je možné priložiť súbor %s: %s"
-
-#: ../calendar/gui/dialogs/cal-attachment.c:218
-#: ../calendar/gui/dialogs/cal-attachment.c:327
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Nie je možné priložiť súbor %s: nie je to normálny súbor"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Vlastnosti prílohy"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1166
-#: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-msgstr "Popis:"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "Meno súboru:"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "Typ MIME:"
-
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "Povolené"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
 #, fuzzy
-msgid "Are you sure you want to remove this URL?"
-msgstr "Naozaj chcete odstrániť tento účet?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
-msgid "Remove"
-msgstr "Odstrániť"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
-#, fuzzy
-msgid "Don't Remove"
-msgstr "Neimportovať"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "Zakázať"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "Povoliť"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 minút"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 minút"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 minút"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 minút"
+msgid "Selected Calendars for Alarms"
+msgstr "Kalendáre pre beh pripomenutí pre"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 minút"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Alerts</b>"
-msgstr "<b>Začína:</b> "
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, fuzzy
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "Informácie o kalendári"
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "<b>General</b>"
-msgstr "Pripomenutia"
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "Zobrazené správy:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Publishing</b>"
-msgstr "Požiadavka na informácie o voľnom čase"
+#: ../mail/mail-config.glade.h:17
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
-msgid "<b>Task List</b>"
-msgstr "Informácie o kalendári"
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "Zobrazené správy:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
-msgid "<b>Time</b>"
-msgstr "<b>Termín:</b> "
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "Zobrazené správy:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
-msgid "<b>Work Week</b>"
-msgstr "Pracovný týždeň"
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "Zobrazené správy:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Adjust for daylight sa_ving time"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "Nastavenie kalendára a úloh"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "Farba pre nestihnuté úlohy"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "Farba pre úlohy do dnešného dňa"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "Deň _končí:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "Dni"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #, fuzzy
 msgid "Display"
 msgstr "_Zobrazenie"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../mail/mail-config.glade.h:74
-msgid "E_nable"
-msgstr "_Povoliť"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
-msgid "Free/Busy"
-msgstr "Voľno/zaneprázdnený URL:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Friday"
 msgstr "Piatok"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "Hodiny"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minúty"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Monday"
 msgstr "Pondelok"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Publishing Table"
-msgstr "Požiadavka na informácie o voľnom čase"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Vyberte farbu"
+
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "S_un"
 msgstr "_Ne"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/e-itip-control.c:741
 msgid "Saturday"
 msgstr "Sobota"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Select the calendars for alarm notification"
+msgstr "Služba pripomenutia kalendára Evolution"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sh_ow a reminder"
 msgstr "_Zobraziť pripomenutie"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Show week _numbers in date navigator"
 msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "T_asks due today:"
 msgstr "Úlohy s _dnešným termínom:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "T_hu"
 msgstr "Š_tv"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "Template:"
 msgstr "Temple"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "Časová _zóna:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Time format:"
 msgstr "Formát času:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "W_eek starts:"
-msgstr "_Týždeň začína:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Wednesday"
 msgstr "Streda"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#, fuzzy
+msgid "Wee_k starts on:"
+msgstr "_Týždeň začína:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Work days:"
 msgstr "Pracovné dni:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_12 hour (AM/PM)"
 msgstr "_12-hodinový (am/pm)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_24 hour"
 msgstr "_24 hodín"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#, fuzzy
-msgid "_Add URL"
-msgstr "_Pridať"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Compress weekends in month view"
 msgstr "Z_hustiť víkendy v mesačnom pohľade"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Day begins:"
 msgstr "_Deň začína:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Fri"
 msgstr "P_ia"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Hide completed tasks after"
 msgstr "_Skryť dokončené úlohy po"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Mon"
 msgstr "_Pon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Overdue tasks:"
 msgstr "Úlohy _po termíne:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Sat"
 msgstr "_So"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#, fuzzy
+msgid "_Show appointment end times in week and month view"
 msgstr "Zobraziť _koncové časy schôdzok v týždennom a mesačnom pohľade"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Time divisions:"
 msgstr "Ro_zdelenie času:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Tue"
 msgstr "_Ut"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Wed"
 msgstr "_Str"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "before every appointment"
 msgstr "pred každou schôdzkou"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
-msgstr ""
+#: ../calendar/gui/dialogs/calendar-setup.c:272
+#, fuzzy
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr "Kopírovať obsah adresára lokálne pre prácu bez pripojenia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:287
-msgid "Copy calendar contents locally for offline operation"
-msgstr ""
+#: ../calendar/gui/dialogs/calendar-setup.c:274
+#, fuzzy
+msgid "Cop_y task list contents locally for offline operation"
+msgstr "Kopírovať obsah adresára lokálne pre prácu bez pripojenia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 #, fuzzy
-msgid "Copy task list contents locally for offline operation"
+msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Kopírovať obsah adresára lokálne pre prácu bez pripojenia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:341
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 #, fuzzy
 msgid "C_olor:"
 msgstr "_Farby"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 #, fuzzy
-msgid "Tasks List"
+msgid "Task List"
 msgstr "Zoznam úloh"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:447
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 #, fuzzy
-msgid "Calendar Properties"
-msgstr "Chyba iCalendar"
+msgid "Memo List"
+msgstr "Zoznam správ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:515
+#: ../calendar/gui/dialogs/calendar-setup.c:478
 #, fuzzy
-msgid "Task List Properties"
-msgstr "Zoznam úloh"
+msgid "Calendar Properties"
+msgstr "Chyba iCalendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.c:480
 #, fuzzy
-msgid "Add Calendar"
+msgid "New Calendar"
 msgstr "Nová Kaledónia"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:536
 #, fuzzy
-msgid "Add Task List"
+msgid "Task List Properties"
 msgstr "Zoznam úloh"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "Vyberte farbu"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Nová Kaledónia"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.c:592
 #, fuzzy
-msgid "_Add Task List"
+msgid "New Memo List"
 msgstr "Zoznam úloh"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
-#: ../plugins/calendar-http/calendar-http.c:248
-#: ../plugins/calendar-weather/calendar-weather.c:548
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Aktualizovať"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../plugins/calendar-http/calendar-http.c:120
-msgid "_URL:"
-msgstr "_URL:"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "týždňov"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Táto udalosť bola odstránená."
@@ -5610,8 +5965,9 @@ msgid "This task has been deleted."
 msgstr "Táto úloha bola odstránená."
 
 #: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "Táto položka denníka bola odstránená."
+#, fuzzy
+msgid "This memo has been deleted."
+msgstr "Táto udalosť bola odstránená."
 
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
@@ -5632,8 +5988,9 @@ msgid "This task has been changed."
 msgstr "Táto úloha bola zmenená."
 
 #: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "Táto položka denníka bola zmenená."
+#, fuzzy
+msgid "This memo has been changed."
+msgstr "Táto udalosť bola zmenená."
 
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
@@ -5645,74 +6002,64 @@ msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny. Aktualizovať editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:519
 #, c-format
 msgid "Validation error: %s"
 msgstr "Chyba validácie: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2247
 msgid " to "
 msgstr " do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2251
 msgid " (Completed "
 msgstr " (Dokončený "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2253
 msgid "Completed "
 msgstr "Dokončený "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2258
 msgid " (Due "
 msgstr " (Termín do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2260
 msgid "Due "
 msgstr "Termín do "
 
-#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2956
 #, fuzzy, c-format
 msgid "Attached message - %s"
 msgstr "Predaná správa - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:195
-#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
-#: ../composer/e-msg-composer.c:2846
+#: ../calendar/gui/dialogs/comp-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2961
+#: ../composer/e-msg-composer.c:3146
 #, fuzzy, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Priložiť pôvodnú správu"
 msgstr[1] "Priložiť pôvodnú správu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
-msgid "_Copy"
-msgstr "_Kopírovať"
-
-#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3210
+#: ../mail/em-folder-tree.c:1002 ../mail/em-folder-utils.c:369
+#: ../mail/em-folder-view.c:1171 ../mail/message-list.c:1970
 #, fuzzy
 msgid "_Move"
 msgstr "Presunúť"
 
-#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3212
+#: ../mail/em-folder-tree.c:1004 ../mail/message-list.c:1972
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Zrušiť úlohu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:824
 msgid "Could not update object"
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
+#: ../calendar/gui/dialogs/comp-editor.c:974 ../composer/e-msg-composer.c:2573
 #, fuzzy, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5720,57 +6067,95 @@ msgstr[0] "Príloha"
 msgstr[1] "Príloha"
 msgstr[2] "Príloha"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-msgid "_Attachment Bar (drop attachments here)"
+#: ../calendar/gui/dialogs/comp-editor.c:1006
+#, fuzzy
+msgid "Hide Attachment _Bar"
+msgstr "Príloha"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1557
+#, fuzzy
+msgid "Show Attachment _Bar"
+msgstr "Príloha"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1969
+#: ../calendar/gui/dialogs/task-page.c:1255 ../composer/e-msg-composer.c:3739
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Remove"
+msgstr "_Odstrániť"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../composer/e-msg-composer.c:3742
+#, fuzzy
+msgid "_Add attachment..."
+msgstr "Pridať prílohu..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1581
+#: ../mail/em-format-html-display.c:2320
+#, fuzzy
+msgid "Show Attachments"
+msgstr "Príloha"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1582
+msgid "Press space key to toggle attachment bar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1850
-#: ../calendar/gui/dialogs/comp-editor.c:1893
+#: ../calendar/gui/dialogs/comp-editor.c:2188
+#: ../calendar/gui/dialogs/comp-editor.c:2231
 msgid "Edit Appointment"
 msgstr "Upraviť schôdzku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1899
+#: ../calendar/gui/dialogs/comp-editor.c:2194
+#: ../calendar/gui/dialogs/comp-editor.c:2237
 #, fuzzy, c-format
 msgid "Meeting - %s"
 msgstr "Stretnutie"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1858
-#: ../calendar/gui/dialogs/comp-editor.c:1901
+#: ../calendar/gui/dialogs/comp-editor.c:2196
+#: ../calendar/gui/dialogs/comp-editor.c:2239
 #, c-format
 msgid "Appointment - %s"
 msgstr "Schôdzka - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1862
-#: ../calendar/gui/dialogs/comp-editor.c:1905
+#: ../calendar/gui/dialogs/comp-editor.c:2200
+#: ../calendar/gui/dialogs/comp-editor.c:2243
 #, fuzzy, c-format
 msgid "Assigned Task - %s"
 msgstr "Priradiť úlohu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1864
-#: ../calendar/gui/dialogs/comp-editor.c:1907
+#: ../calendar/gui/dialogs/comp-editor.c:2202
+#: ../calendar/gui/dialogs/comp-editor.c:2245
 #, c-format
 msgid "Task - %s"
 msgstr "Úloha - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1867
-#: ../calendar/gui/dialogs/comp-editor.c:1910
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Položka denníka - %s"
+#: ../calendar/gui/dialogs/comp-editor.c:2205
+#: ../calendar/gui/dialogs/comp-editor.c:2248
+#, fuzzy, c-format
+msgid "Memo - %s"
+msgstr "Stretnutie"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1878
-#: ../calendar/gui/dialogs/comp-editor.c:1920
+#: ../calendar/gui/dialogs/comp-editor.c:2216
+#: ../calendar/gui/dialogs/comp-editor.c:2258
 msgid "No summary"
 msgstr "Žiadny súhrn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:2820 ../mail/em-utils.c:370
+#: ../plugins/prefer-plain/prefer-plain.c:79
+#: ../widgets/misc/e-attachment-bar.c:360
+msgid "attachment"
+msgstr "príloha"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2909
+#: ../calendar/gui/dialogs/comp-editor.c:2963
+#: ../calendar/gui/dialogs/comp-editor.c:2987
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Zmeny tejto položky môžu byť zahodné v prípade, že príde aktualizácia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2609
+#: ../calendar/gui/dialogs/comp-editor.c:3016
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Nepodarilo sa získať aktuálnu verziu!"
@@ -5789,6 +6174,10 @@ msgstr "Zrušiť operáciu"
 msgid "Destination is read only"
 msgstr ""
 
+#: ../calendar/gui/dialogs/delete-comp.c:206
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr ""
+
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Udalosť nie je možné odstrániť kvôli chybe systému CORBA"
@@ -5798,8 +6187,9 @@ msgid "The task could not be deleted due to a corba error"
 msgstr "Úlohu nie je možné odstrániť kvôli chybe systému CORBA"
 
 #: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "Položku žurnálu nie je možné odstrániť kvôli chybe systému CORBA"
+#, fuzzy
+msgid "The memo could not be deleted due to a corba error"
+msgstr "Položku nie je možné odstrániť kvôli chybe systému CORBA"
 
 #: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
@@ -5814,8 +6204,9 @@ msgid "The task could not be deleted because permission was denied"
 msgstr "Úlohu nie je možné odstrániť kvôli nedostatočným právam"
 
 #: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "Položku žurnálu nie je možné odstrániť kvôli nedostatočným právam"
+#, fuzzy
+msgid "The memo could not be deleted because permission was denied"
+msgstr "Položku nie je možné odstrániť kvôli nedostatočným právam"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -5833,8 +6224,8 @@ msgstr "Úlohu nie je možné odstrániť kvôli chybe systému CORBA"
 
 #: ../calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
-msgid "The journal entry could not be deleted due to an error"
-msgstr "Položku žurnálu nie je možné odstrániť kvôli chybe systému CORBA"
+msgid "The memo could not be deleted due to an error"
+msgstr "Položku nie je možné odstrániť kvôli chybe systému CORBA"
 
 #: ../calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
@@ -5855,312 +6246,215 @@ msgstr "Delegovať na:"
 msgid "Enter Delegate"
 msgstr "Zadajte na koho delegovať"
 
-#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
-msgid "Appointment"
+#: ../calendar/gui/dialogs/event-editor.c:602
+#, fuzzy
+msgid "Appoint_ment"
 msgstr "Schôdzka"
 
-#: ../calendar/gui/dialogs/event-editor.c:150
+#: ../calendar/gui/dialogs/event-editor.c:606
+#: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Opakovanie"
 
-#: ../calendar/gui/dialogs/event-editor.c:164
-#: ../calendar/gui/dialogs/event-editor.c:248
-#: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Scheduling"
-msgstr "Plánovanie"
+#: ../calendar/gui/dialogs/event-page.c:828
+#: ../calendar/gui/dialogs/event-page.c:2837
+#, fuzzy
+msgid "This event has alarms"
+msgstr "Táto udalosť bola zmenená."
 
-#: ../calendar/gui/dialogs/event-editor.c:174
+#: ../calendar/gui/dialogs/event-page.c:908
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.c:460
 #, fuzzy
-msgid "Delegatees"
-msgstr "Delegované"
+msgid "Or_ganizer:"
+msgstr "Organizátor:"
 
-#: ../calendar/gui/dialogs/event-editor.c:178
+#: ../calendar/gui/dialogs/event-page.c:946
 #, fuzzy
-msgid "Attendees"
-msgstr "Účastník"
+msgid "_Delegatees"
+msgstr "Delegované"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
-#: ../calendar/gui/dialogs/event-editor.c:425
+#: ../calendar/gui/dialogs/event-page.c:948
 #, fuzzy
-msgid "Invitations"
-msgstr "Informácia"
+msgid "Atte_ndees"
+msgstr "Účastník"
 
-#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:1130
 #, fuzzy
 msgid "Event with no start date"
 msgstr "Koncový dátum je pred dátumom začiatku."
 
-#: ../calendar/gui/dialogs/event-page.c:734
+#: ../calendar/gui/dialogs/event-page.c:1133
 msgid "Event with no end date"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:1305
+#: ../calendar/gui/dialogs/memo-page.c:703
+#: ../calendar/gui/dialogs/task-page.c:884
 msgid "Start date is wrong"
 msgstr "Dátum začiatku je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1315
 msgid "End date is wrong"
 msgstr "Dátum konca je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:933
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "Start time is wrong"
 msgstr "Čas začiatku je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1345
 msgid "End time is wrong"
 msgstr "Čas konca je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/event-page.c:1507
+#: ../calendar/gui/dialogs/memo-page.c:742
+#: ../calendar/gui/dialogs/task-page.c:943
+msgid "The organizer selected no longer has an account."
+msgstr "Vybraný organizér už nemá účet."
+
+#: ../calendar/gui/dialogs/event-page.c:1513
+#: ../calendar/gui/dialogs/memo-page.c:748
+#: ../calendar/gui/dialogs/task-page.c:949
+msgid "An organizer is required."
+msgstr "Organizátor je vyžadovaný."
+
+#: ../calendar/gui/dialogs/event-page.c:1538
+#: ../calendar/gui/dialogs/task-page.c:973
+msgid "At least one attendee is required."
+msgstr "Nutný je aspoň jeden účastník."
+
+#: ../calendar/gui/dialogs/event-page.c:1970
+#: ../calendar/gui/dialogs/task-page.c:1256
+#, fuzzy
+msgid "_Add "
+msgstr "_Pridať"
+
+#: ../calendar/gui/dialogs/event-page.c:2713
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:2757
+#: ../calendar/gui/dialogs/memo-page.c:958
+#: ../calendar/gui/dialogs/task-page.c:1914
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:3056
 #, fuzzy, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "pred každou schôdzkou"
 msgstr[1] "pred každou schôdzkou"
 
-#: ../calendar/gui/dialogs/event-page.c:1900
+#: ../calendar/gui/dialogs/event-page.c:3062
 #, fuzzy, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "koniec schôdzky"
 msgstr[1] "koniec schôdzky"
 
-#: ../calendar/gui/dialogs/event-page.c:1908
+#: ../calendar/gui/dialogs/event-page.c:3068
 #, fuzzy, c-format
-msgid "%d minute before appointement"
+msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "pred každou schôdzkou"
 msgstr[1] "pred každou schôdzkou"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:3081
+#, fuzzy
+msgid "Customize"
+msgstr "Uložiť vlastný pohľad..."
+
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/event-page.c:3086
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:657
+#: ../calendar/gui/e-itip-control.c:1141 ../composer/e-msg-composer.c:2357
+#: ../filter/filter-rule.c:892 ../mail/em-account-editor.c:701
+#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:478
+#: ../mail/em-junk-hook.c:83
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates-user.c:200
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:1995
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1517
+#: ../widgets/misc/e-dateedit.c:1728
+msgid "None"
+msgstr "Žiadna"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
 #, fuzzy
 msgid "1 day before appointment"
 msgstr "pred každou schôdzkou"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 #, fuzzy
 msgid "1 hour before appointment"
 msgstr "pred každou schôdzkou"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 #, fuzzy
 msgid "15 minutes before appointment"
 msgstr "pred každou schôdzkou"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.glade.h:1
 #, fuzzy
-msgid "<b>Basics</b>"
-msgstr "Informácie o kalendári"
+msgid "Attendee_s..."
+msgstr "Účastník"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-#, fuzzy
-msgid "<b>Date and Time</b>"
-msgstr "Dátum a čas"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
-msgid "<b>Send Options</b>"
-msgstr "Popis:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "A_ll day event"
-msgstr "_Celodenná udalosť"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#, fuzzy
-msgid "C_ustomize..."
-msgstr "Uložiť vlastný pohľad..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegórie..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #, fuzzy
-msgid "Cale_ndar:"
-msgstr "Kalen_dár:"
+msgid "Custom Alarm:"
+msgstr "Vlastný zvuk pripomenutia"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 #, fuzzy
-msgid "Classi_fication:"
-msgstr "Klasifikácia"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:360
-msgid "Confidential"
-msgstr "Tajný"
+msgid "D_escription:"
+msgstr "Popis:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
 msgid "Event Description"
 msgstr "Popis:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#, fuzzy
-msgid "Locat_ion:"
-msgstr "Umiestnenie:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:359
-msgid "Private"
-msgstr "Súkromný"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
-msgid "Public"
-msgstr "Verejný"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#, fuzzy
-msgid "Show time as _busy"
-msgstr "Zobraziť čas ako"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Súhrn:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid "This appointment has customized alarms"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "_Pripomenutie"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-msgid "_Description:"
-msgstr "_Popis:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:642
-msgid "_End time:"
-msgstr "Čas _konca:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:615
-msgid "_Start time:"
-msgstr "Čas _začiatku:"
-
-#: ../calendar/gui/dialogs/meeting-page.c:303
-#, fuzzy
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>Stav:</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.c:307
+#: ../calendar/gui/dialogs/event-page.glade.h:17
 #, fuzzy
-msgid "<b>From:</b>"
-msgstr "<b>Domov</b>"
-
-#. an empty string is the same as 'None'
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:313
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
-#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
-msgid "None"
-msgstr "Žiadna"
-
-#: ../calendar/gui/dialogs/meeting-page.c:461
-msgid "The organizer selected no longer has an account."
-msgstr "Vybraný organizér už nemá účet."
-
-#: ../calendar/gui/dialogs/meeting-page.c:467
-msgid "An organizer is required."
-msgstr "Organizátor je vyžadovaný."
-
-#: ../calendar/gui/dialogs/meeting-page.c:482
-msgid "At least one attendee is required."
-msgstr "Nutný je aspoň jeden účastník."
-
-#: ../calendar/gui/dialogs/meeting-page.c:884
-msgid "_Delegate To..."
-msgstr "_Delegovať na..."
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-list-view.c:358
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Účastník"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "Kliknutím pridáte účastníka"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Spoločé meno"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegované od"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegované na"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Jazyk"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Člen"
+msgid "_Time:"
+msgstr "Ča_sový limit:"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:386
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "for"
+msgstr "počas"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:147
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:394
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Stav"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+msgid "until"
+msgstr "pokým"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 #, fuzzy
@@ -6173,155 +6467,218 @@ msgid "C_hange Organizer"
 msgstr "_Zmeniť organizátora"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-#: ../calendar/gui/e-meeting-time-sel.c:428
 #, fuzzy
-msgid "Con_tacts..."
+msgid "Co_ntacts..."
 msgstr "Kontakty"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
-msgid "Or_ganizer:"
-msgstr "Organizátor:"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 #, fuzzy
 msgid "Organizer"
 msgstr "Organizátor:"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organizátor:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-#, fuzzy
-msgid "<b>Calendar options</b>"
-msgstr "Informácie o kalendári"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-#, fuzzy
-msgid "Add New Calendar"
-msgstr "Nová Kaledónia"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2355
 #, fuzzy
-msgid "Calendar Group"
-msgstr "Chyba iCalendar"
+msgid "Memo"
+msgstr "Po"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-#, fuzzy
-msgid "Calendar Location"
-msgstr "Informácie o kalendári"
+#: ../calendar/gui/dialogs/memo-page.c:920
+#, fuzzy, c-format
+msgid "Unable to open memos in '%s'."
+msgstr "Nie je možné otvoriť adresár"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:6
-#, fuzzy
-msgid "Calendar Name"
-msgstr "Kalendár"
+#: ../calendar/gui/dialogs/memo-page.c:1104 ../mail/em-format-html.c:1526
+#: ../mail/em-format-html.c:1584 ../mail/em-format-html.c:1610
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:89 ../mail/message-list.etspec.h:18
+msgid "To"
+msgstr "Komu"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "<b>Task List Options</b>"
-msgstr "Informácie o kalendári"
+msgid "Sta_rt date:"
+msgstr "_Počiatočný dátum:"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
 #, fuzzy
-msgid "Add New Task List"
-msgstr "Zoznam úloh"
+msgid "T_o:"
+msgstr "Vrchný:"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-#, fuzzy
-msgid "Task List Group"
-msgstr "Zoznam úloh"
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+msgid "_Description:"
+msgstr "_Popis:"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.c:453
+#: ../calendar/gui/dialogs/task-page.glade.h:9
 #, fuzzy
-msgid "Task List Name"
-msgstr "Zoznam úloh"
+msgid "_Group:"
+msgstr "Skupina"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
+#, fuzzy
+msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Upravujete opakujúcu sa udalosť. Čo chcete zmeniť?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, fuzzy
-msgid "You are delegating a recurring event, what would like to delegate?"
+msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Upravujete opakujúcu sa udalosť. Čo chcete zmeniť?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring task, what would you like to modify?"
+#, fuzzy
+msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Upravujete opakujúcu sa úlohu. Čo chcete zmeniť?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Upravujete opakujúcu sa položku žurnálu. Čo chcete zmeniť?"
+#, fuzzy
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Upravujete opakujúcu sa udalosť. Čo chcete zmeniť?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Iba tento výskyt"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Tento a budúce výskyty"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Tento a budúce výskyty"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Všetky výskyty"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:496
+#: ../calendar/gui/dialogs/recurrence-page.c:498
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:817
+#: ../calendar/gui/dialogs/recurrence-page.c:819
 msgid "Recurrence date is invalid"
 msgstr "Dátum opakovania je neplatný"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "zapnutá"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:996
 msgid "first"
 msgstr "prvý"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1002
 msgid "second"
 msgstr "sekundy"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1007
 msgid "third"
 msgstr "tretí"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1012
 msgid "fourth"
 msgstr "štvrtý"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1017
 msgid "last"
 msgstr "posledný"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "Other Date"
 msgstr "Iný dátum"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
+msgid "1st to 10th"
+msgstr ""
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1057
+msgid "11th to 20th"
+msgstr ""
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1063
+msgid "21st to 31st"
+msgstr ""
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "day"
 msgstr "deň"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1226
 msgid "on the"
 msgstr " "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1369
+#: ../calendar/gui/dialogs/recurrence-page.c:1419
 msgid "occurrences"
 msgstr "výskytov"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2325
+#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#, fuzzy
+msgid "Add exception"
+msgstr "popis"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2200
+msgid "Could not get a selection to modify."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2206
+msgid "Modify exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#, fuzzy
+msgid "Could not get a selection to delete."
+msgstr "Nepodarilo sa aktualizovať objekt"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
 #, fuzzy
 msgid "Date/Time"
 msgstr "Dátum a čas:"
@@ -6332,7 +6689,7 @@ msgid "<b>Exceptions</b>"
 msgstr "Popis:"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Ukážka"
@@ -6342,36 +6699,38 @@ msgstr "Ukážka"
 msgid "<b>Recurrence</b>"
 msgstr "Opakovanie"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Every"
 msgstr "Každých"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 #, fuzzy
 msgid "This appointment rec_urs"
 msgstr "_Upraviť schôdzku"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "počas"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "forever"
 msgstr "navždy"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
 msgid "month(s)"
 msgstr "mesiaca/ov"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "pokým"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
 msgid "week(s)"
 msgstr "týždňov"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
 msgstr "rokov"
 
@@ -6380,7 +6739,7 @@ msgstr "rokov"
 msgid "Completed date is wrong"
 msgstr "Dátum dokončenia je neplatný"
 
-#: ../calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:515
 #, fuzzy
 msgid "Web Page"
 msgstr "Adresa _WWW stránky:"
@@ -6398,48 +6757,48 @@ msgstr "Zobrazené správy:"
 #. 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:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-model-tasks.c:348
+#: ../calendar/gui/e-cal-model-tasks.c:663
+#: ../calendar/gui/e-calendar-table.c:402 ../calendar/gui/e-itip-control.c:933
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/print.c:2416 ../plugins/save-calendar/csv-format.c:386
 msgid "Completed"
 msgstr "Dokončený"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
+#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-calendar-table.c:327 ../mail/message-list.c:1036
 msgid "High"
 msgstr "Vysoká"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-model-tasks.c:346
+#: ../calendar/gui/e-cal-model-tasks.c:661
+#: ../calendar/gui/e-cal-model-tasks.c:736
+#: ../calendar/gui/e-calendar-table.c:401 ../calendar/gui/print.c:2413
 msgid "In Progress"
 msgstr "Prebieha"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
+#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-calendar-table.c:329 ../mail/message-list.c:1034
 msgid "Low"
 msgstr "Nízka"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
-#: ../mail/message-list.c:1007
+#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-model.c:965 ../calendar/gui/e-calendar-table.c:328
+#: ../mail/message-list.c:1035
 msgid "Normal"
 msgstr "Normálny"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-model-tasks.c:344
+#: ../calendar/gui/e-cal-model-tasks.c:659
+#: ../calendar/gui/e-calendar-table.c:400 ../calendar/gui/print.c:2410
 msgid "Not Started"
 msgstr "Nezačal"
 
@@ -6449,278 +6808,256 @@ msgid "P_ercent complete:"
 msgstr "Dokončených percent: %i"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:383
+#, fuzzy
+msgid "Stat_us:"
+msgstr "Stav:"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:330
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #, fuzzy
 msgid "_Date completed:"
 msgstr "Dátum dokončenia:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Priority:"
 msgstr "_Priorita:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-msgid "_Status:"
-msgstr "_Stav:"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 #, fuzzy
 msgid "_Web Page:"
 msgstr "Adresa _WWW stránky:"
 
-#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
-msgid "Task"
-msgstr "Úloha"
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1317
+msgid "_Task"
+msgstr "Ú_loha"
 
-#: ../calendar/gui/dialogs/task-editor.c:162
-#: ../calendar/gui/dialogs/task-editor.c:224
-#: ../calendar/gui/dialogs/task-editor.c:378
-msgid "Assignment"
-msgstr "Priradenie"
+#: ../calendar/gui/dialogs/task-editor.c:430
+#, fuzzy
+msgid "Task Details"
+msgstr "Detaily"
 
-#: ../calendar/gui/dialogs/task-page.c:529
+#: ../calendar/gui/dialogs/task-page.c:857
 msgid "Due date is wrong"
 msgstr "Termín je neplatný"
 
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/task-page.c:1871
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nie je možné otvoriť adresár"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:1
 #, fuzzy
-msgid "D_escription:"
-msgstr "Popis:"
+msgid "Atte_ndees..."
+msgstr "Účastník"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 #, fuzzy
-msgid "Sta_rt date:"
-msgstr "_Počiatočný dátum:"
+msgid "Categor_ies..."
+msgstr "Ka_tegórie..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
-msgid "Task Description"
+msgid "De_scription:"
 msgstr "Popis:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:15
-#, fuzzy
-msgid "_Due date:"
-msgstr "_Termín:"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:16
-#, fuzzy
-msgid "_Group:"
-msgstr "Skupina"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-#, fuzzy
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "Informácie o kalendári"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing Frequency</b>"
-msgstr ""
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-#, fuzzy
-msgid "<b>Publishing _Location</b>"
-msgstr "Požiadavka na informácie o voľnom čase"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-#, fuzzy
-msgid "Free/Busy Publishing Settings"
-msgstr "Požiadavka na informácie o voľnom čase"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-#, fuzzy
-msgid "_Daily"
-msgstr "Deň"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#, fuzzy
-msgid "_Manual"
-msgstr "Managua"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#, fuzzy
-msgid "_Password:"
-msgstr "Heslo"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
-msgid "_Remember password"
-msgstr "Uložiť toto heslo"
+msgid "Or_ganiser:"
+msgstr "Organizátor:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
-msgid "_Username:"
-msgstr "Po_užívateľ:"
+msgid "Time zone:"
+msgstr "Časová _zóna:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
-msgid "_Weekly"
-msgstr "Týždeň"
+msgid "_Due date:"
+msgstr "_Termín:"
 
-#: ../calendar/gui/e-alarm-list.c:395
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:396
 #, fuzzy, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dní"
 msgstr[1] "%d dní"
 
-#: ../calendar/gui/e-alarm-list.c:400
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:402
 #, fuzzy, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d týždňov"
 msgstr[1] "%d týždňov"
 
-#: ../calendar/gui/e-alarm-list.c:405
-#, fuzzy, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hodín"
-msgstr[1] "%d hodín"
-
-#: ../calendar/gui/e-alarm-list.c:410
-#, fuzzy, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minút"
-msgstr[1] "%d minút"
-
-#: ../calendar/gui/e-alarm-list.c:415
-#, fuzzy, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekúnd"
-msgstr[1] "%d sekúnd"
-
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Má sa vykonať neznáma akcia"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s pred začiatkom schôdzky"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:483
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po začiatku schôdzky"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na začiatku schôdzky"
 
-#: ../calendar/gui/e-alarm-list.c:497
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:501
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s pred koncom schôdzky"
 
-#: ../calendar/gui/e-alarm-list.c:500
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:506
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po konci schôdzky"
 
-#: ../calendar/gui/e-alarm-list.c:505
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:513
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na konci schôdzky"
 
-#: ../calendar/gui/e-alarm-list.c:527
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:537
 #, c-format
 msgid "%s at %s"
 msgstr "%s o %s"
 
-#: ../calendar/gui/e-alarm-list.c:533
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:545
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s pre neznámy typ spustenia"
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
+#: ../calendar/gui/e-cal-component-memo-preview.c:74
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3069
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Kliknutím pridáte úlohu"
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-memo-preview.c:160
+#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
+#: ../shell/e-shell-folder-title-bar.c:593
 msgid "Untitled"
 msgstr "Bez mena"
 
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
-#: ../calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Súhrn:"
-
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../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
 #, fuzzy
 msgid "Start Date:"
 msgstr "_Počiatočný dátum:"
 
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-memo-preview.c:225
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:68
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Description:"
+msgstr "Popis:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:307
+#, fuzzy
+msgid "Web Page:"
+msgstr "Adresa _WWW stránky:"
+
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-itip-control.glade.h:9
+msgid "Summary:"
+msgstr "Súhrn:"
+
+#: ../calendar/gui/e-cal-component-preview.c:222
 #, fuzzy
 msgid "Due Date:"
 msgstr "_Termín:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-itip-control.c:1169
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:1026
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:253
 #, fuzzy
 msgid "Priority:"
 msgstr "_Priorita:"
 
-#: ../calendar/gui/e-cal-component-preview.c:299
-#, fuzzy
-msgid "Web Page:"
-msgstr "Adresa _WWW stránky:"
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:317
+#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:305
+msgid "Public"
+msgstr "Verejný"
+
+#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:326
+#: ../calendar/gui/e-calendar-table.c:306
+msgid "Private"
+msgstr "Súkromný"
+
+#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:328
+#: ../calendar/gui/e-calendar-table.c:307
+msgid "Confidential"
+msgstr "Tajný"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Dátum konca"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Start Date"
 msgstr "Dátum štartu"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Summary"
 msgstr "Súhrn"
 
-#: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:432
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:379
 msgid "Free"
 msgstr "Voľný"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:433
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:380
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:611
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6730,172 +7067,210 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1011 ../calendar/gui/e-cal-model.c:971
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:749
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Áno"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1011 ../calendar/gui/e-cal-model.c:971
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:168
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nie"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1652
-#: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:659
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../calendar/gui/e-cal-model.c:330 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-meeting-list-view.c:169
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:212 ../mail/em-utils.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/plugin-manager/plugin-manager.c:82
+#: ../widgets/misc/e-attachment-bar.c:722
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:967
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:969
 msgid "Assigned"
 msgstr "Priradené"
 
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#, fuzzy
+msgid "Save As..."
+msgstr "Uložiť _ako..."
+
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2165
+msgid "Select folder to save selected attachments..."
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#, fuzzy, c-format
+msgid "untitled_image.%s"
+msgstr "Správa bez mena"
+
+#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1327
+#: ../calendar/gui/e-calendar-view.c:1675 ../calendar/gui/e-memo-table.c:922
+#: ../mail/em-folder-view.c:1286 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+msgid "_Save As..."
+msgstr "Uložiť _ako..."
+
+#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
+#: ../mail/em-popup.c:583
+msgid "Set as _Background"
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:281
+#, fuzzy
+msgid "_Save Selected"
+msgstr "Uložiť vybrané"
+
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:791
+#, c-format
+msgid "Open in %s..."
+msgstr "Otvoriť v %s..."
+
+#: ../calendar/gui/e-calendar-table.c:349
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:350
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:351
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:352
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:353
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:354
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:355
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:356
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:357
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:358
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:359
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:514
-#, fuzzy
-msgid "Task Table"
-msgstr "Aktualizácia úlohy"
-
-#: ../calendar/gui/e-calendar-table.c:692
-#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-calendar-table.c:635
+#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Odstráňujem vybrané objekty"
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:789
+#: ../calendar/gui/e-calendar-table.c:915
+#: ../calendar/gui/e-calendar-view.c:802 ../calendar/gui/e-memo-table.c:642
 msgid "Updating objects"
 msgstr "Aktualizujem objekty"
 
-#: ../calendar/gui/e-calendar-table.c:1012
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1099
+#: ../calendar/gui/e-calendar-view.c:1224 ../calendar/gui/e-memo-table.c:817
+#: ../composer/e-msg-composer.c:1388
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-table.c:1322
+#: ../calendar/gui/e-calendar-view.c:1657
+#, fuzzy
+msgid "New _Task"
+msgstr "Nová úloha"
+
+#: ../calendar/gui/e-calendar-table.c:1326 ../calendar/gui/e-memo-table.c:921
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Otvoriť správu"
 
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
-#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
-msgid "_Save As..."
-msgstr "Uložiť _ako..."
-
-#: ../calendar/gui/e-calendar-table.c:1157
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1328
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:923
+#: ../mail/em-folder-view.c:1287
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
+#: ../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 "_Tlačiť..."
 
-#: ../calendar/gui/e-calendar-table.c:1161
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1332
+#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:927
+#: ../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 "Vystri_hnúť"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
-#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1334
+#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:929
+#: ../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 "_Vložiť"
 
-#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1338 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Priradiť úlohu"
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1339 ../calendar/gui/e-memo-table.c:933
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Poslať ďalej ako i_Calendar"
 
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1340
 msgid "_Mark as Complete"
 msgstr "_Označiť ako dokončenú"
 
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1341
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Označiť úlohy ako dokončené"
 
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-tasks.xml.h:22
-msgid "_Delete"
-msgstr "_Odstrániť"
+#: ../calendar/gui/e-calendar-table.c:1342
+#, fuzzy
+msgid "_Mark as Incomplete"
+msgstr "_Označiť ako dokončenú"
 
-#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-table.c:1343
+#, fuzzy
+msgid "_Mark Selected Tasks as Incomplete"
+msgstr "_Označiť úlohy ako dokončené"
+
+#: ../calendar/gui/e-calendar-table.c:1348
 msgid "_Delete Selected Tasks"
 msgstr "O_dstrániť vybrané úlohy"
 
-#: ../calendar/gui/e-calendar-table.c:1326
+#: ../calendar/gui/e-calendar-table.c:1582
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknutím pridáte úlohu"
@@ -6905,7 +7280,7 @@ msgstr "Kliknutím pridáte úlohu"
 msgid "% Complete"
 msgstr "% hotových"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Hotovo"
 
@@ -6920,7 +7295,7 @@ msgid "Due date"
 msgstr "Termín"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "Priority"
 msgstr "Priorita"
 
@@ -6929,119 +7304,146 @@ msgstr "Priorita"
 msgid "Start date"
 msgstr "Dátum štartu"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "Triedenie úloh"
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:534
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:16
+msgid "Status"
+msgstr "Stav"
 
-#: ../calendar/gui/e-calendar-view.c:1231
+#: ../calendar/gui/e-calendar-view.c:1343
 #, fuzzy
 msgid "Moving items"
 msgstr "Presúvam správy"
 
-#: ../calendar/gui/e-calendar-view.c:1233
+#: ../calendar/gui/e-calendar-view.c:1345
 #, fuzzy
 msgid "Copying items"
 msgstr "Kopírujem správy"
 
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka..."
 
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1655
 msgid "New All Day _Event"
 msgstr "Nová celodenná _udalosť"
 
-#: ../calendar/gui/e-calendar-view.c:1506
-msgid "New Task"
-msgstr "Nová úloha"
+#: ../calendar/gui/e-calendar-view.c:1656
+#, fuzzy
+msgid "New _Meeting"
+msgstr "Nové stretnutie"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
-msgid "Current View"
-msgstr "Aktuálny pohľad"
+#: ../calendar/gui/e-calendar-view.c:1667
+msgid "_Current View"
+msgstr "_Aktuálny pohľad"
 
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1669
 #, fuzzy
-msgid "Select _Today"
+msgid "Select T_oday"
 msgstr "Vybrať _vlákno"
 
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1670
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Odstrániť..."
 
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "_Publikovať informácie o voľnom čase"
-
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1686
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopírovať do priečinku..."
 
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1687
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1688
 #, fuzzy
 msgid "_Delegate Meeting..."
 msgstr "Naplánovať _stretnutie..."
 
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1689
 msgid "_Schedule Meeting..."
 msgstr "Naplánovať _stretnutie..."
 
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1690
 msgid "_Forward as iCalendar..."
 msgstr "Poslať ďalej ako i_Calendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1691
+#, fuzzy
+msgid "_Reply"
+msgstr "Odpovedať"
+
+#: ../calendar/gui/e-calendar-view.c:1692 ../mail/em-folder-view.c:1280
+#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr "Odpovedať _všetkým"
+
+#: ../calendar/gui/e-calendar-view.c:1697
 msgid "Make this Occurrence _Movable"
 msgstr "Nastaviť tento výskyt ako _presunuteľný"
 
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1698 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Odstrániť tento vý_skyt"
 
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1699
 msgid "Delete _All Occurrences"
 msgstr "Odstrániť _všetky výskyty"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:2196
+#, fuzzy, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizátor:"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:2200
+#, fuzzy, c-format
+msgid "Organizer: %s"
+msgstr "Organizátor:"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2216 ../calendar/gui/print.c:2384
+#, fuzzy, c-format
+msgid "Location: %s"
+msgstr "Umiestnenie:"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2247
+#, fuzzy, c-format
+msgid "Time: %s %s"
+msgstr "%s %s z "
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
-#: ../e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:116
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
-#: ../e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:119
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:123
-#, c-format
+#: ../calendar/gui/e-cell-date-edit-text.c:127
+#, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
-"\n"
 "%s"
 msgstr ""
 "Dátum musí byť vo formáte:\n"
 "\n"
 "%s"
 
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:807
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i rozdelení minúty"
@@ -7052,546 +7454,580 @@ msgstr "%02i rozdelení minúty"
 #. 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:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:1354
+#: ../calendar/gui/e-day-view.c:2171
+#: ../calendar/gui/e-week-view-main-item.c:310
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1566
 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:748 ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:766 ../calendar/gui/e-day-view.c:1119
+#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
 msgid "am"
 msgstr "dopoludnia"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
+#: ../calendar/gui/e-week-view.c:509 ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "popoludní"
 
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:769
 msgid "Yes. (Complex Recurrence)"
 msgstr "Áno. (Úplné opakovanie)"
 
-#: ../calendar/gui/e-itip-control.c:774
+#. For Translators: In this can also be translated as "With the period of %d
+#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d day/days"
+#. For Translators : 'Every day' is event Recurring every day
+#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
+#: ../calendar/gui/e-itip-control.c:785
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Každý deň"
 msgstr[1] "Každý deň"
 
-#: ../calendar/gui/e-itip-control.c:779
+#. For Translators: In this can also be translated as "With the period of %d
+#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d week/weeks"
+#. For Translators : 'Every week' is event Recurring every week
+#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
+#: ../calendar/gui/e-itip-control.c:795
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Každý týždeň"
 msgstr[1] "Každý týždeň"
 
-#: ../calendar/gui/e-itip-control.c:781
+#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
+#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
+#: ../calendar/gui/e-itip-control.c:799
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Každý týždeň "
 msgstr[1] "Každý týždeň "
 
-#: ../calendar/gui/e-itip-control.c:789
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " a "
 
-#: ../calendar/gui/e-itip-control.c:796
+#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "The %s day of "
 msgstr "%s deň z "
 
-#: ../calendar/gui/e-itip-control.c:809
+#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
+#. eg,third monday of every month
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s z "
 
-#: ../calendar/gui/e-itip-control.c:816
+#. For Translators: In this can also be translated as "With the period of %d
+#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d month/months"
+#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
+#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
+#. %d is a digit
+#: ../calendar/gui/e-itip-control.c:844
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "každý mesiac"
 msgstr[1] "každý mesiac"
 
-#: ../calendar/gui/e-itip-control.c:820
+#. For Translators: In this can also be translated as "With the period of %d
+#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d year/years"
+#. For Translators : 'Every year' is event Recurring every year
+#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
+#: ../calendar/gui/e-itip-control.c:853
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Každý rok"
 msgstr[1] "Každý rok"
 
-#: ../calendar/gui/e-itip-control.c:831
+#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
+#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
+#: ../calendar/gui/e-itip-control.c:866
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " celkom %d-krát"
 msgstr[1] " celkom %d-krát"
 
-#: ../calendar/gui/e-itip-control.c:840
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:876
 msgid ", ending on "
 msgstr ", končiace na "
 
-#: ../calendar/gui/e-itip-control.c:864
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:898
 #, fuzzy
 msgid "Starts"
 msgstr "Stav"
 
-#: ../calendar/gui/e-itip-control.c:877
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:912
 #, fuzzy
 msgid "Ends"
 msgstr "Enid"
 
-#: ../calendar/gui/e-itip-control.c:911
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:946
+#: ../plugins/save-calendar/csv-format.c:391
 #, fuzzy
 msgid "Due"
 msgstr "Termín do "
 
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
 msgid "iCalendar Information"
 msgstr "Informácie o iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:1003
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
-#: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:339
-#: ../plugins/itip-formatter/itip-view.c:406
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
+#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:520
+#: ../plugins/itip-formatter/itip-view.c:521
 msgid "An unknown person"
 msgstr "Neznáma osoba"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1126
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Prosím, skontrolujte tieto informácie a potom vyberte z menu akciu."
 
-#: ../calendar/gui/e-itip-control.c:1139
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:548
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../calendar/gui/e-itip-control.c:1174
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/itip-utils.c:730
+#: ../plugins/itip-formatter/itip-formatter.c:2008
 msgid "Accepted"
 msgstr "Akceptované"
 
-#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:733
+#: ../plugins/itip-formatter/itip-formatter.c:2011
 msgid "Tentatively Accepted"
 msgstr "Predbežne akceptové"
 
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
-#: ../plugins/itip-formatter/itip-formatter.c:1646
+#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/itip-utils.c:736 ../calendar/gui/itip-utils.c:765
+#: ../plugins/itip-formatter/itip-formatter.c:2014
 msgid "Declined"
 msgstr "Odmietnuté"
 
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1266
 msgid ""
-"The meeting has been cancelled, however it could not be found in your "
+"The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1233
+#: ../calendar/gui/e-itip-control.c:1268
 msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
+"The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> poslal informácie o stretnutí."
 
-#: ../calendar/gui/e-itip-control.c:1313
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Information"
 msgstr "Informácie o stretnutí"
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> požaduje účasť %s na stretnutí."
 
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1355
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> požaduje vašu účasť na stretnutí."
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1356
 msgid "Meeting Proposal"
 msgstr "Návrh na stretnutie"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
+#: ../calendar/gui/e-itip-control.c:1362
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> si praje byť pridaný na existujúce stretnutie."
 
-#: ../calendar/gui/e-itip-control.c:1329
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Update"
 msgstr "Aktualizácia stretnutia"
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> si praje dostať najnovšie informácie o stretnutí."
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Update Request"
 msgstr "Požiadavka na aktualizáciu stretnutia"
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpovedal na požiadavku o stretnutí."
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1376
 msgid "Meeting Reply"
 msgstr "Odpoveď pre stretnutie"
 
-#: ../calendar/gui/e-itip-control.c:1349
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
+#: ../calendar/gui/e-itip-control.c:1383
+#, fuzzy, c-format
+msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> zrušil stretnutie."
 
-#: ../calendar/gui/e-itip-control.c:1350
-msgid "Meeting Cancellation"
+#: ../calendar/gui/e-itip-control.c:1384
+#, fuzzy
+msgid "Meeting Cancelation"
 msgstr "Zrušenie stretnutia"
 
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> poslal nerozpoznateľnú správu."
 
-#: ../calendar/gui/e-itip-control.c:1361
+#: ../calendar/gui/e-itip-control.c:1395
 msgid "Bad Meeting Message"
 msgstr "Neplatná správa o stretnutí"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1422
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> poslal informácie o úlohe."
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1423
 msgid "Task Information"
 msgstr "Informácia o úlohe"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1430
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> požaduje, aby %s vykonal úlohu."
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> požaduje, aby ste vykonali úlohu."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Proposal"
 msgstr "Návrh úlohy"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
+#: ../calendar/gui/e-itip-control.c:1439
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> si praje byť pridaný do existujúcej úlohy."
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Update"
 msgstr "Aktualizácia úlohy"
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> si praje získať najnovšie informácie o úlohe."
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Update Request"
 msgstr "Požiadavka na aktualizáciu úlohy"
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1452
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpovedal na priradenie úlohy."
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1453
 msgid "Task Reply"
 msgstr "Odpoveď pre úlohu"
 
-#: ../calendar/gui/e-itip-control.c:1426
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
+#: ../calendar/gui/e-itip-control.c:1460
+#, fuzzy, c-format
+msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> zrušil úlohu."
 
-#: ../calendar/gui/e-itip-control.c:1427
-msgid "Task Cancellation"
+#: ../calendar/gui/e-itip-control.c:1461
+#, fuzzy
+msgid "Task Cancelation"
 msgstr "Zrušenie úlohy"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1472
 msgid "Bad Task Message"
 msgstr "Neplatná správa úlohy"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1496
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publikoval informácie o voľnom čase."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1497
 msgid "Free/Busy Information"
 msgstr "Informácie o voľnom čase"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1501
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> požaduje informáciu o vašom voľnom čase."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1502
 msgid "Free/Busy Request"
 msgstr "Požiadavka na informácie o voľnom čase"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> odpovedal na požiadavku na informácie o voľnom čase"
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Reply"
 msgstr "Odpoveď s informácio o voľnom čase"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná správa o voľnom čase"
 
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1588
 msgid "The message does not appear to be properly formed"
 msgstr "Správa asi nie je správne formátovaná"
 
-#: ../calendar/gui/e-itip-control.c:1612
+#: ../calendar/gui/e-itip-control.c:1647
 msgid "The message contains only unsupported requests."
 msgstr "Táto správa obsahuje iba nepodporované požiadavky."
 
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1680
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Príloha neobsahuje platnú správu kalendára"
 
-#: ../calendar/gui/e-itip-control.c:1677
+#: ../calendar/gui/e-itip-control.c:1712
 msgid "The attachment has no viewable calendar items"
 msgstr "Príloha nemá žiadne zobraziteľné položky kalendára"
 
-#: ../calendar/gui/e-itip-control.c:1911
+#: ../calendar/gui/e-itip-control.c:1954
 msgid "Update complete\n"
 msgstr "Aktualizácia dokončená\n"
 
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:1988
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt nie je platný a nie je možné ho aktualizovať\n"
 
-#: ../calendar/gui/e-itip-control.c:1949
+#: ../calendar/gui/e-itip-control.c:2005
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Táto odpoveď nie je od účastníka. Chcete ho ako účastníka pridať?"
 
-#: ../calendar/gui/e-itip-control.c:1961
+#: ../calendar/gui/e-itip-control.c:2023
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je platný!\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:2047
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
-#: ../calendar/gui/e-itip-control.c:1981
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../calendar/gui/e-itip-control.c:2054
+#: ../plugins/itip-formatter/itip-formatter.c:1230
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Stav účastníka nie je možné aktualizovať, pretože položka už neexistuje"
 
-#: ../calendar/gui/e-itip-control.c:2011
-msgid "Removal Complete"
-msgstr "Odstránenie dokončené"
-
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2085 ../calendar/gui/e-itip-control.c:2142
 msgid "Item sent!\n"
 msgstr "Položka poslaná!\n"
 
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2091 ../calendar/gui/e-itip-control.c:2150
 msgid "The item could not be sent!\n"
 msgstr "Položku nie je možné poslať!\n"
 
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2230
 msgid "Choose an action:"
 msgstr "Vyberte akciu:"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2301
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2329
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Akceptovať"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2330
 msgid "Tentatively accept"
 msgstr "Predbežne akceptovať"
 
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2331
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2360
 msgid "Send Free/Busy Information"
 msgstr "Poslať informácie o voľnom čase"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2388
 msgid "Update respondent status"
 msgstr "Aktualizovať stav respondenta"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2416
 msgid "Send Latest Information"
 msgstr "Poslať najnovšie informácie"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
-#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:753
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
 msgstr "--do--"
 
-#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:2
 msgid "Calendar Message"
 msgstr "Správa kalendára"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
 msgstr "Dátum:"
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Loading Calendar"
 msgstr "Načítavam kalendár"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
 msgstr "Načítavam kalendár..."
 
-#: ../calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Správa serveru:"
 
-#: ../calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "dátum konca"
-
-#: ../calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "dátum začiatku"
-
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Predsedovia"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Required Participants"
 msgstr "Vyžadovaní účastníci"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:72
 msgid "Optional Participants"
 msgstr "Nepovinní účastníci"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:73
 msgid "Resources"
 msgstr "Zdroje"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-list-view.c:154
+#, fuzzy
+msgid "Attendees"
+msgstr "Účastník"
+
+#: ../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
 msgid "Individual"
 msgstr "Individuálne"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Skupina"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
 msgid "Resource"
 msgstr "Zdroj"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:168
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
 msgid "Room"
 msgstr "Miestnosť"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
 msgid "Chair"
 msgstr "Predseda"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:805
+#: ../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
 msgid "Required Participant"
 msgstr "Vyžadovaný účastník"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
 msgid "Optional Participant"
 msgstr "Nepovinný účastník"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
 msgid "Non-Participant"
 msgstr "Bez účasti"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../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
 msgid "Needs Action"
 msgstr "Potrebné úkony"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Predbežný"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:557
-#: ../plugins/itip-formatter/itip-formatter.c:1649
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/itip-utils.c:739
+#: ../plugins/itip-formatter/itip-formatter.c:2017
 msgid "Delegated"
 msgstr "Delegované"
 
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:484
+msgid "Attendee                          "
+msgstr ""
+
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:523
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
 msgid "In Process"
 msgstr "Prebieha"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2102
+#: ../calendar/gui/e-meeting-time-sel-item.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:2116
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7599,91 +8035,130 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel-item.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:2149
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
+#: ../calendar/gui/e-meeting-time-sel-item.c:472
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Out of Office"
 msgstr "Mimo kancelárie"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Žiadna informácia"
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:428
+#, fuzzy
+msgid "A_ttendees..."
+msgstr "Účastník"
+
+#: ../calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "O_ptions"
 msgstr "Nastavenie"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:466
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Zobraziť _iba pracovné hodiny"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:476
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Ukázať z_menšené"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:491
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Obnoviť voľno/zaneprázdnený"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:506
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid "_Autopick"
 msgstr "_Autovýber"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:556
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Všetky osoby a zdroje"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:565
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Všetky _osoby a jeden zdroj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:574
 #, fuzzy
 msgid "_Required people"
 msgstr "_Vyžadované osoby"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:583
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Vyžadované osoby a _jeden zdroj"
 
-#: ../calendar/gui/e-pub-utils.c:300
-#, fuzzy, c-format
-msgid "Enter the password for %s"
-msgstr "Zadajte vaše heslo pre %s"
+#: ../calendar/gui/e-meeting-time-sel.c:619
+msgid "_Start time:"
+msgstr "Čas _začiatku:"
+
+#: ../calendar/gui/e-meeting-time-sel.c:646
+msgid "_End time:"
+msgstr "Čas _konca:"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Účastník"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Kliknutím pridáte účastníka"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Spoločé meno"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegované od"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegované na"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Jazyk"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Člen"
 
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-memo-table.c:938
+#, fuzzy
+msgid "_Delete Selected Memos"
+msgstr "O_dstrániť vybrané úlohy"
+
+#: ../calendar/gui/e-memo-table.c:1089 ../calendar/gui/e-memo-table.etspec.h:2
+#, fuzzy
+msgid "Click to add a memo"
+msgstr "Kliknutím pridáte úlohu"
+
+#: ../calendar/gui/e-memos.c:801 ../calendar/gui/e-tasks.c:917
+#: ../calendar/gui/gnome-cal.c:2852
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7692,77 +8167,92 @@ msgstr ""
 "Chyba pre %s:\n"
 "%s"
 
-#: ../calendar/gui/e-tasks.c:846
+#: ../calendar/gui/e-memos.c:850
+#, fuzzy
+msgid "Loading memos"
+msgstr "Nahrávanie obrázkov"
+
+#: ../calendar/gui/e-memos.c:931
+#, fuzzy, c-format
+msgid "Opening memos at %s"
+msgstr "Otváram úlohy na %s"
+
+#: ../calendar/gui/e-memos.c:1104 ../calendar/gui/e-tasks.c:1322
+msgid "Deleting selected objects..."
+msgstr "Odstráňujem vybrané objekty..."
+
+#: ../calendar/gui/e-tasks.c:967
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Nahrávanie obrázkov"
 
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:1054
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otváram úlohy na %s"
 
-#: ../calendar/gui/e-tasks.c:1126
+#: ../calendar/gui/e-tasks.c:1299
 msgid "Completing tasks..."
 msgstr "Dokončujem úlohy..."
 
-#: ../calendar/gui/e-tasks.c:1149
-msgid "Deleting selected objects..."
-msgstr "Odstráňujem vybrané objekty..."
-
-#: ../calendar/gui/e-tasks.c:1176
+#: ../calendar/gui/e-tasks.c:1349
 msgid "Expunging"
 msgstr "Čistím"
 
-#: ../calendar/gui/e-timezone-entry.c:133
+#: ../calendar/gui/e-timezone-entry.c:135
 #, fuzzy
-msgid "Timezone Button"
-msgstr "Časová zóna "
+msgid "Select Timezone"
+msgstr "Vyberte časovú zónu"
 
 #. 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:329 ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:327
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1547
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:789
+#: ../calendar/gui/gnome-cal.c:826
 #, fuzzy
 msgid "Updating query"
 msgstr "Aktualizujem objekty"
 
-#. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
+#: ../calendar/gui/gnome-cal.c:2504
+#, fuzzy
+msgid "_Custom View"
 msgstr "Vlastný pohľad"
 
-#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
+#: ../calendar/gui/gnome-cal.c:2505
 #, fuzzy
-msgid "Save Custom View"
+msgid "_Save Custom View"
 msgstr "Uložiť vlastný pohľad..."
 
-#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
+#: ../calendar/gui/gnome-cal.c:2510
+#, fuzzy
+msgid "_Define Views..."
 msgstr "Definovať pohľady..."
 
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2676
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Žiadne schôdzky."
 
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2695
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Nahrávanie obrázkov"
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2704
+#, fuzzy, c-format
+msgid "Loading memos at %s"
+msgstr "Nahrávanie obrázkov"
+
+#: ../calendar/gui/gnome-cal.c:2811
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Otvoriť v %s..."
 
-#: ../calendar/gui/gnome-cal.c:3388
+#: ../calendar/gui/gnome-cal.c:3768
 #, fuzzy
 msgid "Purging"
 msgstr "Turín"
@@ -7825,61 +8315,149 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "Vybrať priečinok"
 
-#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
-#: ../calendar/gui/itip-utils.c:442
+#: ../calendar/gui/itip-utils.c:451 ../calendar/gui/itip-utils.c:500
+#: ../calendar/gui/itip-utils.c:606
 msgid "An organizer must be set."
 msgstr "Organizátor musí byť nastavený."
 
-#: ../calendar/gui/itip-utils.c:389
+#: ../calendar/gui/itip-utils.c:487
 msgid "At least one attendee is necessary"
 msgstr "Nutný je aspoň jeden účastník"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
 msgid "Event information"
 msgstr "informácie o udalosti"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
 msgid "Task information"
 msgstr "Informácie o úlohe"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
-msgid "Journal information"
-msgstr "Informácie o denníku"
+#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:819
+#, fuzzy
+msgid "Memo information"
+msgstr "Žiadna informácia"
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
+#: ../calendar/gui/itip-utils.c:698 ../calendar/gui/itip-utils.c:837
 msgid "Free/Busy information"
 msgstr "Informácie o voľnom čase"
 
-#: ../calendar/gui/itip-utils.c:518
+#: ../calendar/gui/itip-utils.c:700
 msgid "Calendar information"
 msgstr "Informácie o kalendári"
 
-#: ../calendar/gui/itip-utils.c:567
+#: ../calendar/gui/itip-utils.c:749
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: ../calendar/gui/itip-utils.c:575
+#: ../calendar/gui/itip-utils.c:757
 msgid "Refresh"
 msgstr "Aktualizovať"
 
-#: ../calendar/gui/itip-utils.c:579
+#: ../calendar/gui/itip-utils.c:761
 msgid "Counter-proposal"
 msgstr "Protinávrh"
 
-#: ../calendar/gui/itip-utils.c:650
+#: ../calendar/gui/itip-utils.c:833
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informácie o voľnom čase (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:843
 msgid "iCalendar information"
 msgstr "Informácie iCalendar"
 
-#: ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:1010
 msgid "You must be an attendee of the event."
 msgstr "Musíte byť účastníkom stretnutia."
 
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/memos-component.c:464
+#, fuzzy
+msgid "_New Memo List"
+msgstr "Zoznam úloh"
+
+#: ../calendar/gui/memos-component.c:540
+#, fuzzy, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d minút"
+msgstr[1] "%d minút"
+
+#: ../calendar/gui/memos-component.c:542 ../calendar/gui/tasks-component.c:533
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d vybraných"
+msgstr[1] "%d vybraných"
+
+#: ../calendar/gui/memos-component.c:589
+#, fuzzy
+msgid "Failed upgrading memos."
+msgstr "Nahrávanie obrázkov"
+
+#: ../calendar/gui/memos-component.c:949
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:962
+msgid "There is no calendar available for creating memos"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1071
+#, fuzzy
+msgid "Memo Source Selector"
+msgstr "Nebol vybraný žiadny server"
+
+#: ../calendar/gui/memos-component.c:1254
+#, fuzzy
+msgid "New memo"
+msgstr "Nové stretnutie"
+
+#: ../calendar/gui/memos-component.c:1255
+msgid "Mem_o"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1256
+#, fuzzy
+msgid "Create a new memo"
+msgstr "Vytvoriť novú testovaciu položku"
+
+#: ../calendar/gui/memos-component.c:1262
+#, fuzzy
+msgid "New shared memo"
+msgstr "Nový _zdieľaný priečinok..."
+
+#: ../calendar/gui/memos-component.c:1263
+#, fuzzy
+msgid "_Shared memo"
+msgstr "_Nezdieľané"
+
+#: ../calendar/gui/memos-component.c:1264
+#, fuzzy
+msgid "Create a shared new memo"
+msgstr "Vytvoriť novú testovaciu položku"
+
+#: ../calendar/gui/memos-component.c:1270
+#, fuzzy
+msgid "New memo list"
+msgstr "Zoznam úloh"
+
+#: ../calendar/gui/memos-component.c:1271
+#, fuzzy
+msgid "Memo li_st"
+msgstr "prekryť zoznam"
+
+#: ../calendar/gui/memos-component.c:1272
+#, fuzzy
+msgid "Create a new memo list"
+msgstr "Vytvorí novú úlohu"
+
+#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#, fuzzy
+msgid "Print Memos"
+msgstr "Tlačiť položku"
+
+#: ../calendar/gui/migration.c:164
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -7887,7 +8465,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:168
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -7896,336 +8474,301 @@ msgid ""
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:777
+#: ../calendar/gui/migration.c:809
 #, fuzzy, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
+#: ../calendar/gui/migration.c:977
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nie je možné otvoriť adresár"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/migration.c:1226
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#, fuzzy
+msgid "Notes"
+msgstr "Poznámka"
+
+#: ../calendar/gui/print.c:515
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:515
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:515
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:515
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:515
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:516
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:516
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:516
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:516
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:516
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:517
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:517
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:517
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:517
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:517
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:518
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:518
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:518
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:518
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:518
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:519
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:519
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:519
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:519
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:519
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:520
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:520
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:520
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:520
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:520
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:521
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/gui/print.c:573
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:596
 msgid "Su"
 msgstr "Ne"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:596
 msgid "Mo"
 msgstr "Po"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:596
 msgid "Tu"
 msgstr "Ut"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:596
 msgid "We"
 msgstr "St"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:597
 msgid "Th"
 msgstr "Št"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:597
 msgid "Fr"
 msgstr "Pi"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:597
 msgid "Sa"
 msgstr "So"
 
-#. Day
-#: ../calendar/gui/print.c:1917
-msgid "Selected day (%a %b %d %Y)"
-msgstr "Vybraný deň (%a %b %d %Y)"
-
-#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
-msgid "%a %b %d"
-msgstr "%a %b %d"
-
-#: ../calendar/gui/print.c:1943
-msgid "%a %d %Y"
-msgstr "%a %d %Y"
-
-#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
-#: ../calendar/gui/print.c:1950
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: ../calendar/gui/print.c:1954
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "Vybraný týždeň (%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:1962
-msgid "Selected month (%b %Y)"
-msgstr "Vybraný mesiac (%b - %Y)"
+#: ../calendar/gui/print.c:2351
+msgid "Appointment"
+msgstr "Schôdzka"
 
-#. Year
-#: ../calendar/gui/print.c:1969
-msgid "Selected year (%Y)"
-msgstr "Vybraný rok (%Y)"
+#: ../calendar/gui/print.c:2353
+msgid "Task"
+msgstr "Úloha"
 
-#: ../calendar/gui/print.c:2320
+#: ../calendar/gui/print.c:2375
 #, fuzzy, c-format
 msgid "Summary: %s"
 msgstr "Súhrn:"
 
-#: ../calendar/gui/print.c:2328
-#, fuzzy, c-format
-msgid "Location: %s"
-msgstr "Umiestnenie:"
-
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2426
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2443
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorita: %s"
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2455
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Dokončených percent: %i"
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2467
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2480
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategórie: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2491
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
-msgid "Print Preview"
-msgstr "Ukážka pred tlačou"
-
-#: ../calendar/gui/print.c:2612
-msgid "Print Item"
-msgstr "Tlačiť položku"
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2592
+#, fuzzy
+msgid "Upcoming Appointments"
+msgstr "Otvoriť s_chôdzku"
 
-#: ../calendar/gui/tasks-component.c:439
+#: ../calendar/gui/tasks-component.c:455
 #, fuzzy
-msgid "New Task List"
+msgid "_New Task List"
 msgstr "Zoznam úloh"
 
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:531
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Žiadne úlohy"
 msgstr[1] "Žiadne úlohy"
 
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
-#, fuzzy, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] "%d vybraných"
-msgstr[1] "%d vybraných"
-
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:580
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Nahrávanie obrázkov"
 
-#: ../calendar/gui/tasks-component.c:872
+#: ../calendar/gui/tasks-component.c:937
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:887
+#: ../calendar/gui/tasks-component.c:950
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-component.c:1060
 #, fuzzy
 msgid "Task Source Selector"
 msgstr "Nebol vybraný žiadny server"
 
-#: ../calendar/gui/tasks-component.c:1164
+#: ../calendar/gui/tasks-component.c:1316
 msgid "New task"
 msgstr "Nová úloha"
 
-#: ../calendar/gui/tasks-component.c:1165
-msgid "_Task"
-msgstr "Ú_loha"
-
-#: ../calendar/gui/tasks-component.c:1166
+#: ../calendar/gui/tasks-component.c:1318
 msgid "Create a new task"
 msgstr "Vytvorí novú úlohu"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1324
 #, fuzzy
 msgid "New assigned task"
 msgstr "Priradiť úlohu"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1325
 #, fuzzy
 msgid "Assigne_d Task"
 msgstr "Priradiť úlohu"
 
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/tasks-component.c:1326
 #, fuzzy
 msgid "Create a new assigned task"
 msgstr "Vytvorí novú úlohu"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1332
 #, fuzzy
 msgid "New task list"
 msgstr "Zoznam úloh"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1333
 #, fuzzy
-msgid "Task l_ist"
+msgid "Tas_k list"
 msgstr "Zoznam úloh"
 
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1334
 #, fuzzy
 msgid "Create a new task list"
 msgstr "Vytvorí novú úlohu"
 
-#: ../calendar/gui/tasks-control.c:419
+#: ../calendar/gui/tasks-control.c:454
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8237,11 +8780,11 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: ../calendar/gui/tasks-control.c:422
+#: ../calendar/gui/tasks-control.c:457 ../mail/em-folder-view.c:1111
 msgid "Do not ask me again."
 msgstr "Túto správu už nezobrazovať."
 
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:494 ../calendar/gui/tasks-control.c:510
 msgid "Print Tasks"
 msgstr "Tlačiť úlohy"
 
@@ -8250,42 +8793,44 @@ msgstr "Tlačiť úlohy"
 msgid "SMTWTFS"
 msgstr "NPUSŠPS"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:79
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Verejný priečinok obsahujúci schôdzky a udalosti"
 
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
+#: ../plugins/itip-formatter/itip-formatter.c:1558
 #, fuzzy
 msgid "Opening calendar"
 msgstr "Nová Kaledónia"
 
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:444
 msgid "iCalendar files (.ics)"
 msgstr "Súbory iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:445
 msgid "Evolution iCalendar importer"
 msgstr "Import iCalendar pre Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:494
-msgid "Reminder!!"
+#: ../calendar/importers/icalendar-importer.c:521
+#, fuzzy
+msgid "Reminder!"
 msgstr "Pripomenutie!"
 
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:573
 msgid "vCalendar files (.vcf)"
 msgstr "Súbory vCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:574
 msgid "Evolution vCalendar importer"
 msgstr "Import vCalendar pre Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:736
 msgid "Calendar Events"
 msgstr "Udalosti kalendára"
 
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:773
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentný import kalendára Evolution"
 
@@ -8819,7 +9364,7 @@ msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
@@ -9819,16 +10364,16 @@ msgstr "Tichý oceán/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tichý oceán/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-hdrs.c:606
 msgid "Posting destination"
 msgstr "Cieľ posielania"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:607
 #, fuzzy
 msgid "Choose folders to post the message to."
 msgstr "Priloží súbor k správe"
 
-#: ../composer/e-msg-composer-hdrs.c:593
+#: ../composer/e-msg-composer-hdrs.c:638
 msgid "Click here for the address book"
 msgstr "Kliknutím zobrazíte adresár"
 
@@ -9839,7 +10384,7 @@ msgstr "Kliknutím zobrazíte adresár"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:670
 #, fuzzy
 msgid "_Reply-To:"
 msgstr "Odpovedať komu:"
@@ -9847,7 +10392,7 @@ msgstr "Odpovedať komu:"
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:677
 #, fuzzy
 msgid "Fr_om:"
 msgstr "Od:"
@@ -9855,35 +10400,35 @@ msgstr "Od:"
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:684
 #, fuzzy
 msgid "S_ubject:"
 msgstr "Predmet:"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:694
 #, fuzzy
 msgid "_To:"
 msgstr "Komu:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:695
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:698
 #, fuzzy
 msgid "_Cc:"
 msgstr "Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:699
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:702
 #, fuzzy
 msgid "_Bcc:"
 msgstr "Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:703
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9894,87 +10439,99 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:710
 #, fuzzy
 msgid "_Post To:"
 msgstr "Poslať do:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:715
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<kliknutím vyberiete priečinok>"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:720
 msgid "Post To:"
 msgstr "Poslať do:"
 
-#: ../composer/e-msg-composer-select-file.c:82
+#: ../composer/e-msg-composer-select-file.c:77
 #, fuzzy
 msgid "A_ttach"
 msgstr "Priložiť"
 
-#: ../composer/e-msg-composer.c:738
+#: ../composer/e-msg-composer-select-file.c:196
+#, fuzzy
+msgid "Insert Attachment"
+msgstr "Príloha"
+
+#: ../composer/e-msg-composer.c:818
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
-#: ../composer/e-msg-composer.c:745
+#: ../composer/e-msg-composer.c:825
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
-#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
-#: ../plugins/mail-remote/e-corba-utils.c:135
+#: ../composer/e-msg-composer.c:1334 ../composer/e-msg-composer.c:2602
+#, fuzzy
+msgid "Hide _Attachment Bar"
+msgstr "Príloha"
+
+#: ../composer/e-msg-composer.c:1337 ../composer/e-msg-composer.c:2605
+#: ../composer/e-msg-composer.c:3985
+#, fuzzy
+msgid "Show _Attachment Bar"
+msgstr "Príloha"
+
+#: ../composer/e-msg-composer.c:1369 ../composer/e-msg-composer.c:1403
 msgid "Unknown reason"
 msgstr "Neznámy dôvod"
 
-#: ../composer/e-msg-composer.c:1294
+#: ../composer/e-msg-composer.c:1441
 #, fuzzy
 msgid "Could not open file"
 msgstr "Nie je možné otvoriť správu"
 
-#: ../composer/e-msg-composer.c:1302
+#: ../composer/e-msg-composer.c:1449
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je možné získať správu z editora"
 
-#: ../composer/e-msg-composer.c:1572
+#: ../composer/e-msg-composer.c:1736
 #, fuzzy
 msgid "Untitled Message"
 msgstr "(Správa bez mena)"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1606
+#: ../composer/e-msg-composer.c:1772
 #, fuzzy
 msgid "Open File"
 msgstr "Otvoriť súbor"
 
-#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2237 ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Automaticky generované"
 
-#: ../composer/e-msg-composer.c:2105
+#: ../composer/e-msg-composer.c:2340
 #, fuzzy
 msgid "Si_gnature:"
 msgstr "Podpis:"
 
-#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
-#: ../composer/e-msg-composer.c:3528
-msgid "Compose a message"
+#: ../composer/e-msg-composer.c:2616 ../composer/e-msg-composer.c:3867
+#: ../composer/e-msg-composer.c:3870
+#, fuzzy
+msgid "Compose Message"
 msgstr "Napísať správu"
 
-#: ../composer/e-msg-composer.c:3643
+#: ../composer/e-msg-composer.c:5125
 #, fuzzy
-msgid "_Attachment Bar"
-msgstr "Príloha"
-
-#: ../composer/e-msg-composer.c:4718
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
 msgstr ""
 "<b>(Editor správ obsahuje netextové telo správy, ktoré nie je možné upraviť.)"
 "<b>"
@@ -10001,7 +10558,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:17
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "Pretože &quot;{1}&quot;."
 
@@ -10045,29 +10602,30 @@ msgid "Do you want to recover unfinished messages?"
 msgstr "Chcete uložiť zmeny?"
 
 #: ../composer/mail-composer.error.xml.h:14
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Neimportovať"
-
-#: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 #, fuzzy
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Chyba pri ukladaní skratiek."
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:16
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
+#: ../composer/mail-composer.error.xml.h:17
+msgid ""
+"Send options available only for Novell Groupwise and Microsoft Exchange "
+"accounts."
+msgstr ""
+
 #: ../composer/mail-composer.error.xml.h:18
 #, fuzzy
-msgid "Recover"
-msgstr "Odstrániť"
+msgid "Send options not available."
+msgstr "Akcia nie je k dispozícii"
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -10117,25 +10675,35 @@ msgstr "Priloží súbor k správe"
 msgid "You need to configure an account before you can compose mail."
 msgstr "Predtým, ako začnete písať správu, musíte nastaviť účet."
 
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Zahodiť zmeny"
-
 #: ../composer/mail-composer.error.xml.h:30
 #, fuzzy
+msgid "_Do not Recover"
+msgstr "Neimportovať"
+
+#: ../composer/mail-composer.error.xml.h:31
+#, fuzzy
+msgid "_Recover"
+msgstr "Odstrániť"
+
+#: ../composer/mail-composer.error.xml.h:32
+#, fuzzy
 msgid "_Save Message"
 msgstr "Uložiť správu ako..."
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
-msgid "Evolution"
-msgstr "Evolution"
+#, fuzzy
+msgid "Evolution Mail and Calendar"
+msgstr "Poštový komponent Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
 #, fuzzy
-msgid "The Evolution Groupware Suite"
-msgstr "Sada groupvérových nástrojov Evolution"
+msgid "Groupware Suite"
+msgstr "Skupina"
+
+#: ../data/evolution.desktop.in.in.h:3
+#, fuzzy
+msgid "Manage your email, contacts and schedule"
+msgstr "Nastavenie emailových účtov"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10145,147 +10713,44 @@ msgstr "karta adresára"
 msgid "calendar information"
 msgstr "informácie o kalendári"
 
-#: ../designs/OOA/ooa.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>Momentálne je váš stav \"Mimo kanceláre\".</b>\n"
-"\n"
-"Chcete ho zmeniť na \"V kancelárii\"?"
-
-#: ../designs/OOA/ooa.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Správa \"Mimo kancelárie\":</b>"
-
-#: ../designs/OOA/ooa.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Stav:</b>"
-
-#: ../designs/OOA/ooa.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>Dole zadaná správa sa automaticky pošle každej osobe,\n"
-"ktorá vám pošle správu, v prípade, že ste mimo kanceláriu.</small>"
-
-#: ../designs/OOA/ooa.glade.h:8
-msgid "I am currently in the office"
-msgstr "Momentálne som v kancelárii"
-
-#: ../designs/OOA/ooa.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Momentálne som mimo kanceláriu"
-
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Nie, nemeniť stav"
-
-#: ../designs/OOA/ooa.glade.h:12
-msgid "Out of Office Assistant"
-msgstr "Sprievodca pre nastavenie \"Mimo kancelárie\""
-
-#: ../designs/OOA/ooa.glade.h:13
-msgid "Yes, Change Status"
-msgstr "Áno, zmeniť stav"
-
-#: ../designs/read_receipts/read.glade.h:1
-msgid "      "
-msgstr "      "
-
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Receiving Email</b>"
-msgstr "<b>Príjem pošty</b>"
-
-#: ../designs/read_receipts/read.glade.h:3
-msgid "<b>Sending Email:</b>"
-msgstr "<b>Posielanie pošty:</b>"
-
-#: ../designs/read_receipts/read.glade.h:4
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"<small>Tento dialóg umožňuje vybrať, či chcete byť upozornený, že\n"
-"si adresát prečítal vašu správu. Ďalej tu môžete nastaviť, ako sa\n"
-"má Evolution chovať v prípade, že ste si správu prečítali vy.</small>"
-
-#: ../designs/read_receipts/read.glade.h:6
-#, fuzzy
-msgid "Always send back a read receipt"
-msgstr "Vždy poslať späť správu o prečítaní"
-
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Ask me if I want to send back a read receipt"
-msgstr "Pýtať sa pred poslaním správy o prečítaní"
-
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Never send back a read receipt"
-msgstr "Nikdy neposielať správu o prečítaní"
-
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Read Receipts"
-msgstr "Správa o prečítaní"
-
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Request a read receipt for all messages I send"
-msgstr "Požadovať správu o prečítaní pre všetky odoslené správy"
-
-#: ../designs/read_receipts/read.glade.h:11
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "Nie v prípade, že sa posiela do konferencie alebo mne"
-
-#: ../designs/read_receipts/read.glade.h:12
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr ""
-"Čo má Evolution urobiť, ak dostanete správu s požiadavkou na potvrdenie "
-"prečítania?"
-
-#: ../e-util/e-dialog-utils.c:267
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Súbor s týmto menom už existuje\n"
-"Prepísať ho?"
-
-#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "Prepísať súbor?"
-
-#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "Chyba Evolution"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Pošta Evolution"
 
-#: ../e-util/e-error.c:124
+#: ../e-util/e-error.c:126
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Informácie o stretnutí"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:128
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Súhrn Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:438
+#: ../e-util/e-error.c:454
 #, fuzzy, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid "Internal error, unknown error '%s' requested"
 msgstr "Odoslané a koncepty"
 
+#: ../e-util/e-print.c:138
+msgid "An error occurred while printing"
+msgstr ""
+
+#: ../e-util/e-print.c:145
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+
+#: ../e-util/e-print.c:151
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+
 #: ../e-util/e-system.error.xml.h:2
 #, fuzzy
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10311,177 +10776,135 @@ msgstr ""
 msgid "File exists &quot;{0}&quot;."
 msgstr ""
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
+#: ../e-util/e-system.error.xml.h:6
+msgid "Overwrite file?"
+msgstr "Prepísať súbor?"
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:142
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Prepísať"
 
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:195
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %d/%m/%Y %I %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:200
-msgid "%a %m/%d/%Y %H"
-msgstr "%a %d/%m/%Y %H"
-
-#. strptime format of a date and a time, in 12-hour format.
-#: ../e-util/e-time-utils.c:211
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%d/%m/%Y %I:%M:%S %p"
-
-#. strptime format of a date and a time, in 24-hour format.
-#: ../e-util/e-time-utils.c:215
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%d/%m/%Y %H:%M:%S"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:220
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%d/%m/%Y %I:%M %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:225
-msgid "%m/%d/%Y %H:%M"
-msgstr "%d/%m/%Y %H:%M"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:230
-msgid "%m/%d/%Y %I %p"
-msgstr "%d/%m/%Y %I %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:235
-msgid "%m/%d/%Y %H"
-msgstr "%d/%m/%Y %H"
-
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../e-util/e-time-utils.c:356
-msgid "%I %p"
-msgstr "%I %p"
-
-#: ../e-util/eggtrayicon.c:119
-#, fuzzy
-msgid "The orientation of the tray."
-msgstr "Popis prílohy."
-
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:80
 #, fuzzy, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "pred 1 sekundou"
 msgstr[1] "pred 1 sekundou"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:81
 #, fuzzy, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "pred 1 minútou"
 msgstr[1] "pred 1 minútou"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, fuzzy, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "Som v kancelárii"
+msgstr[1] "Som v kancelárii"
+msgstr[2] "Som v kancelárii"
+
+#: ../filter/filter-datespec.c:82
 #, fuzzy, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "pred 1 hodinou"
 msgstr[1] "pred 1 hodinou"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:83
 #, fuzzy, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "včera"
 msgstr[1] "včera"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, fuzzy, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "Som v kancelárii"
+msgstr[1] "Som v kancelárii"
+msgstr[2] "Som v kancelárii"
+
+#: ../filter/filter-datespec.c:84
 #, fuzzy, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "pred týždňom"
 msgstr[1] "pred týždňom"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../filter/filter-datespec.c:85
 #, fuzzy, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "pred mesiacom"
 msgstr[1] "pred mesiacom"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, fuzzy, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "Som v kancelárii"
+msgstr[1] "Som v kancelárii"
+msgstr[2] "Som v kancelárii"
+
+#: ../filter/filter-datespec.c:86
 #, fuzzy, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "pred rokom"
 msgstr[1] "pred rokom"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, fuzzy, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "Som v kancelárii"
+msgstr[1] "Som v kancelárii"
+msgstr[2] "Som v kancelárii"
+
+#: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<kliknutím vyberiete dátum>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "teraz"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:451
 msgid "Select a time to compare against"
 msgstr "Vyberte čas, s ktorým sa má porovnávať"
 
@@ -10490,75 +10913,86 @@ msgid "Choose a file"
 msgstr "Vyberte súbor"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
-#: ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "Dôležité"
 
-#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#. green
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:150
 msgid "To Do"
 msgstr "Urobiť"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Neskôr"
 
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:533
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:791
+#: ../filter/filter-rule.c:800
 #, fuzzy
-msgid "_Rule name:"
-msgstr "Meno pravidla: "
+msgid "_Search name:"
+msgstr "_Oblasť hľadania:"
 
-#: ../filter/filter-rule.c:819
+#: ../filter/filter-rule.c:828
+msgid "Find items that meet the following criteria"
+msgstr ""
+
+#: ../filter/filter-rule.c:862
 #, fuzzy
-msgid "If"
-msgstr "I"
+msgid "A_dd Filter Criteria"
+msgstr "Pridať pravidlo filtra"
 
-#: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
+#: ../filter/filter-rule.c:868
+#, fuzzy
+msgid "If all criteria are met"
 msgstr "ak odpovedajú všetky kritériá"
 
-#: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
+#: ../filter/filter-rule.c:868
+#, fuzzy
+msgid "If any criteria are met"
 msgstr "ak zodpovedá niektoré kritérium"
 
-#: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr "Spustiť akcie"
+#: ../filter/filter-rule.c:870
+#, fuzzy
+msgid "_Find items:"
+msgstr "Presúvam správy"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:892
 #, fuzzy
 msgid "All related"
 msgstr "Delegované"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:892
 #, fuzzy
 msgid "Replies"
 msgstr "Adresáti"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:892
 #, fuzzy
 msgid "Replies and parents"
 msgstr "Odpovedaná"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:892
+msgid "No reply or parent"
+msgstr ""
+
+#: ../filter/filter-rule.c:894
 #, fuzzy
-msgid "Include threads"
+msgid "I_nclude threads"
 msgstr "Vložiť:"
 
-#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:291
+#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:307
 msgid "Incoming"
 msgstr "Prijatá"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
+#: ../filter/filter-rule.c:990 ../mail/em-utils.c:308
 msgid "Outgoing"
 msgstr "Odoslaná"
 
@@ -10588,7 +11022,7 @@ msgstr "Aktualizácia stretnutia"
 msgid "Missing file name."
 msgstr "_Známe meno:"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
 #, fuzzy
 msgid "Missing name."
 msgstr "Priradenie"
@@ -10660,35 +11094,45 @@ msgstr "čas relatívny k aktuálnemu času"
 msgid "ago"
 msgstr "späť"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr ""
+
+#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "mesiacov"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:188
 msgid "seconds"
 msgstr "sekúnd"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "aktuálny tento"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "zadaný čas"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/google-account-setup/google-source.c:383
+msgid "weeks"
+msgstr "týždňov"
+
+#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "rokov"
 
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:380
 msgid "Add Rule"
 msgstr "Pridať pravidlo"
 
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:459
 msgid "Edit Rule"
 msgstr "Upraviť pravidlo"
 
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:747
 msgid "Rule name"
 msgstr "Meno pravidla"
 
@@ -10733,21 +11177,21 @@ msgstr "Ovládací prvok pre nastavenie editora správ Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Ovládací prvok nastavenia pošty Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:606
+#: ../mail/importers/elm-importer.c:333 ../mail/importers/pine-importer.c:387
+#: ../mail/mail-component.c:563 ../mail/mail-component.c:564
+#: ../mail/mail-component.c:728
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Pošta"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:535
 msgid "Mail Accounts"
 msgstr "Poštové účty"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:100
 msgid "Mail Preferences"
 msgstr "Nastavenie pošty"
 
@@ -10756,12 +11200,12 @@ msgstr "Nastavenie pošty"
 msgid "_Mail"
 msgstr "_Pošta:"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:403
 #, c-format
 msgid "%s License Agreement"
 msgstr ""
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:410
 #, c-format
 msgid ""
 "\n"
@@ -10770,119 +11214,137 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:778
 #, fuzzy
 msgid "Ask for each message"
 msgstr "Priložiť pôvodnú správu"
 
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identita"
 
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:119
 msgid "Receiving Email"
 msgstr "Príjem pošty"
 
-#: ../mail/em-account-editor.c:1943
+#: ../mail/em-account-editor.c:2056
 #, fuzzy
-msgid "Automatically check for _new mail every"
+msgid "Check for _new messages every"
 msgstr "_Automaticky kontrolovať novú poštu každých"
 
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.glade.h:134
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2296 ../mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Defaults"
 msgstr "Š_tandardné"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
+#: ../mail/em-account-editor.c:2362 ../mail/mail-config.glade.h:126
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 #, fuzzy
 msgid "Security"
 msgstr "Za_bezpečenie"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
+#: ../mail/em-account-editor.c:2399 ../mail/em-account-editor.c:2490
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Nastavenie _príjmu"
 
-#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
+#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
 #, fuzzy
-msgid "Checking for New Mail"
+msgid "Checking for New Messages"
 msgstr "Kontrolujem novú poštu"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "Editor účtu"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca účtom Evolution"
 
+#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
+#: ../mail/em-account-prefs.c:412
+#, fuzzy
+msgid "Di_sable"
+msgstr "Zakázať"
+
+#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
+#: ../mail/em-account-prefs.c:414 ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "_Povoliť"
+
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:455
+#: ../mail/em-account-prefs.c:469
 msgid "[Default]"
 msgstr "{Štandardný]"
 
-#: ../mail/em-account-prefs.c:510
+#: ../mail/em-account-prefs.c:522 ../mail/em-composer-prefs.c:943
+#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/publish-calendar/publish-calendar.c:510
+msgid "Enabled"
+msgstr "Povolené"
+
+#: ../mail/em-account-prefs.c:528
 msgid "Account name"
 msgstr "Meno účtu"
 
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:530
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../mail/em-account-prefs.c:517
-#, fuzzy
-msgid "Mail Accounts Table"
-msgstr "Poštové účty"
-
-#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:958
+#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
+#: ../mail/mail-config.c:181 ../mail/mail-config.c:1036
 msgid "Unnamed"
 msgstr "Bezmena"
 
-#: ../mail/em-composer-prefs.c:897
+#: ../mail/em-composer-prefs.c:949
 msgid "Language(s)"
 msgstr "Jazyky"
 
-#: ../mail/em-composer-prefs.c:940
+#: ../mail/em-composer-prefs.c:992
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Pridať podpis"
 
-#: ../mail/em-composer-prefs.c:960
+#: ../mail/em-composer-prefs.c:1012
 msgid "Signature(s)"
 msgstr "Podpisy"
 
-#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:897 ../mail/em-format-quote.c:399
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Predaná správa"
 
-#: ../mail/em-composer-utils.c:1648
+#: ../mail/em-composer-utils.c:1696
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
 #. 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:1695
+#: ../mail/em-composer-utils.c:1743
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-filter-editor.c:147
+#: ../mail/em-composer-utils.c:1884
+#, fuzzy
+msgid "-----Original Message-----"
+msgstr "Predaná správa"
+
+#: ../mail/em-filter-editor.c:155
 #, fuzzy
 msgid "_Filter Rules"
 msgstr "Pravidlá filtra"
@@ -10924,6 +11386,14 @@ msgstr "Dátum prijatia"
 msgid "Date sent"
 msgstr "Dátum odoslania"
 
+#: ../mail/em-filter-i18n.h:11
+#: ../plugins/groupwise-features/share-folder.c:777
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Odstrániť"
+
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Odstránené"
@@ -11012,7 +11482,7 @@ msgstr "nie je"
 msgid "is not Flagged"
 msgstr "nie je označený"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -11023,8 +11493,7 @@ msgstr "Jún"
 msgid "Junk Test"
 msgstr "Jún"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Popis"
 
@@ -11068,11 +11537,11 @@ msgstr "Ukončí program"
 msgid "Play Sound"
 msgstr "Zahrať zvuk"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "Prečítaná"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
 msgid "Recipients"
 msgstr "Adresáti"
 
@@ -11101,11 +11570,11 @@ msgstr "vráti menej než"
 msgid "Run Program"
 msgstr "Spustiť program:"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Score"
 msgstr "Skóre"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
 msgid "Sender"
 msgstr "Odosielateľ"
 
@@ -11137,12 +11606,12 @@ msgstr "začína na"
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1131
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1683
+#: ../mail/em-format-quote.c:320 ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:17
+#: ../mail/message-tag-followup.c:336
+#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Predmet"
 
@@ -11151,33 +11620,95 @@ msgid "Unset Status"
 msgstr "Zrušiť nastavenie stavu"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:488
+#: ../mail/em-filter-rule.c:489
 #, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Termín:</b> "
+msgid "Then"
+msgstr "Potom podľa"
 
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-filter-rule.c:517
+#, fuzzy
+msgid "Add Ac_tion"
+msgstr "Potrebné úkony"
+
+#: ../mail/em-folder-browser.c:184
 #, fuzzy
 msgid "C_reate Search Folder From Search..."
 msgstr "Vytvoriť _virtuálny priečinok z hľadania..."
 
-#. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
+#: ../mail/em-folder-browser.c:206
 #, fuzzy
-msgid "Total message:"
-msgid_plural "Total messages:"
-msgstr[0] "Správa pomocníka"
-msgstr[1] "Správa pomocníka"
+msgid "All Messages"
+msgstr "_Správy"
+
+#: ../mail/em-folder-browser.c:207
+#, fuzzy
+msgid "Unread Messages"
+msgstr "Nasledujúca _neprečítaná správa"
+
+#: ../mail/em-folder-browser.c:209
+#, fuzzy
+msgid "No Label"
+msgstr "Popis"
+
+#: ../mail/em-folder-browser.c:216
+#, fuzzy
+msgid "Read Messages"
+msgstr "Skryť p_rečítané správy"
+
+#: ../mail/em-folder-browser.c:217
+#, fuzzy
+msgid "Recent Messages"
+msgstr "_Otvoriť správy"
+
+#: ../mail/em-folder-browser.c:218
+#, fuzzy
+msgid "Last 5 Days' Messages"
+msgstr "Neplatná správa úlohy"
+
+#: ../mail/em-folder-browser.c:219
+#, fuzzy
+msgid "Messages with Attachments"
+msgstr "Uložiť prílohy"
+
+#: ../mail/em-folder-browser.c:220
+#, fuzzy
+msgid "Important Messages"
+msgstr "Nasledujúca _dôležitá správa"
+
+#: ../mail/em-folder-browser.c:221
+#, fuzzy
+msgid "Messages Not Junk"
+msgstr "Označiť ako _dôležitú"
 
-#: ../mail/em-folder-properties.c:156
+#: ../mail/em-folder-browser.c:1038
 #, fuzzy
-msgid "Unread message:"
+msgid "Account Search"
+msgstr "Meno účtu"
+
+#: ../mail/em-folder-browser.c:1082
+#, fuzzy
+msgid "All Account Search"
+msgstr "Meno účtu"
+
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:149
+#, fuzzy
+msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Nasledujúca _neprečítaná správa"
 msgstr[1] "Nasledujúca _neprečítaná správa"
 
-#: ../mail/em-folder-properties.c:278
-#: ../plugins/groupwise-features/properties.glade.h:3
+#. 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
+#, fuzzy
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] "Správa pomocníka"
+msgstr[1] "Správa pomocníka"
+
+#: ../mail/em-folder-properties.c:323
+#: ../plugins/groupwise-features/properties.glade.h:2
 #, fuzzy
 msgid "Folder Properties"
 msgstr "Vlastnosti písma"
@@ -11186,653 +11717,809 @@ msgstr "Vlastnosti písma"
 msgid "<click here to select a folder>"
 msgstr "<kliknutím vyberiete priečinok>"
 
-#: ../mail/em-folder-selector.c:261
+#: ../mail/em-folder-selector.c:262
 #, fuzzy
 msgid "Create"
 msgstr "Crestview"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "_Meno priečinku:"
 
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:934 ../mail/mail-vfolder.c:1007
 #, fuzzy
 msgid "Search Folders"
 msgstr "Prehľadať pr_iečinky"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:467 ../mail/mail-component.c:154
 #, fuzzy
 msgid "Drafts"
 msgstr "Návrh"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:470 ../mail/em-folder-tree.c:2565
+#: ../mail/mail-component.c:153
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:473 ../mail/mail-component.c:155
 msgid "Outbox"
 msgstr "Pošta na odoslanie"
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:156
 msgid "Sent"
 msgstr "Odoslaná pošta"
 
-#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree-model.c:804
 msgid "Loading..."
 msgstr "Načítavam..."
 
-#: ../mail/em-folder-tree.c:689
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. "%s" will be replaced by
+#. * the folder's name and "%u" will be replaced with the
+#. * number of unread messages in the folder.
+#. *
+#. * Most languages should translate this as "%s (%u)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../mail/em-folder-tree.c:373
+#, c-format
+msgid "folder-display|%s (%u)"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:734
 #, fuzzy
 msgid "Mail Folder Tree"
 msgstr "Poštové filtre"
 
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:894
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: ../mail/em-folder-tree.c:851
+#: ../mail/em-folder-tree.c:896
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Otváram priečinok %s"
 
-#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:903 ../mail/message-list.c:1874
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Presúvam správy do %s"
 
-#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:905 ../mail/message-list.c:1876
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopírujem správy do %s"
 
-#: ../mail/em-folder-tree.c:876
+#: ../mail/em-folder-tree.c:921
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Nepodarilo sa skopírovať alebo presunúť správu do virtuálneho priečinku"
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:999 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopírovať do priečinku"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Presunúť do priečinku"
 
-#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1710 ../mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam priečinky v \"%s\""
 
-#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2110 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:32
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Pohľad"
 
-#: ../mail/em-folder-tree.c:2032
+#: ../mail/em-folder-tree.c:2111
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Otvoriť v novom okne"
 
-#: ../mail/em-folder-tree.c:2036
-msgid "_Copy..."
-msgstr "_Kopírovať..."
-
-#: ../mail/em-folder-tree.c:2037
+#: ../mail/em-folder-tree.c:2116
 msgid "_Move..."
 msgstr "_Presunúť..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2041
+#: ../mail/em-folder-tree.c:2120
 msgid "_New Folder..."
 msgstr "Nový _priečinok..."
 
-#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:36
 msgid "_Rename..."
 msgstr "_Premenovať..."
 
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-tree.c:2124
+#, fuzzy
+msgid "Re_fresh"
+msgstr "Aktualizovať"
+
+#: ../mail/em-folder-tree.c:2125
+#, fuzzy
+msgid "Fl_ush Outbox"
+msgstr "Pošta na odoslanie"
+
+#: ../mail/em-folder-tree.c:2131 ../mail/mail.error.xml.h:139
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Vyprázdniť _Odpadky"
+
+#: ../mail/em-folder-utils.c:105
 #, fuzzy, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopírujem správy do %s"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
-#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1171
+#: ../mail/em-folder-view.c:1186
+#: ../mail/importers/evolution-mbox-importer.c:86
 msgid "Select folder"
 msgstr "Vybrať priečinok"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
+#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1186
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopírovať"
 
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr ""
-
-#: ../mail/em-folder-utils.c:505
-#, fuzzy
-msgid "Rename Folder"
-msgstr "Vytvoriť nový priečinok"
-
-#: ../mail/em-folder-utils.c:511
-#, fuzzy
-msgid "Folder names cannot contain '/'"
-msgstr "Meno priečinku nesmie obsahovať znak \"/\"."
-
-#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:590
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:750
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:388
 #, fuzzy
 msgid "Create folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:750
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Specify where to create the folder:"
 msgstr "Zadajte, kde vytvoriť priečinok"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
-msgid "Reply to _All"
-msgstr "Odpovedať _všetkým"
+#: ../mail/em-folder-view.c:1074 ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1075 ../mail/mail.error.xml.h:127
+#, fuzzy
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1279 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1281 ../mail/em-popup.c:578 ../mail/em-popup.c:589
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
+#: ../mail/em-folder-view.c:1285 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: ../mail/em-folder-view.c:1050
+#: ../mail/em-folder-view.c:1291
 msgid "U_ndelete"
 msgstr "Obnoviť _zmazané"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
+#: ../mail/em-folder-view.c:1292
 msgid "_Move to Folder..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1293
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: ../mail/em-folder-view.c:1055
+#: ../mail/em-folder-view.c:1296
 msgid "Mar_k as Read"
 msgstr "Označiť ako _prečítanú"
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1297
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1298
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: ../mail/em-folder-view.c:1058
-msgid "_Mark as Unimportant"
+#: ../mail/em-folder-view.c:1299
+#, fuzzy
+msgid "Mark as Un_important"
 msgstr "Označiť ako nedô_ležitú"
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1300
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Označiť ako _neprečítanú"
 
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1301
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Označiť ako _dôležitú"
 
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1302
 #, fuzzy
 msgid "Mark for Follo_w Up..."
 msgstr "_Odpoveď..."
 
-#: ../mail/em-folder-view.c:1069
+#: ../mail/em-folder-view.c:1304
+#, fuzzy
+msgid "_Label"
+msgstr "Popis"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../mail/em-folder-view.c:1305 ../widgets/misc/e-dateedit.c:496
+#, fuzzy
+msgid "_None"
+msgstr "Žiadna"
+
+#: ../mail/em-folder-view.c:1310
 msgid "Fla_g Completed"
 msgstr "Označiť ako _Dokončený"
 
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1311
 msgid "Cl_ear Flag"
 msgstr "Vyčistiť _značku"
 
-#: ../mail/em-folder-view.c:1073
+#: ../mail/em-folder-view.c:1314
 msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1315
 #, fuzzy
 msgid "Search Folder from _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1316
 #, fuzzy
 msgid "Search Folder from Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1317
 #, fuzzy
 msgid "Search Folder from _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1318
 #, fuzzy
 msgid "Search Folder from Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: ../mail/em-folder-view.c:1081
+#: ../mail/em-folder-view.c:1322
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1323
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: ../mail/em-folder-view.c:1083
+#: ../mail/em-folder-view.c:1324
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: ../mail/em-folder-view.c:1084
+#: ../mail/em-folder-view.c:1325
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
+#: ../mail/em-folder-view.c:2161 ../mail/em-folder-view.c:2205
 msgid "Default"
 msgstr "Štandard"
 
-#: ../mail/em-folder-view.c:2064
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr "Tlačiť správu"
-
-#: ../mail/em-folder-view.c:2220
+#: ../mail/em-folder-view.c:2423
 #, fuzzy
 msgid "Unable to retrieve message"
 msgstr "Nie je možné získať správu z editora"
 
-#: ../mail/em-folder-view.c:2413
+#: ../mail/em-folder-view.c:2442
 #, fuzzy
-msgid "_Copy Link Location"
-msgstr "Kopírovať umiestnenie odkazu"
+msgid "Retrieving Message..."
+msgstr "Získavam správu %s"
 
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2670
+#, fuzzy
+msgid "C_all To..."
+msgstr "_Delegovať na..."
+
+#: ../mail/em-folder-view.c:2673
 #, fuzzy
 msgid "Create _Search Folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2674
 #, fuzzy
 msgid "_From this Address"
 msgstr "_E-mailová adresa:"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2675
 #, fuzzy
 msgid "_To this Address"
 msgstr "_Adresa:"
 
-#: ../mail/em-folder-view.c:2698
+#: ../mail/em-folder-view.c:3050
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kliknutím pridáte úlohu"
 
+#: ../mail/em-folder-view.c:3062
+#, fuzzy, c-format
+msgid "Click to call %s"
+msgstr "Kliknutím pridáte úlohu"
+
+#: ../mail/em-folder-view.c:3067
+msgid "Click to hide/unhide addresses"
+msgstr ""
+
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:445
+#: ../mail/em-format-html-display.c:514
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Odpovedá:"
 
-#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:657
+#, fuzzy
+msgid "Fi_nd:"
+msgstr "Hľadať:"
+
+#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
+#: ../mail/em-format-html-display.c:681
+#, fuzzy
+msgid "_Previous"
+msgstr "Predchádzajúca"
+
+#: ../mail/em-format-html-display.c:686
+#, fuzzy
+msgid "_Next"
+msgstr "Nasledujúca"
+
+#: ../mail/em-format-html-display.c:691
+#, fuzzy
+msgid "M_atch case"
+msgstr "Mitchell"
+
+#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:635
 #, fuzzy
 msgid "Unsigned"
 msgstr "Priradené"
 
-#: ../mail/em-format-html-display.c:696
+#: ../mail/em-format-html-display.c:938
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:636
 #, fuzzy
 msgid "Valid signature"
 msgstr "Upraviť podpis"
 
-#: ../mail/em-format-html-display.c:697
+#: ../mail/em-format-html-display.c:939
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:637
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Upraviť podpis"
 
-#: ../mail/em-format-html-display.c:698
+#: ../mail/em-format-html-display.c:940
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:699
-msgid "Valid signature, cannot verify sender"
+#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:638
+msgid "Valid signature, but cannot verify sender"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:941
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "input_token obsahuje neplatný podpis alebo podpis nie je možné overiť."
 
-#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:639
+msgid "Signature exists, but need public key"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:942
+#, fuzzy
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr "input_token obsahuje neplatný podpis alebo podpis nie je možné overiť."
+
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:645
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Prerušené"
 
-#: ../mail/em-format-html-display.c:705
+#: ../mail/em-format-html-display.c:949
 msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:646
 msgid "Encrypted, weak"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:950
 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 "
+"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:707 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:647
 #, fuzzy
 msgid "Encrypted"
 msgstr "Šifrovanie PGP"
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:951
 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:708 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:648
 msgid "Encrypted, strong"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:952
 msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
+"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:809 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1053 ../smime/gui/smime-ui.glade.h:48
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID _certifikátu:"
 
-#: ../mail/em-format-html-display.c:824
+#: ../mail/em-format-html-display.c:1068
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Certifikát ešte nie je platný"
 
-#: ../mail/em-format-html-display.c:1106
+#: ../mail/em-format-html-display.c:1387
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1395
 msgid "Overdue:"
 msgstr "Po termíne:"
 
-#: ../mail/em-format-html-display.c:1117
+#: ../mail/em-format-html-display.c:1398
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1458
 #, fuzzy
 msgid "_View Inline"
 msgstr "Zobraziť v texte"
 
-#: ../mail/em-format-html-display.c:1178
+#: ../mail/em-format-html-display.c:1459
 #, fuzzy
 msgid "_Hide"
 msgstr "Skryť"
 
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1460
 #, fuzzy
 msgid "_Fit to Width"
 msgstr "Šírka orezania"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1461
 msgid "Show _Original Size"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1550
-#, fuzzy
-msgid "Attachment Button"
+#: ../mail/em-format-html-display.c:1905 ../mail/em-format-html-display.c:2518
+#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
+msgid "Attachment"
 msgstr "Príloha"
 
-#: ../mail/em-format-html-display.c:1757
+#: ../mail/em-format-html-display.c:2119
 #, fuzzy
-msgid "Select folder to save all attachments..."
-msgstr "Uložiť všetky prílohy"
+msgid "Save attachment as"
+msgstr "Uložiť prílohy"
 
-#: ../mail/em-format-html-display.c:1796
-msgid "Select folder to save selected attachments..."
-msgstr ""
+#: ../mail/em-format-html-display.c:2123
+#, fuzzy
+msgid "Select folder to save all attachments"
+msgstr "Uložiť všetky prílohy"
 
-#: ../mail/em-format-html-display.c:1804
+#: ../mail/em-format-html-display.c:2174
 #, fuzzy
-msgid "Save Selected..."
+msgid "_Save Selected..."
 msgstr "Uložiť vybrané"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1871
+#: ../mail/em-format-html-display.c:2241
 #, fuzzy, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
+msgid "%d at_tachment"
+msgid_plural "%d at_tachments"
 msgstr[0] "Príloha"
 msgstr[1] "Príloha"
 msgstr[2] "Príloha"
 
-#: ../mail/em-format-html-display.c:1935
+#: ../mail/em-format-html-display.c:2248 ../mail/em-format-html-display.c:2326
+#, fuzzy
+msgid "S_ave"
+msgstr "Uložiť"
+
+#: ../mail/em-format-html-display.c:2259
+#, fuzzy
+msgid "S_ave All"
+msgstr "Uložiť ako"
+
+#: ../mail/em-format-html-display.c:2322
 #, fuzzy
 msgid "No Attachment"
 msgstr "Príloha"
 
-#: ../mail/em-format-html-display.c:1938
+#: ../mail/em-format-html-display.c:2453 ../mail/em-format-html-display.c:2491
 #, fuzzy
-msgid "Save All"
-msgstr "Uložiť ako"
+msgid "View _Unformatted"
+msgstr "Formát času:"
+
+#: ../mail/em-format-html-display.c:2455
+#, fuzzy
+msgid "Hide _Unformatted"
+msgstr "Formát času:"
+
+#: ../mail/em-format-html-display.c:2510
+#, fuzzy
+msgid "O_pen With"
+msgstr "končí na"
+
+#: ../mail/em-format-html-display.c:2581
+msgid ""
+"Evolution cannot render this email as it is too large to handle. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
 
-#: ../mail/em-format-html-print.c:130
+#: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:489 ../mail/em-format-html.c:498
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Získavam správu %s"
 
-#: ../mail/em-format-html.c:600
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: ../mail/em-format-html.c:910
+#, fuzzy
+msgid "Unknown external-body part."
+msgstr "Nesprávna časť externého tela."
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:918
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:948
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:959
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lokálny súbor (%s) platný na serveri \"%s\""
 
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:961
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:982
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdialené dáta (%s)"
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:993
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1220
 #, fuzzy
 msgid "Formatting message"
 msgstr "Presúvam správy"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
-msgid "From"
-msgstr "Od"
-
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Komu"
+#: ../mail/em-format-html.c:1388
+#, fuzzy
+msgid "Formatting Message..."
+msgstr "Presúvam správy"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1527 ../mail/em-format-html.c:1591
+#: ../mail/em-format-html.c:1613 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:90
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1528 ../mail/em-format-html.c:1597
+#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:91
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:987
+#: ../mail/em-format-html.c:1687 ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:1198
 msgid "Mailer"
 msgstr "Poštový klient"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
+#: ../mail/em-format-html.c:1714
+#, fuzzy
+msgid " (%a, %R %Z)"
+msgstr "%a %d %Y"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
-msgid "<I> (%R %Z)</I>"
+#: ../mail/em-format-html.c:1719
+msgid " (%R %Z)"
 msgstr ""
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
-#: ../mail/message-list.etspec.h:2
+#: ../mail/em-format-html.c:1731 ../mail/em-format-quote.c:336
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:93
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:344
+#: ../widgets/misc/e-dateedit.c:366
 msgid "Date"
 msgstr "Dátum"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1754 ../mail/em-format.c:893
+#: ../mail/em-mailer-prefs.c:94
 msgid "Newsgroups"
 msgstr ""
 
-#: ../mail/em-format.c:1102
+#. 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:1844
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:332
+msgid "From"
+msgstr "Od"
+
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:88
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
+#: ../mail/em-format.c:1196
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
+#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: ../mail/em-format.c:1278
+#: ../mail/em-format.c:1341
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../mail/em-format.c:1445
+#: ../mail/em-format.c:1351
+#, fuzzy
+msgid "Could not parse PGP/MIME message"
+msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
+
+#: ../mail/em-format.c:1351
+#, fuzzy
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
+
+#: ../mail/em-format.c:1508
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Nepodporovaná schéma"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Nepodarilo sa overiť listový podpis"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Nepodarilo sa overiť listový podpis"
 
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-format.c:1658
+#, fuzzy
+msgid "Could not parse PGP message"
+msgstr "Nepodarilo sa vytvoriť správu."
+
+#: ../mail/em-format.c:1658
+#, fuzzy
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
+
+#: ../mail/em-mailer-prefs.c:105
 #, fuzzy
 msgid "Every time"
 msgstr "Každý rok"
 
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:106
 #, fuzzy
 msgid "Once per day"
 msgstr "_Jeden deň"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:107
 #, fuzzy
 msgid "Once per week"
 msgstr "Jeden _týždeň"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:108
 #, fuzzy
 msgid "Once per month"
 msgstr "Jeden _mesiac"
 
-#: ../mail/em-migrate.c:1198
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:789 ../mail/em-mailer-prefs.c:843
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr ""
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:797 ../mail/em-mailer-prefs.c:852
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:818
+#, fuzzy
+msgid "No Junk plugin available"
+msgstr "Popis nie je k dispozícii."
+
+#: ../mail/em-migrate.c:1210
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11840,439 +12527,514 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1649
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1675
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Nepodarilo sa skopírovať deskriptor súboru: %s\n"
 "%s"
 
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: ../mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2064
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nepodarilo sa prihlásiť na POP server %s: %s"
 
-#: ../mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2078
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nepodarilo sa vytvoriť rúru do '%s': %s"
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2107
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nepodarilo sa vytvoriť rúru do '%s': %s"
 
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2742
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2761
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: ../mail/em-popup.c:399
-#, fuzzy
-msgid "Save As..."
-msgstr "Uložiť _ako..."
-
-#: ../mail/em-popup.c:424
-#, fuzzy, c-format
-msgid "untitled_image.%s"
-msgstr "Správa bez mena"
-
-#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
-msgid "Set as _Background"
-msgstr ""
-
-#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: ../mail/em-popup.c:607
+#: ../mail/em-popup.c:639
 #, fuzzy
-msgid "_Open Link in Browser"
-msgstr "Otvoriť odkaz v prehliadači"
-
-#: ../mail/em-popup.c:608
-#, fuzzy
-msgid "_Send New Message To..."
-msgstr "Poslať _správu zoznamu..."
-
-#: ../mail/em-popup.c:609
-#, fuzzy
-msgid "_Add to Addressbook"
+msgid "_Add to Address Book"
 msgstr "Pridať odosielateľa do adresára"
 
-#: ../mail/em-popup.c:762
-#, c-format
-msgid "Open in %s..."
-msgstr "Otvoriť v %s..."
-
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:601
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Tento server nepodporuje informácie schém LDAPv3"
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:634
 #, fuzzy
 msgid "Subscribed"
 msgstr "Prihlásiť si"
 
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:638
 msgid "Folder"
 msgstr "Priečinok"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:840
 msgid "Please select a server."
 msgstr "Prosím, vyberte server."
 
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:861
 msgid "No server has been selected"
 msgstr "Nebol vybraný žiadny server"
 
-#: ../mail/em-utils.c:105
-msgid "Don't show this message again."
+#: ../mail/em-utils.c:120
+#, fuzzy
+msgid "Do not show this message again."
 msgstr "Túto správu už nezobrazovať."
 
-#: ../mail/em-utils.c:299
-msgid "Filters"
-msgstr "Filtre"
+#: ../mail/em-utils.c:315
+#, fuzzy
+msgid "Message Filters"
+msgstr "F_iltre správ"
 
-#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
+#: ../mail/em-utils.c:368
 #, fuzzy
 msgid "message"
 msgstr "Správa"
 
-#: ../mail/em-utils.c:614
+#: ../mail/em-utils.c:563
 #, fuzzy
 msgid "Save Message..."
 msgstr "Uložiť správu ako..."
 
-#: ../mail/em-utils.c:663
+#: ../mail/em-utils.c:612
 #, fuzzy
 msgid "Add address"
 msgstr "Adresa"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1142
+#: ../mail/em-utils.c:1096
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Pošta od %s"
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:112
 #, fuzzy
 msgid "Search _Folders"
 msgstr "Prehľadať pr_iečinky"
 
-#: ../mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:592
 #, fuzzy
 msgid "Search Folder source"
 msgstr "Prehľadať pr_iečinky"
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
-msgid "Automatic link recognition"
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "Allows evolution to display text part of limited size"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
-msgid "Automatic smiley recognition"
+#: ../mail/evolution-mail.schemas.in.h:2
+#, fuzzy
+msgid "Automatic emoticon recognition"
+msgstr "Pridať do kontaktov"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Automatic link recognition"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Check incoming mail being junk"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Citation highlight color"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Citation highlight color."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Composer Window default height"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Composer Window default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:9
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:10
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:11
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Štandardný predmet pre správu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Štandardný predmet pre správu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 #, fuzzy
 msgid "Default forward style"
 msgstr "Štýl _preposielania:"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 #, fuzzy
 msgid "Default height of the Composer Window"
 msgstr "Štandardný predmet pre správu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
 #, fuzzy
 msgid "Default height of the Message Window"
 msgstr "Štandardný predmet pre správu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
 #, fuzzy
 msgid "Default height of the Subscribe dialog"
 msgstr "Štandardný predmet pre správu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:19
 #, fuzzy
 msgid "Default reply style"
 msgstr "Š_týl odpovede:"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:20
+#, fuzzy
+msgid "Default value for thread expand state"
+msgstr "Štandardný predmet pre správu."
+
+#: ../mail/evolution-mail.schemas.in.h:21
 #, fuzzy
 msgid "Default width of the Composer Window"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:22
 #, fuzzy
 msgid "Default width of the Message Window"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:23
 #, fuzzy
 msgid "Default width of the Subscribe dialog"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Directory for saving mail component files"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:26
+#, fuzzy
+msgid "Empty Junk folders on exit"
+msgstr "Vyprázdniť O_dpadky pri ukončení"
+
+#: ../mail/evolution-mail.schemas.in.h:27
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Vyprázdniť O_dpadky pri ukončení"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
+#, fuzzy
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Vyprázdniť O_dpadky pri ukončení"
+
+#: ../mail/evolution-mail.schemas.in.h:29
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vyprázdniť O_dpadky pri ukončení"
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Enable or disable type ahead search feature"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Enable side bar search feature so that you can start interactive searching "
+"by typing in the text. Use is that you can easily find a folder in that side "
+"bar by just typing the folder name and the selection jumps automatically to "
+"that folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:33
+#, fuzzy
+msgid "Enable to render message text part of limited size."
+msgstr "Nie je možné získať správu z editora"
+
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid "Hides the per-folder preview and removes the selection"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid ""
+"It disables the feature where repeated prompts to ask if delete messages "
+"from search folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid ""
+"It disables the feature where repeated prompts to ask if offline sync is "
+"required."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid "Last time empty junk was run"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Last time empty trash was run"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:47
 #, fuzzy
 msgid "List of accepted licenses"
 msgstr "Poštové účty"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:48
 #, fuzzy
 msgid "List of accounts"
 msgstr "Poštové účty"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images in mail from contacts 2 - Always "
+"load images off the net 1 - Load images in messages from contacts 2 - Always "
 "load images off the net"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:56
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Spustiť akcie"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:64
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Štandardná priorita:"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Message Window default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Minimum days between emptying the junk on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:71
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Upozornenie na novú poštu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:72
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Upozornenie na novú poštu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:78
+#, fuzzy
+msgid "Prompt when deleting messages in search folder"
+msgstr "Pýtať sa pri posielaní správ be_z predmetu"
+
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:81
 #, fuzzy
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:82
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -12280,106 +13042,163 @@ msgid ""
 msgstr ""
 "_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:83
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
-msgid "Recognize links in text and replace them."
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Prompt while marking multiple messages"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
-msgid "Recognize smileys in text and replace them with images."
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:89
+#, fuzzy
+msgid "Save directory"
+msgstr "_Presmerovať"
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Search for the sender photo in local addressbooks"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:91
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Poslať poštu HTML?"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:92
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Poslať poštu HTML?"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:93
 #, fuzzy
 msgid "Show Animations"
 msgstr "Zobraziť _animované obrázky"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:94
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Zobraziť _animované obrázky"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:96
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Zobraziť správu normálne"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "Zobraziť panel \"Náhľad\""
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid "Show photo of the sender"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
+#: ../mail/evolution-mail.schemas.in.h:100
+#, fuzzy
+msgid ""
+"Show the email of the sender in the messages composite column in the message "
+"list"
+msgstr "Zobraziť správu normálne"
+
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid "Show the photo of the sender in the message reading pane."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:102
+#, fuzzy
+msgid "Show the sender email in the messages column in the message list"
+msgstr "Zobraziť správu normálne"
+
+#: ../mail/evolution-mail.schemas.in.h:103
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Zahrať zvuk pri príchode novej správy"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:105
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Kontrola _pravopisu"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:106
 #, fuzzy
 msgid "Subscribe dialog default height"
 msgstr "Štandardná priorita:"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Subscribe dialog default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:108
 #, fuzzy
 msgid "Terminal font"
 msgstr "Písmo _terminálu:"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:109
+#, fuzzy
+msgid "Text message part limit"
+msgstr "_Poslať správu do zoznamu"
+
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "The last time empty junk was run, in days since the epoch."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:114
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Vyberte písmo premenlivej šírky pre tlač HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid ""
+"This decides the max size of the text part that can be formatted under "
+"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"This key is read only once and reset to false after read. This unselects the "
+"mail in the list and removes the preview for that folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:118
 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;"
@@ -12387,406 +13206,383 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid "This option would help in improving the speed of fetching."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:123
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Zoznam vlákien"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:124
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Zoznam vlákien"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:128
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Použiť ako š_tandardný účet"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
-msgid "Use Spamassassin daemon and client"
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Use SpamAssassin daemon and client"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Use SpamAssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Use custom fonts"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Use only local spam tests."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Use side-by-side or wide layout"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:136
 #, fuzzy
 msgid "Variable width font"
 msgstr "_Premenlivá šírka:"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:193
+#: ../mail/evolution-mail.schemas.in.h:148
+msgid "Whether sort threads based on latest message in that thread"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:149
+#, fuzzy
+msgid "Width of the message-list pane"
+msgstr "Zoznam vlákien"
+
+#: ../mail/evolution-mail.schemas.in.h:150
+#, fuzzy
+msgid "Width of the message-list pane."
+msgstr "Zoznam vlákien"
+
+#: ../mail/importers/elm-importer.c:184
 #, fuzzy
 msgid "Importing Elm data"
 msgstr "Importujem súbory"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:373
 msgid "Evolution Elm importer"
 msgstr "Import Elm pre Evolution"
 
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:374
 #, fuzzy
 msgid "Import mail from Elm."
 msgstr "Importujem súbory"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:83
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Odstrániť tento priečinok"
 
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:86
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Vyberte nástroj pre import"
 
-#: ../mail/importers/evolution-mbox-importer.c:216
+#: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:217
+#: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
-#, fuzzy, c-format
-msgid "Importing `%s'"
-msgstr "Importujem"
-
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Importing..."
-msgstr "Importujem..."
-
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
-#: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
-msgid "Please wait"
-msgstr "Prosím, čakajte"
-
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/mail-importer.c:148
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Importujem súbory"
 
-#: ../mail/importers/mail-importer.c:373
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Importujem"
+
+#: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "Prehľadávam %s"
 
-#: ../mail/importers/netscape-importer.c:73
-#, c-format
-msgid "Priority Filter \"%s\""
-msgstr "Filter priority \"%s\""
-
-#: ../mail/importers/netscape-importer.c:662
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"Niektoré poštové filtre Netscape sú založené na prioritách\n"
-"správ, Evolution nepodporuje. Namiesto toho podporuje\n"
-"skóre v rozsahu -3 až 3, ktoré je možné správam priradiť.\n"
-"\n"
-"Ako náhradu bola pridaná kategória filtrov \"Filter priority\",\n"
-"ktorá prevádza priority Netscape na skóre Evolution.\n"
-"Zodpovedajúce importované filtre budú používať skóre.\n"
-"Overte naimportované filtre, že všetky funguje tak, ako má."
-
-#: ../mail/importers/netscape-importer.c:686
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"Niektoré poštové filtre Netscape používajú funkciu\n"
-"\"Ignorovať vlákno\" a \"Sledovať vlákno\", ktorú\n"
-"Evolution nepodporuje. Tieto filtre budú zahodené."
-
-#: ../mail/importers/netscape-importer.c:703
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"Niektoré poštové filtre Netscape testujú telo\n"
-"správ, či sú zhodné ako zadaný reťazec.\n"
-"Táto možnosť nie je v Evolution podporovaná.\n"
-"Tieto filtre boli upravené, aby testovali, či\n"
-"je reťazec je alebo nie je v tele správy."
-
-#: ../mail/importers/netscape-importer.c:1250
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution importuje vaše staré dáta Netscape"
-
-#: ../mail/importers/netscape-importer.c:1707
-#, fuzzy
-msgid "Importing Netscape data"
-msgstr "Evolution importuje vaše staré dáta Netscape"
-
-#: ../mail/importers/netscape-importer.c:1907
-msgid "Settings"
-msgstr "Nastavenie"
-
-#: ../mail/importers/netscape-importer.c:1912
-msgid "Mail Filters"
-msgstr "Poštové filtre"
-
-#: ../mail/importers/netscape-importer.c:1933
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution našiel poštové súbory Netscape.\n"
-"Chcete ich naimportovať do Evolution?"
-
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:229
 #, fuzzy
 msgid "Importing Pine data"
 msgstr "Importujem súbory"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:433
 msgid "Evolution Pine importer"
 msgstr "Import z Pine pre Evolution"
 
-#: ../mail/importers/pine-importer.c:435
+#: ../mail/importers/pine-importer.c:434
 #, fuzzy
 msgid "Import mail from Pine."
 msgstr "Importovať jeden súbor"
 
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:79
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta pre %s"
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:266
 #, c-format
 msgid "Subject is %s"
 msgstr "Predmet je %s"
 
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:301
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencia"
 
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "Pridať pravidlo filtra"
 
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:524
+#, fuzzy, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d vybraných"
+msgstr[1] "%d vybraných"
+
+#: ../mail/mail-component.c:528
 #, fuzzy, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d vybraných"
 msgstr[1] "%d vybraných"
 
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:530
 #, fuzzy, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d neposlaných"
 msgstr[1] "%d neposlaných"
 
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:533
 #, fuzzy, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "Koncepty"
 msgstr[1] "Koncepty"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:535
 #, fuzzy, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d poslaných"
 msgstr[1] "%d poslaných"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:537
 #, fuzzy, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d neposlaných"
 msgstr[1] "%d neposlaných"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:543
+#, fuzzy, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d neposlaných"
+msgstr[1] "%d neposlaných"
+
+#: ../mail/mail-component.c:544
 #, fuzzy, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "celkovo %d"
 msgstr[1] "celkovo %d"
 
-#: ../mail/mail-component.c:544
-#, fuzzy, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] "%d neposlaných"
-msgstr[1] "%d neposlaných"
-
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:881
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:882
 msgid "_Mail Message"
 msgstr "_Poslať správu"
 
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:883
 msgid "Compose a new mail message"
 msgstr "Napísať novú správu"
 
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:889
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nový vPriečinok"
 
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:890
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Poštové filtre"
 
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:891
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:1038
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../mail/mail-config.c:81
 #, fuzzy
-msgid "    "
-msgstr "      "
+msgid "I_mportant"
+msgstr "Dôležité"
 
-#: ../mail/mail-config.glade.h:2
+#. red
+#: ../mail/mail-config.c:82
+#, fuzzy
+msgid "_Work"
+msgstr "Práca"
+
+#. orange
+#: ../mail/mail-config.c:83
+#, fuzzy
+msgid "_Personal"
+msgstr "Osobný"
+
+#. green
+#: ../mail/mail-config.c:84
+#, fuzzy
+msgid "_To Do"
+msgstr "Urobiť"
+
+#. blue
+#: ../mail/mail-config.c:85
+#, fuzzy
+msgid "_Later"
+msgstr "Neskôr"
+
+#: ../mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "Kontrolovať _podporované typy"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 #, fuzzy
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
+#: ../mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Sender  Photograph</b>"
+msgstr "Popis:"
+
 #: ../mail/mail-config.glade.h:5
 #, fuzzy
-msgid "<b>S_ignatures</b>"
+msgid "<b>Sig_natures</b>"
 msgstr "<b>Stav:</b>"
 
 #: ../mail/mail-config.glade.h:6
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Stav:</b>"
 
-#: ../mail/mail-config.glade.h:7
-msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr ""
-
 #: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr ""
-
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
@@ -12812,199 +13608,183 @@ msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:17
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr ""
+#, fuzzy
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "Zobrazené správy:"
 
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:20
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Zobrazené správy:"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:22
 #, fuzzy
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "Zobrazené správy:"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:23
 #, fuzzy
-msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgid "<span weight=\"bold\">New Message Notification</span>"
 msgstr "Upozornenie na novú poštu"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Odoslané a koncepty"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "Správa účtu"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:35
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Pridať nový podpis..."
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Add _Script"
 msgstr "Pridať _skript"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:37
 #, fuzzy
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:38
 #, fuzzy
-msgid "Also encrypt to sel_f when sending encrypted mail"
+msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Vždy poslať _kópiu (Cc):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Vždy poslať _slepú kópiu (Bcc):"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Vždy _dôverovať kľúčom v mojom keyringu pri šifrovaní"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:42
 #, fuzzy
-msgid "Always encrypt to _myself when sending encrypted mail"
+msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:43
 msgid "Attach original message"
 msgstr "Priložiť pôvodnú správu"
 
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Príloha"
-
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
 #, fuzzy
-msgid "Automatically _insert smiley images"
+msgid "Automatically insert _emoticon images"
 msgstr "_Automaticky vložiť smajlíky"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:46
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltská (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltská (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
-#, fuzzy
-msgid "Beep w_hen new mail arrives"
-msgstr "Píp_nuť pri príchode novej správy"
-
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:48
 msgid "C_haracter set:"
 msgstr "_Znaková sada:"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "Kontrolovať _podporované typy"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:50
 #, fuzzy
-msgid "Check _incoming mail for junk"
+msgid "Check in_coming messages for junk"
 msgstr "Kontrolujem novú poštu"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:51
 msgid "Check spelling while I _type"
 msgstr "Kontrolovať pravopis _priebežne"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:52
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Cle_ar"
 msgstr "Vymazať"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Clea_r"
 msgstr "Vymazať"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:55
 msgid "Color for _misspelled words:"
 msgstr "Farba pre ne_správne slová:"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Colors"
 msgstr "_Farby"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdenie pri čistení priečinku"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:58
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13020,20 +13800,28 @@ msgstr ""
 "\n"
 "Kliknutím na \"Použiť\" uložíte vaše nastavenie."
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:64
 msgid "De_fault"
 msgstr "Š_tandardné"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Štandardná _znaková sada:"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:67
+msgid "Delete junk messages on e_xit"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
+#: ../mail/mail-config.glade.h:70
+msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgstr ""
+
 #: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Necitovať pôvodnú správu"
@@ -13072,12 +13860,13 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
 #: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr "Vykonať príkaz..."
+#, fuzzy
+msgid "Fi_xed-width:"
+msgstr "Pe_vná šírka:"
 
 #: ../mail/mail-config.glade.h:82
 #, fuzzy
-msgid "Fi_xed-width:"
+msgid "Fix_ed width Font:"
 msgstr "Pe_vná šírka:"
 
 #: ../mail/mail-config.glade.h:83
@@ -13088,77 +13877,85 @@ msgstr "Vlastnosti písma"
 msgid "Format messages in _HTML"
 msgstr "Písať správy v _HTML"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:85
 #, fuzzy
-msgid "HTML Mail"
-msgstr "_HTML správy"
+msgid "Full Nam_e:"
+msgstr "_Celé meno:"
 
 #: ../mail/mail-config.glade.h:87
 #, fuzzy
+msgid "HTML Messages"
+msgstr "_Správy"
+
+#: ../mail/mail-config.glade.h:88
+#, fuzzy
 msgid "Headers"
 msgstr "Hlavička"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Zvýrazniť citácie pomocou"
 
-#: ../mail/mail-config.glade.h:89
-#, fuzzy
-msgid "I_nclude remote tests"
-msgstr "Vložiť:"
-
 #: ../mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "v texte"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:93
+msgid "Inline original message (Outlook style)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:95
+msgid "KB"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Languages Table"
 msgstr "Jazyk"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Nastavenie pošty"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Mail Headers Table"
 msgstr "Poštové filtre"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:101
 msgid "Mailbox location"
 msgstr "Umiestnenie poštovej schránky"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:102
 msgid "Message Composer"
 msgstr "Písanie správ"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:103
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Poznámka: Kým sa prvýkrát nepripojíte, nebudete musieť heslo zadávať."
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:104
 msgid "Or_ganization:"
 msgstr "Or_ganizácia:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:105
 msgid "PGP/GPG _Key ID:"
 msgstr "ID PGP/GPG _kľúča:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 #, fuzzy
-msgid "Play sound file when new mail arri_ves"
+msgid "Play sound file when new messages arri_ve"
 msgstr "_Zahrať zvuk pri príchode novej správy"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
 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:109
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13167,7 +13964,7 @@ msgstr ""
 "ktorý typ serveru použiť, kontaktujte vášho administrátora alebo "
 "poskytovateľa pripojenia na Internet."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
 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 "
@@ -13176,129 +13973,143 @@ msgstr ""
 "Prosím, zadajte vaše meno a e-mailovú adresu. \"Nepovinné\" informácie\n"
 "nemusíte zadať, iba ak chcete, aby boli posielané vo vašich správach."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:113
 msgid "Please select among the following options"
 msgstr "Prosím, vyberte si z týchto možností"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:114
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:115
 msgid "Quote original message"
 msgstr "Citovať pôvodnú správu"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:116
 msgid "Quoted"
 msgstr "Citovať"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Re_member password"
 msgstr "Uložiť toto heslo"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:118
 msgid "Re_ply-To:"
 msgstr "Komu o_dpovedať:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Remember _password"
 msgstr "Uložiť toto heslo"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:121
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:122
 #, fuzzy
 msgid "S_elect..."
 msgstr "Odstrániť..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
+#, fuzzy
+msgid "S_end message receipts:"
+msgstr "Posielam správu"
+
+#: ../mail/mail-config.glade.h:124
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "Š_tandardné písmo:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 #, fuzzy
 msgid "Se_lect..."
 msgstr "Odstrániť..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:127
+#, fuzzy
+msgid "Select Drafts Folder"
+msgstr "Vybrať priečinok"
+
+#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font"
 msgstr "Vyberte písmo pevnej širky pre HTML"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "Select HTML fixed width font for printing"
 msgstr "Vyberte písmo pevnej širky pre tlač HTML"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "Select HTML variable width font"
 msgstr "Vyberte písmo premenlivej širky pre HTML"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:131
 msgid "Select HTML variable width font for printing"
 msgstr "Vyberte písmo premenlivej šírky pre tlač HTML"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 #, fuzzy
-msgid "Send message receipts:"
-msgstr "Posielam správu"
+msgid "Select Sent Folder"
+msgstr "Vybrať priečinok"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:133
+#, fuzzy
+msgid "Select sound file"
+msgstr "Vybrať súbor"
+
+#: ../mail/mail-config.glade.h:135
 msgid "Sending Mail"
 msgstr "Posielanie pošty"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Priečinok pre _odoslané správy:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:137
 msgid "Ser_ver requires authentication"
 msgstr "Server vyžaduje _prihlásenie"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:138
 msgid "Server _Type: "
 msgstr "_Typ serveru:"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Sig_ning certificate:"
 msgstr "Samopodpísaný certifikát v reťazci"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Podpis:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:141
 #, fuzzy
 msgid "Signatures"
 msgstr "_Podpisy"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:142
 #, fuzzy
 msgid "Signatures Table"
 msgstr "_Podpisy"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:143
 msgid "Specify _filename:"
 msgstr "Zadajte _meno súboru:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:144
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Kontrola _pravopisu"
 
-#: ../mail/mail-config.glade.h:139
-#, fuzzy
-msgid "T_erminal Font:"
-msgstr "Písmo _terminálu:"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 #, fuzzy
 msgid "T_ype: "
 msgstr "Typ:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
 #, fuzzy
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
@@ -13307,7 +14118,7 @@ msgstr ""
 "Táto časť umožňuje nastviť chovanie a jazyk pre kontrolu pravopisu. Zoznam "
 "jazykov obsahuje iba tie, pre ktoré máte nainštalované slovníky."
 
-#: ../mail/mail-config.glade.h:142
+#: ../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"
@@ -13316,7 +14127,7 @@ msgstr ""
 "Výstup tohto skriptu sa použije ako vaša signatúra.\n"
 "Zadané meno sa použije iba pre zobrazenie."
 
-#: ../mail/mail-config.glade.h:146
+#: ../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\""
@@ -13324,15 +14135,16 @@ msgstr ""
 "Zadajte meno, ako chcete tento účet označovať.\n"
 "Napríklad \"Pracovný\" alebo \"Osobný\"."
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:153 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:343
 msgid "User_name:"
 msgstr "Po_užívateľ:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:154
 msgid "V_ariable-width:"
 msgstr "_Premenlivá šírka:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:155
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13342,92 +14154,125 @@ msgstr ""
 "\n"
 "Kliknutím \"Nasledujúci\" začnete."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:159
 msgid "_Add Signature"
 msgstr "_Pridať podpis"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Vždy načítavať obrázky zo siete"
 
-#: ../mail/mail-config.glade.h:156
-msgid "_Do not notify me when new mail arrives"
+#: ../mail/mail-config.glade.h:161
+#, fuzzy
+msgid "_Beep when new messages arrive"
+msgstr "Píp_nuť pri príchode novej správy"
+
+#: ../mail/mail-config.glade.h:162
+msgid "_Default junk plugin:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Do not notify me when new messages arrive"
 msgstr "_Neuprozorňovať na príchod novej správy"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:164
 #, fuzzy
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "Nepodpisovať požiadavky na _stretnutie (pre kompatibilitu s klientom Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:166
 msgid "_Forward style:"
 msgstr "Štýl _preposielania:"
 
-#: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "_Celé meno:"
-
-#: ../mail/mail-config.glade.h:161
-msgid "_Load images in mail from contacts"
+#: ../mail/mail-config.glade.h:167
+msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:168
+#, fuzzy
+msgid "_Load images in messages from contacts"
+msgstr "Poslať správu kontaktu"
+
+#: ../mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Použiť ako š_tandardný účet"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Označiť správy ako prečítané po"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Nikdy nenačítať obrázky zo siete"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+#: ../mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
 "_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pýtať sa pri posielaní správ be_z predmetu"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Š_týl odpovede:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Show image animations"
 msgstr "Zobraziť _animované obrázky"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show the photograph of sender in the message preview"
+msgstr "Zobraziť zdrojový poštový formát v správe"
+
+#: ../mail/mail-config.glade.h:182
+msgid "_Shrink To / Cc / Bcc headers to "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:183
 #, fuzzy
 msgid "_Use Secure Connection:"
 msgstr "Použiť _bezpečné pripojenie (SSL):"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:184
 msgid "_Use the same fonts as other applications"
 msgstr "_Použiť rovnaké písma ako ostatné aplikácie"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:185
+#, fuzzy
+msgid "addresses"
+msgstr "Adresa"
+
+#: ../mail/mail-config.glade.h:186
 msgid "color"
 msgstr "farba"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:187
 msgid "description"
 msgstr "popis"
 
+#: ../mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid "    "
+msgstr "      "
+
 #: ../mail/mail-dialogs.glade.h:2
 #, fuzzy
 msgid "<b>Search Folder Sources</b>"
@@ -13443,50 +14288,69 @@ msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:5
 #, fuzzy
-msgid "Case _Sensitive"
+msgid "All active remote folders"
+msgstr "pre všetky aktívne vzdialené priečinky"
+
+#: ../mail/mail-dialogs.glade.h:6
+#, fuzzy
+msgid "All local and active remote folders"
+msgstr "pre všetky lokálne a aktívne vzdialené priečinky"
+
+#: ../mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "All local folders"
+msgstr "pre všetky lokálne priečinky"
+
+#: ../mail/mail-dialogs.glade.h:8
+#, fuzzy
+msgid "Case _sensitive"
 msgstr "Rozlišovať veľkosť písmen"
 
-#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:9
 #, fuzzy
 msgid "Co_mpleted"
 msgstr "Dokončený"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:11
 #, fuzzy
 msgid "F_ind:"
 msgstr "Hľadať:"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:12
 msgid "Find in Message"
 msgstr "Nájsť v správe"
 
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
-#: ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
 msgid "Flag to Follow Up"
 msgstr "Značka pre Follow Up"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Folder Subscriptions"
 msgstr "Prihlásené priečinky"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:15
 msgid "License Agreement"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:16
 msgid "None Selected"
 msgstr "Žiadne vybrané"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:17
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:18
 #, fuzzy
 msgid "Security Information"
 msgstr "Informácia o účte"
 
-#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "Specific folders"
+msgstr "iba špecifické priečinky"
+
+#: ../mail/mail-dialogs.glade.h:21
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13494,70 +14358,46 @@ msgstr ""
 "Správy, ktoré ste označili ako nasledujúce, sú uvedené dole.\n"
 "Prosím, vyberte akciu follow up z menu \"Značka\"."
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:23
 #, fuzzy
 msgid "_Accept License"
 msgstr "Akceptované"
 
-#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:24
 #, fuzzy
 msgid "_Due By:"
 msgstr "_Termín:"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:25
 msgid "_Flag:"
 msgstr "_Značka:"
 
-#: ../mail/mail-dialogs.glade.h:22
-msgid "_Subscribe"
-msgstr "_Prihlásiť si"
-
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:26
 #, fuzzy
 msgid "_Tick this to accept the license agreement"
 msgstr "Poštové účty"
 
-#: ../mail/mail-dialogs.glade.h:24
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "O_dhlásiť"
-
-#: ../mail/mail-dialogs.glade.h:25
-msgid "specific folders only"
-msgstr "iba špecifické priečinky"
-
-#: ../mail/mail-dialogs.glade.h:26
-msgid "with all active remote folders"
-msgstr "pre všetky aktívne vzdialené priečinky"
-
-#: ../mail/mail-dialogs.glade.h:27
-msgid "with all local and active remote folders"
-msgstr "pre všetky lokálne a aktívne vzdialené priečinky"
-
-#: ../mail/mail-dialogs.glade.h:28
-msgid "with all local folders"
-msgstr "pre všetky lokálne priečinky"
-
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:888
 #, c-format
 msgid "Pinging %s"
 msgstr "Prehľadávam %s"
 
-#: ../mail/mail-ops.c:102
-msgid "Filtering Folder"
-msgstr "Filtrujem priečinok"
+#: ../mail/mail-ops.c:105
+#, fuzzy
+msgid "Filtering Selected Messages"
+msgstr "Skryť zvol_ené správy"
 
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "Prijímam poštu"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../mail/mail-ops.c:566
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepodarilo sa použiť filtre pre odosielanú poštu : %s"
 
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13566,123 +14406,115 @@ msgstr ""
 "Nepodarilo sa pridať do %s: %s\n"
 "Namiesto toho sa pridá do priečinka `Odoslané'."
 
-#: ../mail/mail-ops.c:621
+#: ../mail/mail-ops.c:624
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nepodarilo sa pridať do lokálneho priečinku \"Odoslené\": %s"
 
-#: ../mail/mail-ops.c:733
+#: ../mail/mail-ops.c:736
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posielam správu %d z %d"
 
-#: ../mail/mail-ops.c:758
+#: ../mail/mail-ops.c:761
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nepodarilo sa dekódovať správu."
 
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
-msgid "Cancelled."
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#, fuzzy
+msgid "Canceled."
 msgstr "Zrušené."
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "Dokončené."
 
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "Ukladám správu do priečinku"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:947
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:947
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1170
 msgid "Forwarded messages"
 msgstr "Správy predané ďalej"
 
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1213
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram priečinok %s"
 
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1285
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1363
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1457
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1523
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1578
 msgid "Refreshing folder"
 msgstr "Aktualizujem priečinok"
 
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1662
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vyprázdňujem kôš v '%s'"
 
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1663
 msgid "Local Folders"
 msgstr "Lokálne priečinky"
 
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1746
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: ../mail/mail-ops.c:1853
+#: ../mail/mail-ops.c:1856
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Získavam %d správ"
 msgstr[1] "Získavam %d správ"
 
-#: ../mail/mail-ops.c:1939
+#: ../mail/mail-ops.c:1942
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Ukladám %d správ"
 msgstr[1] "Ukladám %d správ"
 
-#: ../mail/mail-ops.c:1989
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"Nepodarilo sa vytvoriť výstupný súbor: %s\n"
-" %s"
-
-#: ../mail/mail-ops.c:2017
+#: ../mail/mail-ops.c:2013
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13691,11 +14523,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2085
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: ../mail/mail-ops.c:2100
+#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13704,66 +14536,68 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2114
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2263
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2263
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
 
-#: ../mail/mail-ops.c:2376
+#: ../mail/mail-ops.c:2361
+#, fuzzy, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Ukladám priečinok '%s'"
+
+#: ../mail/mail-ops.c:2444
 msgid "Checking Service"
 msgstr "Kontrolujem službu"
 
-#: ../mail/mail-send-recv.c:158
-msgid "Cancelling..."
+#: ../mail/mail-send-recv.c:188
+#, fuzzy
+msgid "Canceling..."
 msgstr "Ruším..."
 
-#: ../mail/mail-send-recv.c:265
-#, c-format
-msgid "Server: %s, Type: %s"
-msgstr "Server: %s, Typ: %s"
-
-#: ../mail/mail-send-recv.c:267
-#, c-format
-msgid "Path: %s, Type: %s"
-msgstr "Cesta: %s, Typ: %s"
-
-#: ../mail/mail-send-recv.c:269
-#, c-format
-msgid "Type: %s"
-msgstr "Typ: %s"
-
-#: ../mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:391
 msgid "Send & Receive Mail"
 msgstr "Príjem a odoslanie pošty"
 
-#: ../mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:398
 msgid "Cancel _All"
 msgstr "Zrušiť _všetko"
 
-#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:506
 msgid "Updating..."
 msgstr "Obnovujem..."
 
-#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:506 ../mail/mail-send-recv.c:579
 msgid "Waiting..."
 msgstr "Čakám..."
 
-#: ../mail/mail-send-recv.c:699
+#: ../mail/mail-send-recv.c:788
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Kontrolujem novú poštu"
 
+#: ../mail/mail-session.c:202
+#, fuzzy, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Zadajte vaše heslo pre %s"
+
+#: ../mail/mail-session.c:204
+#, fuzzy
+msgid "Enter Passphrase"
+msgstr "Zadajte heslo"
+
 #: ../mail/mail-session.c:207
+#: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadajte vaše heslo pre %s"
@@ -13772,45 +14606,45 @@ msgstr "Zadajte vaše heslo pre %s"
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: ../mail/mail-session.c:244
+#: ../mail/mail-session.c:251
 msgid "User canceled operation."
 msgstr "Používateľ zrušil operáciu."
 
-#: ../mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:384
 msgid "Edit signature"
 msgstr "Upraviť podpis"
 
-#: ../mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:431
 msgid "Enter a name for this signature."
 msgstr "Zadajte meno pre tento podpis."
 
-#: ../mail/mail-signature-editor.c:415
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../mail/mail-signature-editor.c:434
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Name:"
 msgstr "Meno:"
 
-#: ../mail/mail-tools.c:116
+#: ../mail/mail-tools.c:120
 #, fuzzy, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr ""
 "Nie je možné vytvoriť priečinok %s:\n"
 "%s"
 
-#: ../mail/mail-tools.c:143
+#: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: ../mail/mail-tools.c:242
+#: ../mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Predaná správa - %s"
 
-#: ../mail/mail-tools.c:244
+#: ../mail/mail-tools.c:258
 msgid "Forwarded message"
 msgstr "Predaná správa"
 
-#: ../mail/mail-tools.c:284
+#: ../mail/mail-tools.c:298
 #, fuzzy, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Otváram priečinok %s"
@@ -13843,103 +14677,127 @@ msgstr "Prehľadať pr_iečinky"
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
 msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+"A folder named &quot;{0}&quot; already exists. Please use a different name."
 msgstr "Priečinok \"%s\" už existuje. Prosím, zadajte iné meno."
 
 #: ../mail/mail.error.xml.h:2
+#, fuzzy
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgstr "Priečinok \"%s\" už existuje. Prosím, zadajte iné meno."
+
+#: ../mail/mail.error.xml.h:3
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"quit."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:7
+#, fuzzy
+msgid ""
+"A signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
+msgstr "Priečinok \"%s\" už existuje. Prosím, zadajte iné meno."
+
+#: ../mail/mail.error.xml.h:8
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:9
 #, fuzzy
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Naozaj chcete odstrániť tento účet?"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "Naozaj chcete odstrániť tento účet?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:11
+#, fuzzy
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr "Naozaj chcete odstrániť tento účet?"
+
+#: ../mail/mail.error.xml.h:12
 #, fuzzy
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Naozaj chcete upraviť všetkých %d správ?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:13
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "Trvalo odstrániť všetky zmazané správy zo všetkých priečinkov"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:14
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
 msgstr "Naozaj chcete otvoriť všetkých %d správ v samostatných oknách?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 #, fuzzy
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 #, fuzzy
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 #, fuzzy
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
+#, fuzzy
+msgid "Blank Signature"
+msgstr "_Podpisy"
+
+#: ../mail/mail.error.xml.h:22
 #, fuzzy
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr ""
 "Nie je možné odstrániť priečinok:\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:23
 #, fuzzy
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nie je možné skopírovať priečinok: %s"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:24
 #, fuzzy
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:25
 #, fuzzy
 msgid "Cannot create temporary save directory."
 msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:26
 #, fuzzy
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr ""
@@ -13947,198 +14805,235 @@ msgstr ""
 "%s\n"
 "Chyba: %s"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:27
 #, fuzzy
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr ""
 "Nie je možné odstrániť priečinok:\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:28
 #, fuzzy
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:29
 #, fuzzy
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "Priečinok `%s' neexistuje."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:30
 #, fuzzy
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nie je možné presunúť priečinok: %s"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:31
 #, fuzzy
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:32
 #, fuzzy
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:33
 #, fuzzy
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Nie je možné otvoriť správu"
 
-#: ../mail/mail.error.xml.h:31
+#: ../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 "
+"problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:35
 #, fuzzy
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nie je možné presunúť priečinok: %s"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:36
 #, fuzzy
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:37
 #, fuzzy
 msgid "Cannot save changes to account."
 msgstr "a jedna iná karta."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:38
 #, fuzzy
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Nie je možné vytvoriť priečinok %s: %s"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:39
 #, fuzzy
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr ""
 "Nie je možné uložiť do %s\n"
 "  %s"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:40
 #, fuzzy
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "_Pridať podpis"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:41
 msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
+"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:39
+#: ../mail/mail.error.xml.h:42
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:43
 #, fuzzy
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Odstrániť \"%s\""
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:44
 #, fuzzy
 msgid "Delete account?"
 msgstr "Odstrániť vybrané kontakty"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:45
+#, fuzzy
+msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+msgstr ""
+"Nie je možné odstrániť priečinok:\n"
+"%s"
+
+#: ../mail/mail.error.xml.h:46
+#, fuzzy
+msgid "Delete messages in Search Folder?"
+msgstr "Kopírovať vybrané správy do iného priečinka"
+
+#: ../mail/mail.error.xml.h:47
 #, fuzzy
-msgid "Discard changed?"
+msgid "Discard changes?"
 msgstr "_Zahodiť zmeny"
 
-#: ../mail/mail.error.xml.h:43
-msgid "Do you want the operation to be performed in the subfolders?"
+#: ../mail/mail.error.xml.h:48
+#, fuzzy
+msgid "Do not d_elete"
+msgstr "Obnoviť _zmazané"
+
+#: ../mail/mail.error.xml.h:49
+#, fuzzy
+msgid "Do not delete"
+msgstr "Obnoviť _zmazané"
+
+#: ../mail/mail.error.xml.h:50
+#, fuzzy
+msgid "Do not disable"
+msgstr "Zakázať"
+
+#: ../mail/mail.error.xml.h:51
+msgid "Do you want the operation to be performed also in the subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:53
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Chcete uložiť zmeny?"
+msgid "Do you want to mark all messages as read?"
+msgstr "Označí všetky viditeľné správy ako už prečítané"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:54
 #, fuzzy
-msgid "Don't delete"
-msgstr "Obnoviť _zmazané"
+msgid "Do you wish to save your changes?"
+msgstr "Chcete uložiť zmeny?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:55
 #, fuzzy
 msgid "Enter password."
 msgstr "Zadajte heslo"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:56
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:57
 #, fuzzy
 msgid "Error while performing operation."
 msgstr ""
 "Chyba pri vykonávaní operácie:\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:58
 #, fuzzy
 msgid "Error while {0}."
 msgstr ""
 "Chyba počas '%s':\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:59
 #, fuzzy
 msgid "File exists but cannot overwrite it."
 msgstr "Súbor existuje, prepísať ho?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:60
 #, fuzzy
 msgid "File exists but is not a regular file."
 msgstr "Súbor \"%s\" neexistuje alebo nie je normálny súbor."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:63
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:69
 #, fuzzy
 msgid "Invalid authentication"
 msgstr "Overenie"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14146,41 +15041,50 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:73
 #, fuzzy
 msgid "Mark all messages as read"
 msgstr "Označí všetky viditeľné správy ako už prečítané"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:74
 #, fuzzy
-msgid "Mark all messages as read in the selected folder"
+msgid "Mark all messages in this folder and subfolders as read?"
 msgstr "_Označiť správy ako prečítané po"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:75
 #, fuzzy
 msgid "Missing folder."
 msgstr "Odstraňujem priečinok %s"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:77
 #, fuzzy
 msgid "No sources selected."
 msgstr "Nebol vybraný žiadny server"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:78
+#, fuzzy
+msgid "Only on _Current Folder"
+msgstr "Ako priečinok odo_slaných"
+
+#: ../mail/mail.error.xml.h:79
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:80
 msgid "Please check your account settings and try again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:81
+msgid "Please enable the account or send using another account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:82
 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:70
+#: ../mail/mail.error.xml.h:83
 #, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
@@ -14191,50 +15095,68 @@ msgstr ""
 "Posielate správu formátovanú ako HTML, ale nasledujúci adresáti nechcú\n"
 "dostávať takto formátovanú poštu:\n"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:86
+#, fuzzy
+msgid "Please provide an unique name to identify this signature."
+msgstr "Zadajte meno pre tento podpis."
+
+#: ../mail/mail.error.xml.h:87
 #, fuzzy
 msgid "Please wait."
 msgstr "Prosím, čakajte"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:88
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:89
 msgid "Querying server"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:90
 #, fuzzy
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Požadované šifrovanie pre požadovaný spôsob overenia"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:91
 #, fuzzy
 msgid "Read receipt requested."
 msgstr "Š_týl odpovede:"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:92
 #, fuzzy
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Naozaj odstrániť priečinok \"%s\"?"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:94
 #, fuzzy
 msgid "Send Receipt"
 msgstr "Správa o prečítaní"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:95
+#, fuzzy
+msgid "Signature Already Exists"
+msgstr "Certifikát už existuje"
+
+#: ../mail/mail.error.xml.h:96
+msgid "Synchronize"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:97
+msgid "Synchronize folders locally for offline usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:98
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14244,7 +15166,7 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:102
 #, fuzzy
 msgid ""
 "The following Search Folder(s):\n"
@@ -14258,7 +15180,7 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:107
 #, fuzzy
 msgid ""
 "The following filter rule(s):\n"
@@ -14272,37 +15194,35 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: ../mail/mail.error.xml.h:95
-msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
-"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:112
 msgid "The script file must exist and be executable."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:113
 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:100
+#: ../mail/mail.error.xml.h:115
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:116
 msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+"This message cannot be sent because you have not specified any recipients"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:117
 #, fuzzy
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný SMTP serverom %s."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:118
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -14310,163 +15230,178 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:119
+#, fuzzy
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr "_Označiť správy ako prečítané po"
+
+#: ../mail/mail.error.xml.h:120
 #, fuzzy
 msgid "Unable to connect to the GroupWise server."
 msgstr "Nepodarilo sa pripojiť k serveru LDAP"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:121
 #, fuzzy
 msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 "Nei je možné otvoriť priečinok na koncepty pre tento účet.\n"
 "Chcete použiť štandardný priečinok na koncepty?"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:122
 #, fuzzy
 msgid "Unable to read license file."
 msgstr ""
 "Nepodarilo sa hľadať v súbore: %s\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:123
 #, fuzzy
 msgid "Use _Default"
 msgstr "Štandard"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:124
 #, fuzzy
 msgid "Use default drafts folder?"
 msgstr "Otváram štandardný priečinok úloh"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:125
+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:128
 msgid "You have not filled in all of the required information."
 msgstr "Nevyplnili ste všetky povinné informácie."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:129
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Máte neodoslané správy. Chcete skončiť aj tak?"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:130
 msgid "You may not create two accounts with the same name."
 msgstr "Nemôžete vytvoriť dva účty s rovnakým menom."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:131
 #, fuzzy
 msgid "You must name this Search Folder."
 msgstr "Musíte tento vpriečinok pomenovať."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:132
 msgid "You must specify a folder."
 msgstr "Musíte zadať meno priečinku."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:133
 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:115
+#: ../mail/mail.error.xml.h:135
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:116
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:136
 msgid "_Append"
 msgstr "_Pripojiť"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:137
 msgid "_Discard changes"
 msgstr "_Zahodiť zmeny"
 
-#: ../mail/mail.error.xml.h:119
-#, fuzzy
-msgid "_Empty Trash"
-msgstr "Vyprázdniť _Odpadky"
+#: ../mail/mail.error.xml.h:138
+msgid "_Do not Synchronize"
+msgstr ""
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:140
 #, fuzzy
 msgid "_Expunge"
 msgstr "_Vyčistiť"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:141
 msgid "_Open Messages"
 msgstr "_Otvoriť správy"
 
-#: ../mail/message-list.c:996
+#: ../mail/mail.error.xml.h:144
+#, fuzzy
+msgid "on Current Folder and _Subfolders"
+msgstr "Vytvoriť nový priečinok"
+
+#: ../mail/message-list.c:1024
 msgid "Unseen"
 msgstr "Nevidené"
 
-#: ../mail/message-list.c:997
+#: ../mail/message-list.c:1025
 msgid "Seen"
 msgstr "Videné"
 
-#: ../mail/message-list.c:998
+#: ../mail/message-list.c:1026
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: ../mail/message-list.c:999
+#: ../mail/message-list.c:1027
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
 
-#: ../mail/message-list.c:1000
+#: ../mail/message-list.c:1028
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: ../mail/message-list.c:1004
+#: ../mail/message-list.c:1032
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1033
 msgid "Lower"
 msgstr "Nižšia"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1037
 msgid "Higher"
 msgstr "Vyššia"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1038
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1515 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
-#: ../widgets/table/e-cell-date.c:72
+#: ../mail/message-list.c:1522 ../plugins/itip-formatter/itip-view.c:203
+#: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1531 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %l:%M %p"
 
-#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1543 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1551 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1553 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2042
-msgid "Message List"
-msgstr "Zoznam správ"
+#: ../mail/message-list.c:2310 ../mail/message-list.etspec.h:9
+#, fuzzy
+msgid "Messages"
+msgstr "_Správy"
 
-#: ../mail/message-list.c:3387
+#: ../mail/message-list.c:3752
 msgid "Generating message list"
 msgstr "Generujem zoznam správ"
 
@@ -14486,51 +15421,53 @@ msgstr "Vyznačené"
 msgid "Follow Up Flag"
 msgstr "Značka Follow up"
 
-#: ../mail/message-list.etspec.h:8
-msgid "Original Location"
-msgstr "Pôvodný umiestnenie:"
-
-#: ../mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:10
 msgid "Received"
 msgstr "Prijaté"
 
-#: ../mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:14
+#, fuzzy
+msgid "Sent Messages"
+msgstr "_Otvoriť správy"
+
+#: ../mail/message-list.etspec.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Veľkosť"
 
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:75
 msgid "Call"
 msgstr "Volať"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
 msgstr "Nepreposielať"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:77
 msgid "Follow-Up"
 msgstr "Follow Up"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:78
 msgid "For Your Information"
 msgstr "Pre vašu informáciu"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:80
 msgid "No Response Necessary"
 msgstr "Odpoveď nie je nutná"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Odpovedať všetkým"
 
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
 msgid "Review"
 msgstr "Revízia"
 
@@ -14559,6 +15496,68 @@ msgstr "Predmet obsahuje"
 msgid "Subject or Sender contains"
 msgstr "Predmet obsahuje"
 
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+#, fuzzy
+msgid "Local Address Books"
+msgstr "Adresár"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr ""
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+#, fuzzy
+msgid "Enable attachment reminder plugin"
+msgstr "Povoliť alebo zakázať zásuvné moduly"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:453
+msgid "Keywords"
+msgstr ""
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:502
+#, fuzzy
+msgid "Attachment Reminder Preferences"
+msgstr "Vlastnosti prílohy"
+
+#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
+#, fuzzy
+msgid "Remind _missing attachments"
+msgstr "Ukladám prílohu"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#, fuzzy
+msgid "Attachment Reminder"
+msgstr "Príloha"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#, fuzzy
+msgid "Message has no attachments"
+msgstr "Uložiť všetky prílohy"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#, fuzzy
+msgid "_Continue Editing"
+msgstr "Pokračovať"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -14569,42 +15568,136 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
+#: ../plugins/backup-restore/backup-restore.c:96
+msgid "Select name of the Evolution backup file"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:120
 msgid "_Restart Evolution after backup"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
+#: ../plugins/backup-restore/backup-restore.c:139
+msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:163
 msgid "_Restart Evolution after restore"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup-restore.c:236
+msgid "Restore from backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:238
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. \n"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:244
+#, fuzzy
+msgid "_Restore Evolution from the backup file"
+msgstr "Import LDIF do Evolution"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+msgid "Please select an Evolution Archive to restore:"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:254
+#, fuzzy
+msgid "Choose a file to restore"
+msgstr "Vyberte súbor"
+
+#: ../plugins/backup-restore/backup.c:40
 #, fuzzy
 msgid "Backup Evolution directory"
 msgstr "Chyba Evolution"
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:42
 #, fuzzy
 msgid "Restore Evolution directory"
 msgstr "Import LDIF do Evolution"
 
-#: ../plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:44
 #, fuzzy
-msgid "Check Evolution archive"
+msgid "Check Evolution Backup"
 msgstr "Sada groupvérových nástrojov Evolution"
 
-#: ../plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:46
 #, fuzzy
 msgid "Restart Evolution"
 msgstr "Nie je možné inicializovať shell Ximian Evolution."
 
+#: ../plugins/backup-restore/backup.c:48
+msgid "With Graphical User Interface"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:107
+#, fuzzy
+msgid "Shutting down Evolution"
+msgstr "Vypínam %s (%s)\n"
+
+#: ../plugins/backup-restore/backup.c:72
+#, fuzzy
+msgid "Backing Evolution accounts and settings"
+msgstr "Zmeniť nastavenie Evolution"
+
+#: ../plugins/backup-restore/backup.c:77
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:87
+#, fuzzy
+msgid "Backup complete"
+msgstr "Aktualizácia dokončená\n"
+
+#: ../plugins/backup-restore/backup.c:92
+#: ../plugins/backup-restore/backup.c:133
+#, fuzzy
+msgid "Restarting Evolution"
+msgstr "Nie je možné inicializovať shell Ximian Evolution."
+
+#: ../plugins/backup-restore/backup.c:111
+#, fuzzy
+msgid "Backup current Evolution data"
+msgstr "Chyba Evolution"
+
+#: ../plugins/backup-restore/backup.c:116
+msgid "Extracting files from backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:122
+#, fuzzy
+msgid "Loading Evolution settings"
+msgstr "Zmeniť nastavenie Evolution"
+
+#: ../plugins/backup-restore/backup.c:126
+msgid "Removing temporary backup files"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:244
+#, fuzzy, c-format
+msgid "Backing up to the folder %s"
+msgstr "Nastavujem vpriečinok: '%s'"
+
+#: ../plugins/backup-restore/backup.c:249
+#, fuzzy, c-format
+msgid "Restoring from the folder %s"
+msgstr "Odstraňujem priečinok %s"
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:264
+#, fuzzy
+msgid "Evolution Backup"
+msgstr "Pošta Evolution"
+
+#: ../plugins/backup-restore/backup.c:264
+#, fuzzy
+msgid "Evolution Restore"
+msgstr "Test Evolution"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 #, fuzzy
 msgid "A plugin for backing up and restore Evolution data and settings."
@@ -14616,66 +15709,157 @@ msgstr "Zmeniť nastavenie Evolution"
 msgid "Backup and restore plugin"
 msgstr "Zmeniť nastavenie Evolution"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup Settings..."
-msgstr "Nastavenia zálohovania..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+#, fuzzy
+msgid "Are you sure you want to close Evolution?"
+msgstr "Naozaj chcete odstrániť tento účet?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#, fuzzy
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding.  If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+msgid "Invalid Evolution backup file"
+msgstr "Pošta Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#, fuzzy
+msgid "Please select a valid backup file to restore."
+msgstr "Prosím, vyberte server."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is "
+"not running. Please make sure that you close all your unsaved windows before "
+"you proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 #, fuzzy
 msgid "Backup and restore Evolution data and settings"
 msgstr "Zmeniť nastavenie Evolution"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "Restore Settings..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#, fuzzy
+msgid "R_estore Settings..."
 msgstr "Obnoviť nastavenia..."
 
-#: ../plugins/bbdb/bbdb.c:404
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#, fuzzy
+msgid "_Backup Settings..."
+msgstr "Nastavenia zálohovania..."
+
+#: ../plugins/bbdb/bbdb.c:533 ../plugins/bbdb/bbdb.c:542
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatické kontakty"
 
-#: ../plugins/bbdb/bbdb.c:413
-#, fuzzy
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "Zobrazené správy:"
-
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:426
+#: ../plugins/bbdb/bbdb.c:557
 msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+"_Automatically create entries in the addressbook when responding to messages"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:444
+#: ../plugins/bbdb/bbdb.c:563
 #, fuzzy
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "Odoslané a koncepty"
+msgid "Select Address book for Automatic Contacts"
+msgstr "Automatické kontakty"
+
+#: ../plugins/bbdb/bbdb.c:578
+#, fuzzy
+msgid "Instant Messaging Contacts"
+msgstr "<b>Priama komunikácia</b>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:457
+#: ../plugins/bbdb/bbdb.c:593
 msgid ""
-"Periodically synchronize contact information and images from my _instant "
-"messenger"
+"Periodically synchronize contact information and images from Pidgin buddy "
+"list"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:599
+msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:464
+#: ../plugins/bbdb/bbdb.c:610
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-#, fuzzy
-msgid "Automatic contacts"
-msgstr "Pridať do kontaktov"
-
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
-"reply to mails. Also fills in IM contact information from your buddy lists."
+"reply to messages. Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr "BBDB"
 
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#, fuzzy
+msgid "Convert message text to _Unicode"
+msgstr "Uložiť správu do textového súboru"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+#, fuzzy
+msgid "Convert mail messages to Unicode"
+msgstr "Poslať správu do verejného priečinku"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+#, fuzzy
+msgid "Bogofilter Options"
+msgstr "Spustiť akcie"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Filters junk messages using Bogofilter."
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#, fuzzy
+msgid "CalDAV"
+msgstr "Volať"
+
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:135
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/google-account-setup/google-source.c:336
+msgid "Use _SSL"
+msgstr ""
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+#, fuzzy
+msgid "CalDAV Calendar sources"
+msgstr "Načítavam kalendár"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+#, fuzzy
+msgid "CalDAV sources"
+msgstr "Zdroje"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 #, fuzzy
 msgid "Local Calendars"
@@ -14685,6 +15869,23 @@ msgstr "Načítavam kalendár"
 msgid "Provides core functionality for local calendars."
 msgstr ""
 
+#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-weather/calendar-weather.c:546
+#: ../plugins/google-account-setup/google-source.c:360
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Aktualizovať"
+
+#: ../plugins/calendar-http/calendar-http.c:341
+#, fuzzy
+msgid "_Secure connection"
+msgstr "Použiť _bezpečné pripojenie (SSL):"
+
+#: ../plugins/calendar-http/calendar-http.c:406
+#, fuzzy
+msgid "Userna_me:"
+msgstr "Po_užívateľ:"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP kalendáre"
@@ -14727,16 +15928,16 @@ msgstr "Počasie: búrky"
 msgid "Select a location"
 msgstr "Vyberte akciu"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:652
 #, fuzzy
 msgid "_Units:"
 msgstr "Unst"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
 msgid "Metric (Celsius, cm, etc)"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr ""
 
@@ -14755,21 +15956,16 @@ msgid ""
 "things to the clipboard."
 msgstr ""
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-#, fuzzy
-msgid "Copy _Email Address"
-msgstr "_E-mailová adresa:"
-
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 #, fuzzy
 msgid "Copy tool"
 msgstr "Kopírovať do priečinku"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr ""
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
@@ -14787,12 +15983,28 @@ msgstr "Š_týl odpovede:"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr ""
 
-#: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:512
+msgid "Evolution"
+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 folder"
 msgstr "Otváram štandardný priečinok úloh"
 
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+#, fuzzy
+msgid "Default Sources"
+msgstr "Š_tandardné"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid ""
+"Provides functionality for marking a calendar or an addressbook as the "
+"default one."
+msgstr ""
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 #, fuzzy
 msgid "Open Other User's Folder"
@@ -14836,11 +16048,11 @@ msgid ""
 "password authentication."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:251
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "Mimo kancelárie"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
 #, fuzzy
 msgid ""
 "The message specified below will be automatically sent to \n"
@@ -14849,77 +16061,98 @@ msgstr ""
 "<small>Dole zadaná správa sa automaticky pošle každej osobe,\n"
 "ktorá vám pošle správu, v prípade, že ste mimo kanceláriu.</small>"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
 msgid "I am out of the office"
 msgstr "Som mimo kanceláriu"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am in the office"
 msgstr "Som v kancelárii"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #, fuzzy
 msgid "Change the password for Exchange account"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Manage the delegate settings for Exchange account"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
 #, fuzzy
-msgid "Delegation Assitant"
+msgid "Delegation Assistant"
 msgstr "Evolution Asistent pre nastavenie"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 #, fuzzy
 msgid "Miscelleneous"
 msgstr "<b>Rôzne</b>"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 #, fuzzy
 msgid "View the size of all Exchange folders"
 msgstr "pre všetky lokálne priečinky"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 #, fuzzy
 msgid "Folders Size"
 msgstr "vPriečinky"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
-msgid "_OWA Url:"
+#: ../plugins/exchange-operations/exchange-account-setup.c:618
+#, fuzzy
+msgid "_OWA URL:"
 msgstr "_OWA Url:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
+#: ../plugins/exchange-operations/exchange-account-setup.c:644
 #, fuzzy
 msgid "A_uthenticate"
 msgstr "Overenie zlyhalo"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#: ../plugins/exchange-operations/exchange-account-setup.c:837
 #, fuzzy
 msgid "Authentication Type"
 msgstr "Overenie totožnosti"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:851
 #, fuzzy
 msgid "Ch_eck for Supported Types"
 msgstr "Kontrolovať _podporované typy"
 
+#: ../plugins/exchange-operations/exchange-account-setup.c:957
+#: ../plugins/exchange-operations/exchange-contacts.c:212
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%ld KB"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:959
+#: ../plugins/exchange-operations/exchange-contacts.c:214
+#, fuzzy
+msgid "0 KB"
+msgstr "%ld KB"
+
+#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-contacts.c:165
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+msgstr ""
+
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
@@ -14933,266 +16166,453 @@ msgstr ""
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Confirm Password:"
 msgstr "Potvrdiť heslo:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Current Password:"
 msgstr "Aktuálne heslo:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "New Password:"
 msgstr "Nové heslo:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "Your current password has expired. Please change your password now."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr ""
+
+#. Custom
+#: ../plugins/exchange-operations/exchange-delegates-user.c:159
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../widgets/table/e-table-header-item.c:1560
 #, fuzzy
 msgid "Custom"
 msgstr "Vlastný pohľad"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates-user.c:189
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr "Autor (čítať, vytvoriť)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:197
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:247
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#, fuzzy
+msgid "Delegate Permissions"
+msgstr "Delegované"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:258
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, fuzzy, c-format
 msgid "Permissions for %s"
 msgstr "Prístup zamietnutý"
 
+#. To translators: This is a part of the message to be sent to the delegatee
+#. summarizing the permissions assigned to him.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+msgid ""
+"This message was sent automatically by Evolution to inform you that you have "
+"been designated as a delegate. You can now send messages on my behalf."
+msgstr ""
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+msgid "You have been given the following permissions on my folders:"
+msgstr ""
+
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#, fuzzy
+msgid "You are also permitted to see my private items."
+msgstr "Vytvorí novú úlohu"
+
+#. To translators: This message is included if the delegatee has not been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:378
+msgid "However you are not permitted to see my private items."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:410
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr ""
+
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 #, fuzzy
 msgid "Delegate To"
 msgstr "Delegovať na:"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:586
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:679
+#: ../plugins/exchange-operations/exchange-delegates.c:704
 #, fuzzy
 msgid "Could not access Active Directory"
 msgstr ""
 "Nie je možné vytvoriť priečinok %s:\n"
 "%s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:694
+#: ../plugins/exchange-operations/exchange-delegates.c:716
 msgid "Could not find self in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:707
+#: ../plugins/exchange-operations/exchange-delegates.c:729
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:719
+#: ../plugins/exchange-operations/exchange-delegates.c:741
 #, fuzzy, c-format
 msgid "Could not remove delegate %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:779
+#: ../plugins/exchange-operations/exchange-delegates.c:801
 #, fuzzy
 msgid "Could not update list of delegates."
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:819
 #, fuzzy, c-format
 msgid "Could not add delegate %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:965
+#: ../plugins/exchange-operations/exchange-delegates.c:987
 #, fuzzy
 msgid "Error reading delegates list."
 msgstr "Chyba pri pridávaní zoznamu"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "Autor (čítať, vytvoriť)"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
 msgstr "K_alendár:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Co_ntacts:"
 msgstr "Ko_ntakty:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-#, fuzzy
-msgid "Delegate Permissions"
-msgstr "Delegované"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 #, fuzzy
 msgid "Delegates"
 msgstr "Delegované"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Editor (read, create, edit)"
-msgstr ""
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 #, fuzzy
 msgid "Permissions for"
 msgstr "Prístup zamietnutý"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-msgid "Reviewer (read-only)"
-msgstr ""
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 #, fuzzy
 msgid "_Delegate can see private items"
 msgstr "Vytvorí novú úlohu"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
 msgid "_Inbox:"
 msgstr "_Doručená pošta"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+#, fuzzy
+msgid "_Summarize permissions"
+msgstr "Delegované"
+
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "Ú_lohy:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:58
+#: ../plugins/exchange-operations/exchange-folder-permission.c:61
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 #, fuzzy
 msgid "Permissions..."
 msgstr "Prístup zamietnutý"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
 #, fuzzy
 msgid "Folder Name"
 msgstr "_Meno priečinku:"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
 #, fuzzy
 msgid "Folder Size"
 msgstr "vPriečinky"
 
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr ""
+
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 #, fuzzy
 msgid "Exchange Folder Tree"
 msgstr "Poštové filtre"
 
-#: ../plugins/exchange-operations/exchange-folder.c:62
-#: ../plugins/exchange-operations/exchange-folder.c:223
-#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:66
+#: ../plugins/exchange-operations/exchange-folder.c:235
+#: ../plugins/exchange-operations/exchange-folder.c:245
 #, fuzzy
 msgid "Unsubscribe Folder..."
 msgstr "_Prihlásiť priečinky..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:465
 #: ../plugins/exchange-operations/exchange-folder.c:520
 #, fuzzy, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Odhlasujem sa z priečinku \"%s\""
 
-#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:477
 #: ../plugins/exchange-operations/exchange-folder.c:532
 #, fuzzy, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Odhlasujem sa z priečinku \"%s\""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+"<b>Momentálne je váš stav \"Mimo kanceláre\".</b>\n"
+"\n"
+"Chcete ho zmeniť na \"V kancelárii\"?"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>Správa \"Mimo kancelárie\":</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>Stav:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+"<small>Dole zadaná správa sa automaticky pošle každej osobe,\n"
+"ktorá vám pošle správu, v prípade, že ste mimo kanceláriu.</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "Momentálne som v kancelárii"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "Momentálne som mimo kanceláriu"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "Nie, nemeniť stav"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "Sprievodca pre nastavenie \"Mimo kancelárie\""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "Áno, zmeniť stav"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+#, fuzzy
+msgid "_Change Password"
+msgstr "Zmeniť heslo"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 #, fuzzy
 msgid "(Permission denied.)"
 msgstr "Prístup zamietnutý"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 #, fuzzy
 msgid "Add User:"
 msgstr "Po_užívateľ:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 #, fuzzy
 msgid "Add User"
 msgstr "_Pridať"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Permissions</b>"
 msgstr "<b>Voľby</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 #, fuzzy
 msgid "Cannot Delete"
 msgstr "Zadajte na koho delegovať"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 #, fuzzy
 msgid "Cannot Edit"
 msgstr "Editor kontaktov"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 #, fuzzy
 msgid "Create items"
 msgstr "Vytvoriť pr_avidlo"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 #, fuzzy
 msgid "Create subfolders"
 msgstr "Vytvoriť nový priečinok"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 #, fuzzy
 msgid "Delete Any Items"
 msgstr "Delegované"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 #, fuzzy
 msgid "Delete Own Items"
 msgstr "Delegované"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 #, fuzzy
 msgid "Edit Any Items"
 msgstr "Upraviť schôdzku"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Own Items"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 #, fuzzy
 msgid "Folder contact"
 msgstr "%d kontaktov"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 #, fuzzy
 msgid "Folder owner"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 #, fuzzy
 msgid "Folder visible"
 msgstr "vPriečinky"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 #, fuzzy
 msgid "Read items"
 msgstr "Správa o prečítaní"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 #, fuzzy
 msgid "Role: "
 msgstr "Rola"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
+#, fuzzy
+msgid "<b>Message Settings</b>"
+msgstr "Informácie o kalendári"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
+#, fuzzy
+msgid "<b>Tracking Options</b>"
+msgstr "Informácie o kalendári"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
+msgid "Exchange - Send Options"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
+#, fuzzy
+msgid "I_mportance: "
+msgstr "Dôležité"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
+msgid ""
+"Normal\n"
+"High\n"
+"Low"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
+#, fuzzy
+msgid ""
+"Normal\n"
+"Personal\n"
+"Private\n"
+"Confidential"
+msgstr ""
+"Verejné\n"
+"Súkromné\n"
+"Tajné\n"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
+#, fuzzy
+msgid "Request a _delivery receipt for this message"
+msgstr "Požadovať správu o prečítaní pre všetky odoslené správy"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
+#, fuzzy
+msgid "Request a _read receipt for this message"
+msgstr "Požadovať správu o prečítaní pre všetky odoslené správy"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+#, fuzzy
+msgid "Send as Delegate"
+msgstr "Zadajte na koho delegovať"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
+#, fuzzy
+msgid "_Sensitivity: "
+msgstr "Rozlišovať veľkosť písmen"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+#, fuzzy
+msgid "_User"
+msgstr "Po_užívateľ:"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
+msgid "button-user"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:143
 #, fuzzy
 msgid "Select User"
 msgstr "Vybrať priečinok"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#: ../plugins/exchange-operations/exchange-user-dialog.c:181
 #, fuzzy
-msgid "Addressbook..."
+msgid "Address Book..."
 msgstr "Adresár"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
@@ -15204,6 +16624,17 @@ msgstr ""
 msgid "Subscribe to Other User's Calendar"
 msgstr "Priečinok pre _odoslané správy:"
 
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+#, fuzzy
+msgid "Exchange Operations"
+msgstr "Spustiť akcie"
+
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
 msgstr ""
@@ -15214,199 +16645,218 @@ msgid "Cannot display folders."
 msgstr "Vytvoriť nové okno pre tento priečinok"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid ""
-"Changes to Exchange account configuration will take place after you quit and "
-"restart Evolution."
+#, fuzzy
+msgid "Cannot perform the operation."
 msgstr ""
+"Chyba pri vykonávaní operácie:\n"
+"%s"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+msgid ""
+"Changes to options for Exchange account \"{0}\" will only take effect after "
+"restarting Evolution."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 #, fuzzy
 msgid "Could not authenticate to server."
 msgstr "Nepodarilo sa overiť totožnosť na LDAP serveri"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 #, fuzzy
 msgid "Could not change password."
 msgstr "Zmeniť heslo"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#, fuzzy
+msgid "Could not connect to Exchange server."
+msgstr "Nie je možné vytvoriť rúru: %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 #, fuzzy
 msgid "Could not connect to server {0}."
 msgstr "Nie je možné vytvoriť rúru: %s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 #, fuzzy
 msgid "Could not determine folder permissions for delegates."
 msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not find Exchange Web Storage System."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 #, fuzzy
 msgid "Could not locate server {0}."
 msgstr "Nie je možné vytvoriť rúru: %s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 #, fuzzy
 msgid "Could not make {0} a delegate"
 msgstr "Nie je možné vytvoriť rúru: %s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 #, fuzzy
 msgid "Could not read folder permissions"
 msgstr "Nepodarilo sa odstrániť adresár."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 #, fuzzy
 msgid "Could not read folder permissions."
 msgstr "Nepodarilo sa odstrániť adresár."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 #, fuzzy
 msgid "Could not read out-of-office state"
 msgstr "Nie je možné vytvoriť rúru: %s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 #, fuzzy
 msgid "Could not update folder permissions."
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 #, fuzzy
 msgid "Could not update out-of-office state"
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Exchange Account is offline."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Exchange Connector access error."
-msgstr ""
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
-"to be disabled or blocked.  (This is usually \n"
-"unintentional.)  Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
 "need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
 "\n"
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 #, fuzzy
 msgid "Failed to update delegates:"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Certifikát už existuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 #, fuzzy
 msgid "Folder does not exist"
 msgstr "neexistuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #, fuzzy
 msgid "Folder offline"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../shell/e-shell.c:1283
 msgid "Generic error"
 msgstr "Všeobecná chyba"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+msgid "Global Catalog Server is not reachable"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Mailbox for {0} is not on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the URL is correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No Global Catalog server configured for this account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No mailbox for user {0} on {1}."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 #, fuzzy
 msgid "No such user {0}"
 msgstr "Taký zdroj neexistuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "Password successfully changed."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+msgid "Please make sure the Global Catalog Server name is correct."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 #, fuzzy
-msgid "Please restart Evolution"
+msgid "Please restart Evolution for changes to take effect"
 msgstr "Nie je možné inicializovať shell Ximian Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 #, fuzzy
 msgid "Please select a user."
 msgstr "Prosím, vyberte server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Server rejected password because it is too weak."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15415,90 +16865,96 @@ msgid ""
 "Or you might have just typed your password wrong."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Try again with a different password."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 #, fuzzy
 msgid "Unable to add user to access control list:"
 msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 #, fuzzy
 msgid "Unable to edit delegates."
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 #, fuzzy
 msgid "Unknown error looking up {0}"
 msgstr "Neznáma chyba"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 #, fuzzy
 msgid "Unknown error."
 msgstr "Neznáma chyba"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 #, fuzzy
 msgid "Unknown type"
 msgstr "Neznámy"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Používateľ zrušil operáciu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "You are nearing your quota available for storing mails on this server."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You cannot make yourself your own delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "You have exceeded your quota for storing mails on this server."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You may only configure a single Exchange account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
-"mails."
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
-"clear up some space by deleting some mails."
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid "Your password has expired."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0} cannot be added to an access control list"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 #, fuzzy
 msgid "{0} is already a delegate"
 msgstr "%s konferencia"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 #, fuzzy
 msgid "{0} is already in the list"
 msgstr "%s konferencia"
@@ -15512,10 +16968,52 @@ msgstr ""
 msgid "Check folder permissions"
 msgstr "Delegované"
 
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid ""
+"A plugin for using an external editor as the composer. You can send only "
+"plain-text mails."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+#, fuzzy
+msgid "External Editor"
+msgstr "Editor hľadania"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
+#, fuzzy
+msgid "Compose in External Editor"
+msgstr "Editor kontaktov"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
+msgid "Compose mails using an external editor"
+msgstr ""
+
+#: ../plugins/face/face.c:57
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr ""
+
+#: ../plugins/face/face.c:67
+msgid "PNG files"
+msgstr ""
+
+#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#, fuzzy
+msgid "_Face"
+msgstr "Francúzsko"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid ""
+"Attach Face header to outgoing messages. First time the user needs to "
+"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
+"faces This will be used in messages that are sent further."
 msgstr ""
 
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#, fuzzy
+msgid "Face"
+msgstr "Francúzsko"
+
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -15530,34 +17028,82 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "_Prihlásiť priečinky..."
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "O_dhlásiť"
+
+#: ../plugins/google-account-setup/google-source.c:71
+#: ../plugins/google-account-setup/google-source.c:78
+#, fuzzy
+msgid "Google"
+msgstr "prepnúť"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "A plugin to setup google calendar."
+msgstr ""
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+#, fuzzy
+msgid "Google sources"
+msgstr "Zdroje"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
 #, fuzzy
 msgid "Checklist"
 msgstr "Hustý opar"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+msgid "A plugin to setup groupwise calendar and contacts sources."
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 #, fuzzy
 msgid "Groupwise Account Setup"
 msgstr "Skupina"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/install-shared.c:215
+#, c-format
+msgid ""
+"The user '%s' has shared a folder with you\n"
+"\n"
+"Message from '%s'\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Click 'Forward' to install the shared folder\n"
+"\n"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:220
+#, fuzzy
+msgid "Install the shared folder"
+msgstr "pre všetky aktívne vzdialené priečinky"
+
+#: ../plugins/groupwise-features/install-shared.c:222
+msgid "Shared Folder Installation"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:78
 #, fuzzy
 msgid "Junk Settings"
 msgstr "Nastavenie"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
+#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
 #, fuzzy
-msgid "<b>Junk Mail Settings</b>"
-msgstr "Informácie o kalendári"
+msgid "Junk Mail Settings"
+msgstr "Nastavenie"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:115
 #, fuzzy
 msgid "Junk Mail Settings..."
 msgstr "Nastavenia zálohovania..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 #, fuzzy
-msgid "<b>Junk List :</b>"
+msgid "<b>Junk List:</b>"
 msgstr "Informácie o kalendári"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
@@ -15565,11 +17111,6 @@ msgstr "Informácie o kalendári"
 msgid "Email:"
 msgstr "E-mail"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-#, fuzzy
-msgid "Junk Mail Settings"
-msgstr "Nastavenie"
-
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "_Disable"
@@ -15585,12 +17126,22 @@ msgstr "Povoliť"
 msgid "_Junk List"
 msgstr "Jún"
 
+#: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message retracted successfully"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:60
+#, fuzzy
+msgid "Retract Mail"
+msgstr "Prijímam poštu"
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr ""
 
@@ -15608,41 +17159,43 @@ msgstr "Skupina"
 msgid "Accept Tentatively"
 msgstr "Predbežný"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
-msgid "<b>Users :</b>"
+#: ../plugins/groupwise-features/properties.glade.h:1
+#, fuzzy
+msgid "<b>Users:</b>"
 msgstr "<b>Používatelia :</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../widgets/table/e-table-click-to-add.c:517
 msgid "Message"
 msgstr "Správa"
 
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Shared Folder Notification"
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:10
 msgid "_Contacts..."
 msgstr "_Kontakty..."
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:11
 #, fuzzy
-msgid "_Cutomize notification message"
+msgid "_Customize notification message"
 msgstr "Nie je možné vytvoriť rúru: %s"
 
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "_Nezdieľané"
 
-#: ../plugins/groupwise-features/properties.glade.h:15
-msgid "_Shared With ..."
+#: ../plugins/groupwise-features/properties.glade.h:14
+#, fuzzy
+msgid "_Shared With..."
 msgstr "_Zdieľané s..."
 
-#: ../plugins/groupwise-features/properties.glade.h:16
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
 msgstr "_Zdieľanie"
 
@@ -15684,7 +17237,7 @@ msgid "Subscribe to my _notifications"
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Prečítaná"
 
@@ -15696,13 +17249,6 @@ msgstr "_Zapísať"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../smime/gui/smime-ui.glade.h:49
-#: ../widgets/table/e-table-config-no-group.glade.h:20
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "dialog1"
-msgstr "dialog1"
-
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>Názov účtu</b>"
@@ -15711,474 +17257,936 @@ msgstr "<b>Názov účtu</b>"
 msgid "Proxy Login"
 msgstr "Prihlásenie k proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/proxy-login.c:220
+#: ../plugins/groupwise-features/proxy-login.c:262
+#: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sZadajte heslo pre %s (používateľ %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:484
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
+#. * feature by which one person can send/read mails/appointments using another person's identity
+#. * without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login.c:521
 msgid "_Proxy Login..."
 msgstr "_Prihlásenie k proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:672
+#: ../plugins/groupwise-features/proxy.c:701
+msgid "The Proxy tab will be available only when the account is online."
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy.c:706
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder.c:760
 msgid "Users"
 msgstr "Používatelia"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:323
 msgid "Enter the users and set permissions"
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "New _Shared Folder..."
 msgstr "Nový _zdieľaný priečinok..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:453
+#: ../plugins/groupwise-features/share-folder-common.c:450
 msgid "Sharing"
 msgstr "Zdieľanie"
 
-#: ../plugins/groupwise-features/status-track.c:235
+#: ../plugins/groupwise-features/share-folder.c:765
+#, fuzzy
+msgid "Add   "
+msgstr "_Pridať ->"
+
+#: ../plugins/groupwise-features/share-folder.c:771
+#, fuzzy
+msgid "Modify"
+msgstr "Zmenené"
+
+#: ../plugins/groupwise-features/status-track.c:105
+#, fuzzy
+msgid "Message Status"
+msgstr "Uložiť správu ako..."
+
+#. Subject
+#: ../plugins/groupwise-features/status-track.c:119
+#, fuzzy
+msgid "Subject:"
+msgstr "Predmet:"
+
+#: ../plugins/groupwise-features/status-track.c:133
+#, fuzzy
+msgid "From:"
+msgstr "Od:"
+
+#: ../plugins/groupwise-features/status-track.c:148
+#, fuzzy
+msgid "Creation date:"
+msgstr "Dátum dokončenia"
+
+#: ../plugins/groupwise-features/status-track.c:187
+#, fuzzy
+msgid "Recipient: "
+msgstr "Adresáti"
+
+#: ../plugins/groupwise-features/status-track.c:194
+#, fuzzy
+msgid "Delivered: "
+msgstr "_Doručené"
+
+#: ../plugins/groupwise-features/status-track.c:200
+#, fuzzy
+msgid "Opened: "
+msgstr "Otvoriť"
+
+#: ../plugins/groupwise-features/status-track.c:205
+#, fuzzy
+msgid "Accepted: "
+msgstr "Akceptované"
+
+#: ../plugins/groupwise-features/status-track.c:210
+#, fuzzy
+msgid "Deleted: "
+msgstr "Odstránené"
+
+#: ../plugins/groupwise-features/status-track.c:215
+#, fuzzy
+msgid "Declined: "
+msgstr "Odmietnuté"
+
+#: ../plugins/groupwise-features/status-track.c:220
+#, fuzzy
+msgid "Completed: "
+msgstr "Dokončený "
+
+#: ../plugins/groupwise-features/status-track.c:225
+#, fuzzy
+msgid "Undelivered: "
+msgstr "_Doručené"
+
+#: ../plugins/groupwise-features/status-track.c:249
 #, fuzzy
 msgid "Track Message Status..."
 msgstr "Uložiť správu ako..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr ""
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+#, fuzzy
+msgid "Hula Account Setup"
+msgstr "Skupina"
+
+#: ../plugins/imap-features/imap-headers.c:319
+#, fuzzy
+msgid "Custom Headers"
+msgstr "Vlastná _správa"
+
+#: ../plugins/imap-features/imap-headers.c:332
+#, fuzzy
+msgid "IMAP Headers"
+msgstr "Hlavička"
+
+#: ../plugins/imap-features/imap-headers.glade.h:1
+#, fuzzy
+msgid "<b>Custom Headers</b>"
+msgstr "<b>Začína:</b> "
+
+#: ../plugins/imap-features/imap-headers.glade.h:2
+#, fuzzy
+msgid "<b>IMAP Headers</b>"
+msgstr "<b>Začína:</b> "
+
+#: ../plugins/imap-features/imap-headers.glade.h:3
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:4
+#, fuzzy
+msgid "Fetch A_ll Headers"
+msgstr "Plná hlavička"
+
+#: ../plugins/imap-features/imap-headers.glade.h:5
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:7
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"The more headers you have the more time it will take to download."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.glade.h:9
+msgid ""
+"_Basic Headers - (Fastest) \n"
+"Use this if you do not have filters based on mailing lists"
+msgstr ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+msgid "A plugin for the features in the IMAP accounts."
+msgstr ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+#, fuzzy
+msgid "_Import to Calendar"
+msgstr "Kalendár mesiaca"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:88
+#, fuzzy
+msgid "_Import to Tasks"
+msgstr "Kon_vertovať na úlohu"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:206
+#, fuzzy
+msgid "Import ICS"
+msgstr "Importovať"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:233
+#, fuzzy
+msgid "Select Task List"
+msgstr "Zoznam úloh"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:237
+#, fuzzy
+msgid "Select Calendar"
+msgstr "Nová Kaledónia"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:267
+#: ../shell/e-shell-importer.c:703
+msgid "_Import"
+msgstr "_Importovať"
+
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+#, fuzzy
+msgid "Import to Calendar"
+msgstr "Kalendár mesiaca"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+#, fuzzy
+msgid "Imports ICS attachments to calendar."
+msgstr "Pridávaná príloha."
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid "Hardware Abstraction Layer not loaded"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+msgid ""
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+msgid "Search for an iPod failed"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+msgid ""
+"Evolution could not find an iPod to synchronize with. Either the iPod is not "
+"connected to the system or it is not powered on."
+msgstr ""
+
+#: ../plugins/ipod-sync/ical-format.c:133
+#: ../plugins/save-calendar/ical-format.c:190
+msgid "iCalendar format (.ics)"
+msgstr "Formát iCalendar (.ics)"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+#, fuzzy
+msgid "Synchronize to iPod"
+msgstr "Voľby _synchronizácie..."
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+#, fuzzy
+msgid "iPod Synchronization"
+msgstr "Voľby _synchronizácie..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:429
+#: ../plugins/itip-formatter/itip-formatter.c:550
+#, fuzzy, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "Prístup zamietnutý pri otváraní kalendára"
+
+#: ../plugins/itip-formatter/itip-formatter.c:570
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:596
+#, fuzzy, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Prístup zamietnutý pri otváraní kalendára"
+
+#: ../plugins/itip-formatter/itip-formatter.c:672
+#, fuzzy
+msgid "Unable to find any calendars"
+msgstr "Prístup zamietnutý pri otváraní kalendára"
+
+#: ../plugins/itip-formatter/itip-formatter.c:679
+#, fuzzy
+msgid "Unable to find this meeting in any calendar"
+msgstr "Prístup zamietnutý pri otváraní kalendára"
+
+#: ../plugins/itip-formatter/itip-formatter.c:683
+#, fuzzy
+msgid "Unable to find this task in any task list"
+msgstr ""
+"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
+"Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
+
+#: ../plugins/itip-formatter/itip-formatter.c:687
+msgid "Unable to find this memo in any memo list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:760
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:923
 #, fuzzy
 msgid "Unable to parse item"
 msgstr "Nie je možné získať správu z editora"
 
-#: ../plugins/itip-formatter/itip-formatter.c:780
+#: ../plugins/itip-formatter/itip-formatter.c:981
 #, fuzzy, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:993
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:997
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:1002
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:1007
 #, c-format
-msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:898
+#: ../plugins/itip-formatter/itip-formatter.c:1101
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:905
-msgid "Sent a cancellation notice to the delegate"
-msgstr ""
+#: ../plugins/itip-formatter/itip-formatter.c:1108
+#, fuzzy
+msgid "Sent a cancelation notice to the delegate"
+msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:907
+#: ../plugins/itip-formatter/itip-formatter.c:1110
 #, fuzzy
-msgid "Could not send the cancellation notice to the delegate"
+msgid "Could not send the cancelation notice to the delegate"
 msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:991
+#: ../plugins/itip-formatter/itip-formatter.c:1195
 #, fuzzy
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je platný!\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1222
 #, fuzzy, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1226
 #, fuzzy
 msgid "Attendee status updated"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1251
+#, fuzzy
+msgid "Meeting information sent"
+msgstr "Informácie o stretnutí"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1254
+#, fuzzy
+msgid "Task information sent"
+msgstr "Informácie o úlohe"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1257
+#, fuzzy
+msgid "Memo information sent"
+msgstr "Žiadna informácia"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1266
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1269
+msgid "Unable to send task information, the task does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1272
+msgid "Unable to send memo information, the memo does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1347
+#: ../plugins/itip-formatter/itip-formatter.c:1362
 #, fuzzy
 msgid "The calendar attached is not valid"
 msgstr "Uvedený typ priečinku nie je platný"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1363
 msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
+#: ../plugins/itip-formatter/itip-formatter.c:1398
+#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1498
 #, fuzzy
 msgid "The item in the calendar is not valid"
 msgstr "Ukážka kalendára pred tlačou"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1184
-#: ../plugins/itip-formatter/itip-formatter.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1399
+#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1499
 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:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1429
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1968
-msgid "Meetings and Tasks"
-msgstr "Stretnutia a úlohy"
+#: ../plugins/itip-formatter/itip-formatter.c:2122
+#, fuzzy
+msgid "This meeting recurs"
+msgstr "_Upraviť schôdzku"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2125
+#, fuzzy
+msgid "This task recurs"
+msgstr "_Upraviť schôdzku"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2128
+#, fuzzy
+msgid "This memo recurs"
+msgstr "_Upraviť schôdzku"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:2331
 msgid "_Delete message after acting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2001
+#: ../plugins/itip-formatter/itip-formatter.c:2341
+#: ../plugins/itip-formatter/itip-formatter.c:2373
 #, fuzzy
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "Zobrazené správy:"
+msgid "Conflict Search"
+msgstr "Konflikt v kontakte:"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2356
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr ""
-
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:239
 msgid "Today"
 msgstr "Dnes"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:189
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Dnes o %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Dnes o %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:202
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Dnes o %k:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Zajtra"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Zajtra o %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Zajtra o %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
-msgstr "Dnes o %k:%M"
+msgstr "Zajtra o %k:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Zajtra o %k:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:254
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:259
 msgid "%A %H:%M"
 msgstr "%A o %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %H:%M:%S"
 msgstr "%A o %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A o %k:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A o %k:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:276
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:282
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B o %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B o %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B o %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:295
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B o %k:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y o %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e. %B %Y o %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y o %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:319
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B  %Y o %k:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:525
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:356
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> poslal informácie o stretnutí."
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:358
 #, fuzzy, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> poslal informácie o stretnutí."
 
-#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:363
 #, fuzzy, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> zrušil stretnutie."
 
-#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:366
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> požaduje vašu účasť na stretnutí."
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:368
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> požaduje vašu účasť na stretnutí."
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:374
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> si praje byť pridaný na existujúce stretnutie."
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:376
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> si praje byť pridaný na existujúce stretnutie."
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:380
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr "<b>%s</b> si praje získať najnovšie informácie o úlohe."
+
+#: ../plugins/itip-formatter/itip-view.c:382
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> si praje získať najnovšie informácie o úlohe."
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:386
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr "<b>%s</b> poslal nerozpoznateľnú správu."
+
+#: ../plugins/itip-formatter/itip-view.c:388
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> poslal nerozpoznateľnú správu."
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:392
 #, fuzzy, c-format
-msgid "<b>%s</b> through %s has cancelled the following meeting:"
+msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> zrušil stretnutie."
 
-#: ../plugins/itip-formatter/itip-view.c:376
-#, c-format
-msgid "<b>%s</b> has cancelled the following meeting."
+#: ../plugins/itip-formatter/itip-view.c:394
+#, fuzzy, c-format
+msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> zrušil nasledujúce stretnutie."
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:398
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "<b>%s</b> odpovedal na požiadavku o stretnutí."
+
+#: ../plugins/itip-formatter/itip-view.c:400
 #, fuzzy, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> odpovedal na požiadavku o stretnutí."
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:404
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> odpovedal na požiadavku o stretnutí."
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:406
 #, fuzzy, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> odpovedal na požiadavku o stretnutí."
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:444
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> poslal informácie o úlohe."
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> zverejnil nasledujúcu úlohu:"
 
-#: ../plugins/itip-formatter/itip-view.c:419
+#: ../plugins/itip-formatter/itip-view.c:451
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> požaduje účasť %s na stretnutí."
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:454
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> zrušil úlohu."
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> vám priradil úlohu:"
 
-#: ../plugins/itip-formatter/itip-view.c:430
+#: ../plugins/itip-formatter/itip-view.c:462
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> si praje byť pridaný do existujúcej úlohy."
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:464
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> si praje byť pridaný do existujúcej úlohy."
 
-#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:468
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr "<b>%s</b> si praje získať najnovšie informácie o úlohe."
+
+#: ../plugins/itip-formatter/itip-view.c:470
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> si praje získať najnovšie informácie o úlohe."
 
-#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:474
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b> poslal nerozpoznateľnú správu."
+
+#: ../plugins/itip-formatter/itip-view.c:476
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> poslal nerozpoznateľnú správu."
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:480
 #, fuzzy, c-format
-msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> zrušil úlohu."
 
-#: ../plugins/itip-formatter/itip-view.c:444
-#, c-format
-msgid "<b>%s</b> has cancelled the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:482
+#, fuzzy, c-format
+msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> zrušil nasledujúcu priradenú úlohu:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:486
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> navrhol nasledujúce zmeny priradenia úlohy:"
+
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> navrhol nasledujúce zmeny priradenia úlohy:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:494
 #, fuzzy, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> odpovedal na priradenie úlohy."
 
+#: ../plugins/itip-formatter/itip-view.c:532
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has published the following memo:"
+msgstr "<b>%s</b> poslal informácie o úlohe."
+
+#: ../plugins/itip-formatter/itip-view.c:534
+#, fuzzy, c-format
+msgid "<b>%s</b> has published the following memo:"
+msgstr "<b>%s</b> zverejnil nasledujúcu úlohu:"
+
+#: ../plugins/itip-formatter/itip-view.c:539
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgstr "<b>%s</b> si praje byť pridaný na existujúce stretnutie."
+
+#: ../plugins/itip-formatter/itip-view.c:541
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing memo:"
+msgstr "<b>%s</b> si praje byť pridaný na existujúce stretnutie."
+
+#: ../plugins/itip-formatter/itip-view.c:545
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgstr "<b>%s</b> zrušil stretnutie."
+
+#: ../plugins/itip-formatter/itip-view.c:547
+#, fuzzy, c-format
+msgid "<b>%s</b> has canceled the following shared memo:"
+msgstr "<b>%s</b> zrušil nasledujúcu priradenú úlohu:"
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:818
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "Nová Kaledónia"
+
+#: ../plugins/itip-formatter/itip-view.c:824
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
+#, fuzzy
+msgid "_Decline"
+msgstr "Odmietnuť"
+
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
+#, fuzzy
+msgid "_Accept"
+msgstr "Akceptovať"
+
+#: ../plugins/itip-formatter/itip-view.c:828
+#, fuzzy
+msgid "_Decline all"
+msgstr "_Odstrániť všetky"
+
+#: ../plugins/itip-formatter/itip-view.c:829
+#, fuzzy
+msgid "_Tentative all"
+msgstr "Predbežný"
+
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
+#, fuzzy
+msgid "_Tentative"
+msgstr "Predbežný"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#, fuzzy
+msgid "_Accept all"
+msgstr "Akceptovať"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:841
+#, fuzzy
+msgid "_Send Information"
+msgstr "Informácie o serveri"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:845
+#, fuzzy
+msgid "_Update Attendee Status"
+msgstr "Aktualizovať stav respondenta"
+
+#: ../plugins/itip-formatter/itip-view.c:848
+#, fuzzy
+msgid "_Update"
+msgstr "Aktualizovať"
+
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:1009
 msgid "Start time:"
 msgstr "Čas začiatku:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:1018
 msgid "End time:"
 msgstr "Čas konca:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:1034
+#: ../plugins/itip-formatter/itip-view.c:1084
 msgid "Comment:"
 msgstr "Komentár:"
 
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:1070
+#, fuzzy
+msgid "Send _reply to sender"
+msgstr "_Odpovedať odosielateľovi"
+
+#: ../plugins/itip-formatter/itip-view.c:1098
 #, fuzzy
-msgid "Send u_pdates to attendees"
+msgid "Send _updates to attendees"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/itip-formatter/itip-view.c:990
-msgid "A_pply to all instances"
+#: ../plugins/itip-formatter/itip-view.c:1107
+#, fuzzy
+msgid "_Apply to all instances"
 msgstr "A_plikovať na všetky výskyty"
 
+#: ../plugins/itip-formatter/itip-view.c:1842
+#, fuzzy
+msgid "_Tasks :"
+msgstr "Ú_lohy:"
+
+#: ../plugins/itip-formatter/itip-view.c:1844
+msgid "Memos :"
+msgstr ""
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 #, fuzzy
 msgid "Displays text/calendar parts in messages."
@@ -16192,7 +18200,7 @@ msgstr "Importy"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot; ?"
+"&quot;{1}&quot;?"
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16217,35 +18225,46 @@ msgstr "Povolí deaktiváciu účtov."
 msgid "Disable Account"
 msgstr "Deaktivovať účet"
 
-#: ../plugins/mail-remote/client.c:30
-#, c-format
-msgid "System error: %s"
-msgstr "Systémová chyba: %s"
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Enable libnotify notifications of new mail"
+msgstr ""
 
-#: ../plugins/mail-remote/client.c:32
-#, fuzzy, c-format
-msgid "Camel error: %s"
-msgstr "Chyba validácie: %s"
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Every time a new mail arrives, pop up a libnotify notification."
+msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "Účet nemôže odoslať elektronickú poštu"
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Make the status icon blink"
+msgstr ""
 
-#: ../plugins/mail-remote/evolution-mail-store.c:605
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "When the new-mail status icon is visible, make it blink."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:132
+#, c-format
+msgid "You have received %d new message in %s."
+msgid_plural "You have received %d new messages in %s."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../plugins/mail-notification/mail-notification.c:153
 #, fuzzy
-msgid "No store available"
-msgstr "Popis nie je k dispozícii."
+msgid "New email"
+msgstr "Nový Zéland"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#, fuzzy
+msgid "Mail Notification"
+msgstr "Upozornenie na novú poštu"
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+"Notifies the user with an icon in notification area and a notification "
+"message whenever a new message has arrived."
 msgstr ""
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-#, fuzzy
-msgid "Mail Remote"
-msgstr "Poštové filtre"
-
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
@@ -16269,6 +18288,7 @@ msgstr ""
 "Zásuvný modul, ktorý umožňuje vytváranie úloh z obsahu poštových správ."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
 msgid "Con_vert to Task"
 msgstr "Kon_vertovať na úlohu"
 
@@ -16277,20 +18297,22 @@ msgstr "Kon_vertovať na úlohu"
 msgid "Mail to task"
 msgstr "Pošta pre %s"
 
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+#, fuzzy
+msgid "Convert the selected message to a new task"
+msgstr "Otvoriť aktuálnu správu v novom okne"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 #, fuzzy
 msgid "Contact list _owner"
 msgstr "Editor zoznamu kontaktov"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 #, fuzzy
 msgid "Get list _archive"
 msgstr "Sada groupvérových nástrojov Evolution"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 #, fuzzy
 msgid "Get list _usage information"
 msgstr "Informácie o stretnutí"
@@ -16308,22 +18330,18 @@ msgstr "Konferencia"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
-"Provide actions for common mailing list commands (subscribe, "
-"unsubscribe, ...)."
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post message to list"
 msgstr "_Poslať správu do zoznamu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr "_Prihlásiť sa do zoznamu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr "O_dhlásiť sa zo zoznamu"
 
@@ -16396,16 +18414,31 @@ msgstr "_Upraviť správu"
 msgid "_Send message"
 msgstr "_Odoslať správu"
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+#, fuzzy
+msgid "Contact List _Owner"
+msgstr "Editor zoznamu kontaktov"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 #, fuzzy
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Odpovedať do konferencie tejto správy"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+#, fuzzy
+msgid "Get List _Archive"
+msgstr "Sada groupvérových nástrojov Evolution"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+#, fuzzy
+msgid "Get List _Usage Information"
+msgstr "Informácie o stretnutí"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 
@@ -16424,6 +18457,34 @@ msgstr "Odpovedať do konferencie tejto správy"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Odpovedať do konferencie tejto správy"
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+#, fuzzy
+msgid "_Post Message to List"
+msgstr "_Poslať správu do zoznamu"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+#, fuzzy
+msgid "_Subscribe to List"
+msgstr "_Prihlásiť sa do zoznamu"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+#, fuzzy
+msgid "_Unsubscribe from List"
+msgstr "Odhlasujem sa z priečinku \"%s\""
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+#, fuzzy
+msgid "Mark All Read"
+msgstr "Označiť ako _prečítanú"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark Me_ssages as Read"
+msgstr "Označiť _správy ako prečítané"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr ""
+
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
 msgstr "Označiť kalendár off-line"
@@ -16450,24 +18511,23 @@ msgid "Mono Loader"
 msgstr "Presunúť do priečinku"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
+#, fuzzy
+msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Vygeneruje správu D-BUS pri príchode novej pošty."
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
 msgid "New Mail Notification"
 msgstr "Upozornenie na novú poštu"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "Upozornenie na novú poštu"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr ""
 "Zásuvný modul pre správu, ktoré zásuvné moduly sú povolené alebo zakázané."
 
+#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
+#: ../plugins/plugin-manager/plugin-manager.c:231
+msgid "Plugin Manager"
 msgstr "Správca zásuvných modulov"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
@@ -16475,45 +18535,37 @@ msgid "Enable and disable plugins"
 msgstr "Povoliť alebo zakázať zásuvné moduly"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "Plugins"
+#, fuzzy
+msgid "_Plugins"
 msgstr "Zásuvné moduly"
 
-#: ../plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:55
 msgid "Author(s)"
 msgstr "Autor(i)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:46
-msgid "Id"
-msgstr "Id"
-
-#: ../plugins/plugin-manager/plugin-manager.c:47
-msgid "Path"
-msgstr "Cesta"
-
-#: ../plugins/plugin-manager/plugin-manager.c:48
-#: ../widgets/table/e-table-config-no-group.glade.h:6
+#: ../plugins/plugin-manager/plugin-manager.c:56
 #: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "Popis"
 
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-msgid "Plugin Manager"
-msgstr "Správca zásuvných modulov"
+#: ../plugins/plugin-manager/plugin-manager.c:234
+#, fuzzy
+msgid "Con_figure"
+msgstr "Pokračovať"
 
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:245
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Poznámka: Niektoré zmeny sa prejavia až po reštarte"
 
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
+#: ../plugins/plugin-manager/plugin-manager.c:298
+#: ../plugins/plugin-manager/plugin-manager.c:356
 msgid "Plugin"
 msgstr "Zásuvný modul"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
 "A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML mails.\n"
+"disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
@@ -16527,29 +18579,35 @@ msgstr "Režim obyčajného textu"
 msgid "Prefer plain-text"
 msgstr "Uprednostňovať obyčajný text"
 
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:139
 msgid "Show HTML if present"
 msgstr "Zobraziť HTML, ak je prítomné"
 
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:140
 msgid "Prefer PLAIN"
 msgstr "Uprednostňovať obyčajný"
 
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:141
 msgid "Only ever show PLAIN"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:150
-msgid "HTML Mode"
+#: ../plugins/prefer-plain/prefer-plain.c:184
+#, fuzzy
+msgid "HTML _Mode"
 msgstr "HTML režim"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
+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 "Tlačiť správu"
+
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+#: ../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 "U_kážka pred tlačou"
 
@@ -16557,17 +18615,154 @@ msgstr "U_kážka pred tlačou"
 msgid "Prints the message"
 msgstr "Vytlačí správu"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
-msgid "Spamassassin (built-in)"
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+#, fuzzy
+msgid "Evolution Profiler"
+msgstr "Chyba Evolution"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#, fuzzy
+msgid "Calendar Publishing"
+msgstr "Kalendár"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Locations"
+msgstr "Umiestnenie"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+#, fuzzy
+msgid "_Publish Calendar Information"
+msgstr "Informácie o iCalendar"
+
+#: ../plugins/publish-calendar/publish-calendar.c:91
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Zadajte heslo pre `%s'"
+
+#: ../plugins/publish-calendar/publish-calendar.c:416
+#, fuzzy
+msgid "Are you sure you want to remove this URL?"
+msgstr "Naozaj chcete odstrániť tento účet?"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "Zobrazené správy:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+#, fuzzy
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "Zobrazené správy:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#, fuzzy
+msgid "Publishing Location"
+msgstr "Požiadavka na informácie o voľnom čase"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#, fuzzy
+msgid "Publishing _Frequency:"
+msgstr "Požiadavka na informácie o voľnom čase"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#, fuzzy
+msgid "Service _type:"
+msgstr "_Typ serveru:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#, fuzzy
+msgid "_File:"
+msgstr "_Súbor"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#, fuzzy
+msgid "_Password:"
+msgstr "Heslo"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#, fuzzy
+msgid "_Publish as:"
+msgstr "Požiadavka na informácie o voľnom čase"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#, fuzzy
+msgid "_Remember password"
+msgstr "Uložiť toto heslo"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#, fuzzy
+msgid "_Username:"
+msgstr "Po_užívateľ:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#, fuzzy
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr "Voľno/zaneprázdnený URL:"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#, fuzzy
+msgid "SpamAssassin (built-in)"
 msgstr "Spamassassin (vstavaný)"
 
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
+msgid "This will make Spamassasin more reliable, but slower"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Vložiť:"
+
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Sa junk-plugin"
+msgid ""
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
+"to be installed."
 msgstr ""
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "learns junk messages using spamd."
-msgstr ""
+#, fuzzy
+msgid "SpamAssassin junk plugin"
+msgstr "Spamassassin (vstavaný)"
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+#, fuzzy
+msgid "Spamassassin Options"
+msgstr "Spamassassin (vstavaný)"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -16575,28 +18770,30 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/save-attachments/save-attachments.c:330
 msgid "Save attachments"
 msgstr "Uložiť prílohy"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments ..."
+#, fuzzy
+msgid "Save Attachments..."
 msgstr "Uložiť prílohy..."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "Uložiť všetky prílohy"
 
-#: ../plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:336
 #, fuzzy
 msgid "Select save base name"
 msgstr "Vyberte časovú zónu"
 
-#: ../plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:355
 msgid "MIME Type"
 msgstr "Typ MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../plugins/save-attachments/save-attachments.c:363
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
 msgid "Save"
 msgstr "Uložiť"
 
@@ -16604,124 +18801,114 @@ msgstr "Uložiť"
 #. * 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:171
+#: ../plugins/save-calendar/csv-format.c:167
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
-msgstr "Uid"
+#: ../plugins/save-calendar/csv-format.c:381
+msgid "UID"
+msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Description List"
 msgstr "Zoznam popisov"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Categories List"
 msgstr "Zoznam kategórií"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Comment List"
 msgstr "Zoznam komentárov"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Created"
 msgstr "Vytvorené"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Contact List"
 msgstr "Zoznam kontaktov"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Start"
 msgstr "Štart"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "End"
 msgstr "Koniec"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "percent Done"
 msgstr "percet dokončených"
 
-#: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr "Url"
+#: ../plugins/save-calendar/csv-format.c:394
+#, fuzzy
+msgid "URL"
+msgstr "_URL:"
 
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:395
 #, fuzzy
 msgid "Attendees List"
 msgstr "Účastník"
 
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Modified"
 msgstr "Zmenené"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Advanced options for the CSV format"
 msgstr "Rozšírené voľby pre formát CSV"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:555
 msgid "Prepend a header"
 msgstr "Predradiť hlavičku"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:564
 msgid "Value delimiter:"
 msgstr "Oddeľovač hodnôt:"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Record delimiter:"
 msgstr "Oddeľovač záznamov:"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../plugins/save-calendar/csv-format.c:576
 msgid "Encapsulate values with:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:598
 msgid "Comma separated value format (.csv)"
 msgstr "Formát čiarkou oddelených hodnôt (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "Formát iCalendar (.ics)"
-
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Uložiť vybrané"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Save to _Disk"
-msgstr "Uložiť na _disk"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "Saves selected calendar or tasks list to disk."
 msgstr "Uloží vybraný kalendár alebo zoznam úloh na disk."
 
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "_Save to Disk"
+msgstr "Uložiť na _disk"
+
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:158
+#: ../plugins/save-calendar/rdf-format.c:154
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:396
+#: ../plugins/save-calendar/rdf-format.c:393
 msgid "RDF format (.rdf)"
 msgstr "RDF formát (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:171
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:163
 msgid "Select destination file"
 msgstr "Vybrať cieľový súbor"
 
-#: ../plugins/save-calendar/save-calendar.c:216
-#, c-format
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
-
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
 msgstr "Vybrať jeden zdroj"
@@ -16731,26 +18918,32 @@ msgid "Selects a single calendar or task source for viewing."
 msgstr "Vyberie jeden kalendár alebo zdroj úlohy pre zobrazenie."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "_Show only this Calendar"
+#, fuzzy
+msgid "Show _only this Calendar"
 msgstr "_Zobraziť len tento kalendár"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "_Show only this Task List"
+#, fuzzy
+msgid "Show _only this Task List"
 msgstr "_Zobraziť len tento zoznam úloh"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr ""
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Asistent pre nastavenie"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Vitajte"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -16762,22 +18955,32 @@ msgstr ""
 "\n"
 "Stlačte \"Nasledujúci\" pre pokračovanie. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../plugins/startup-wizard/startup-wizard.c:134
+#, fuzzy
+msgid "Importing files"
+msgstr "Importovať _jeden súbor"
+
+#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Prosím, vyberte informácie, ktoré chcete importovať:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:154
-#: ../shell/e-shell-importer.c:398
+#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
+#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Import údajov."
 
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:525
+msgid "Please wait"
+msgstr "Prosím, čakajte"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr ""
@@ -16792,9 +18995,19 @@ msgstr "Vytvoriť vlákna správ podľa predmetu"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
+#, fuzzy
+msgid "F_all back to threading messages by subject"
+msgstr "Vytvoriť vlákna správ podľa predmetu"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr ""
 
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+#, fuzzy
+msgid "TNEF Attachment decoder"
+msgstr "Príloha"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Shell Evolution"
@@ -16804,115 +19017,142 @@ msgstr "Shell Evolution"
 msgid "Evolution Shell Config factory"
 msgstr "Shell Evolution"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Test Evolution"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Testovací komponent Evolution"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "A GNOME Print description of the current printer settings"
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "A string description of the current printer settings"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Configuration version"
 msgstr "Verzia konfigurácie"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Default sidebar width"
 msgstr "Štandardná šírka postrannej lišty"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default window height"
 msgstr "Štandardná výška okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+#, fuzzy
+msgid "Default window state"
+msgstr "Štandardná šírka okna"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window width"
 msgstr "Štandardná šírka okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Posledná aktualizovaná verzia konfigurácie"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "Printer settings"
-msgstr "Nastavenia tlačiarne"
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+#, fuzzy
+msgid "Sidebar is visible"
+msgstr "Lišta nástrojov je viditeľná"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Skip development warning dialog"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.h:12 ../shell/main.c:458
 msgid "Start in offline mode"
 msgstr "Spustiť v režime off-line"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+#, fuzzy
+msgid "Statusbar is visible"
+msgstr "Lišta nástrojov je viditeľná"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Predvolená výčka hlavného okna v bodoch."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Predvolená šírka hlavného okna v bodoch."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Predvolená šírka bočnej lišty v bodoch."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
+"configuration level (for example \"2.6.0\")."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Toolbar is visible"
 msgstr "Lišta nástrojov je viditeľná"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+#, fuzzy
+msgid "Whether or not the window should be maximized."
+msgstr "Či majú byť viditeľné tlačidlá okna."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+#, fuzzy
+msgid "Whether the sidebar should be visible."
+msgstr "Či má byť viditeľná lišta nástrojov."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+#, fuzzy
+msgid "Whether the status bar should be visible."
+msgstr "Či má byť viditeľná lišta nástrojov."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Whether the toolbar should be visible."
 msgstr "Či má byť viditeľná lišta nástrojov."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the window buttons should be visible."
 msgstr "Či majú byť viditeľné tlačidlá okna."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Window button style"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Window buttons are visible"
 msgstr "Tlačidlá okna sú viditeľné"
 
@@ -16928,16 +19168,11 @@ msgstr "Aktívne spojenia"
 msgid "Click OK to close these connections and go offline"
 msgstr "Stlačením OK tieto spojenia zatvoríte a prejdete do módu off-line"
 
-#: ../shell/e-shell-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
-msgid "(Untitled)"
-msgstr "(Bez mena)"
-
-#: ../shell/e-shell-importer.c:133
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Vyberte typ importéra, ktorý chcete spustiť:"
 
-#: ../shell/e-shell-importer.c:136
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -16951,11 +19186,11 @@ msgstr ""
 "Použite \"Automaticky\" ak typ nepoznáte a Evolution sa\n"
 "ho pokúsi určiť."
 
-#: ../shell/e-shell-importer.c:142
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Vybrať cieľ pre tento import"
 
-#: ../shell/e-shell-importer.c:148
+#: ../shell/e-shell-importer.c:150
 #, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following\n"
@@ -16968,33 +19203,30 @@ msgstr ""
 "ktoré by bolo možné importovať. Ak to chcete skúsiť znovu,\n"
 "stlačte \"Dozadu\".\n"
 
-#: ../shell/e-shell-importer.c:283
+#: ../shell/e-shell-importer.c:288
 msgid "F_ilename:"
 msgstr "Náz_ov súboru:"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:293
 msgid "Select a file"
 msgstr "Vybrať súbor"
 
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Typ súboru:"
 
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Importovať dáta a nastavenia zo _starších programov"
 
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Importovať _jeden súbor"
 
-#: ../shell/e-shell-importer.c:698
-msgid "_Import"
-msgstr "_Importovať"
-
-#: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr "Nastavenie Evolution"
+#: ../shell/e-shell-settings-dialog.c:313
+#, fuzzy
+msgid "Evolution Preferences"
+msgstr "Ovládací prvok nastavenia pošty Evolution"
 
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
@@ -17016,106 +19248,110 @@ msgstr "Meno priečinku nesmie obsahovať znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' a '..' sú rezervované mená priečinkov."
 
-#: ../shell/e-shell-window-commands.c:70
+#: ../shell/e-shell-window-commands.c:77
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Vyzerá to, že nemáte nainštalované nástroje pre PalmPilota GNOME."
 
-#: ../shell/e-shell-window-commands.c:78
+#: ../shell/e-shell-window-commands.c:85
 #, c-format
 msgid "Error executing %s."
 msgstr "Chyba pri vykonávaní %s."
 
-#: ../shell/e-shell-window-commands.c:127
+#: ../shell/e-shell-window-commands.c:141
 msgid "Bug buddy is not installed."
 msgstr "Priateľ v núdzi nie je nainštalovaný."
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:144
 msgid "Bug buddy could not be run."
 msgstr "Nedá sa spustiť nástroj pre oznamovanie chýb."
 
 #. The translator-credits string is for translators to list
-#. * per language credits for translation, displayed in the
-#. * about box
-#: ../shell/e-shell-window-commands.c:532
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-commands.c:663
 msgid "translator-credits"
 msgstr "Marcel Telka <marcel@telka.sk>"
 
-#: ../shell/e-shell-window-commands.c:546
+#: ../shell/e-shell-window-commands.c:674
 #, fuzzy
-msgid "Groupware Suite"
-msgstr "Skupina"
+msgid "Evolution Website"
+msgstr "Test Evolution"
 
-#: ../shell/e-shell-window-commands.c:774
+#: ../shell/e-shell-window-commands.c:885
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:898 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Pracovať off-line"
 
-#: ../shell/e-shell-window-commands.c:800
+#: ../shell/e-shell-window-commands.c:911
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
-#: ../shell/e-shell-window.c:343
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: ../shell/e-shell-window.c:384
+#, fuzzy
+msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "Evolution je momentálne on-line. Stlačením tohto tlačidla prejdete do režimu "
 "off-line."
 
-#: ../shell/e-shell-window.c:351
+#: ../shell/e-shell-window.c:392
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution prechádza do režimu off-line."
 
-#: ../shell/e-shell-window.c:358
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: ../shell/e-shell-window.c:399
+#, fuzzy
+msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Evolution je momentálne off-line. Stlačením tohto tlačidla prejdete do "
 "režimu on-line."
 
-#: ../shell/e-shell-window.c:724
+#: ../shell/e-shell-window.c:825
 #, c-format
 msgid "Switch to %s"
 msgstr "Prepnúť do %s"
 
-#: ../shell/e-shell.c:623
+#: ../shell/e-shell.c:640
 msgid "Uknown system error."
 msgstr "Neznáma systémová chyba."
 
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
+#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1275 ../widgets/misc/e-cell-date-edit.c:255
 msgid "OK"
 msgstr "Ok"
 
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1277
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1279
 msgid "Cannot register on OAF"
 msgstr "Nie je možné zaregistrovať u OAF"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1281
 msgid "Configuration Database not found"
 msgstr "Konfiguračná databáza nenájdená"
 
-#: ../shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:678
+#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:693
 msgid "New"
 msgstr "Nová"
 
-#: ../shell/evolution-test-component.c:140
+#: ../shell/test/evolution-test-component.c:107
 msgid "New Test"
 msgstr "Nový test"
 
-#: ../shell/evolution-test-component.c:141
+#: ../shell/test/evolution-test-component.c:108
 msgid "_Test"
 msgstr "_Test"
 
-#: ../shell/evolution-test-component.c:142
+#: ../shell/test/evolution-test-component.c:109
 msgid "Create a new test item"
 msgstr "Vytvoriť novú testovaciu položku"
 
@@ -17158,7 +19394,7 @@ msgstr ""
 "externé súbory do Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:219
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17170,7 +19406,7 @@ msgid ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -17193,7 +19429,7 @@ msgstr ""
 "Dúfame, že si užijete výsledky našej tvrdej práce a\n"
 "uvítame vaše príspevky.\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:243
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17201,36 +19437,46 @@ msgstr ""
 "Ďakujeme\n"
 "Tím Evolution\n"
 
-#: ../shell/main.c:261
-msgid "Don't tell me again"
+#: ../shell/main.c:250
+#, fuzzy
+msgid "Do not tell me again"
 msgstr "Túto správu už nezobrazovať"
 
-#: ../shell/main.c:466
+#: ../shell/main.c:456
 msgid "Start Evolution activating the specified component"
 msgstr "Spustiť Evolution aktivovaním zadaného komponentu"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:460
 msgid "Start in online mode"
 msgstr "Spustiť v režime on-line"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:463
 #, fuzzy
 msgid "Forcibly shut down all Evolution components"
 msgstr "Vynútiť ukončenie všetkých komponentov Evolution"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:467
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: ../shell/main.c:480
+#: ../shell/main.c:470
 msgid "Send the debugging output of all components to a file."
 msgstr "Poslať ladiaci výstup zo všetkých komponent od súboru."
 
-#: ../shell/main.c:482
+#: ../shell/main.c:472
 msgid "Disable loading of any plugins."
 msgstr "Zakázať načítavanie zásuvných modulov."
 
-#: ../shell/main.c:513
+#: ../shell/main.c:474
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr ""
+
+#: ../shell/main.c:503
+#, fuzzy
+msgid "- The Evolution PIM and Email Client"
+msgstr "Poštový komponent Evolution"
+
+#: ../shell/main.c:516
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17259,7 +19505,7 @@ msgstr "Evolution sa nemohol spustiť."
 #, fuzzy
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+"reprompted next time they are needed."
 msgstr "Zabudnúť uložené heslá, takže ich budete musieť znovu zadať"
 
 #: ../shell/shell.error.xml.h:7
@@ -17272,7 +19518,7 @@ msgstr "Naozaj odstrániť staré dáta?"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -17288,8 +19534,8 @@ msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently.  If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
 msgstr ""
 
@@ -17299,7 +19545,7 @@ msgstr "Aktualizácia z predchádzajúcej verzie zlyhala: {0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
 "\n"
 "You will need to make more space available in your home directory before you "
@@ -17352,7 +19598,7 @@ msgid ""
 "data.\n"
 msgstr ""
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -17360,74 +19606,88 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:137
+#: ../smime/gui/certificate-manager.c:380
+#: ../smime/gui/certificate-manager.c:604
 msgid "Select a certificate to import..."
 msgstr "Vybrať certifikát pre import..."
 
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:146
+#, fuzzy
+msgid "All PKCS12 files"
+msgstr "Heslo súboru PKCS12"
+
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
+#, fuzzy
+msgid "All files"
+msgstr "Priložiť súbor"
+
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
 msgid "Certificate Name"
 msgstr "Názov ccertifikátu"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
 msgid "Purposes"
 msgstr "Účely"
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "Sériové číslo"
 
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:297
 msgid "Expires"
 msgstr "Platnosť vyprší"
 
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:389
+#, fuzzy
+msgid "All email certificate files"
+msgstr "Certifikačná autorita elektronickej pošty"
+
+#: ../smime/gui/certificate-manager.c:489
 msgid "E-Mail Address"
 msgstr "E-mailová adresa"
 
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-manager.c:613
+#, fuzzy
+msgid "All CA certificate files"
+msgstr "Podrobnosti certifikátu"
+
+#: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: ../smime/gui/component.c:45
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Zadajte heslo pre `%s'"
-
 #. we're setting the password initially
-#: ../smime/gui/component.c:68
+#: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
 msgstr "Zadajte vaše heslo pre databázu certifikátov"
 
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:72
 msgid "Enter new password"
 msgstr "Zadajte nové heslo"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -17436,7 +19696,7 @@ msgstr ""
 "Vydané pre:\n"
 "  Predmet: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -17445,7 +19705,7 @@ msgstr ""
 "Vydavateľ:\n"
 "  Predmet: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:174
 msgid "Select certificate"
 msgstr "Vybrať certifikát"
 
@@ -17505,7 +19765,7 @@ msgstr ""
 "Pred dôverovaním tejto CA z akýchkoľvek dôvodov by ste si mali preštudovať "
 "ich certifikát a ich pravidlá a postupy (ak sú dostupné)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "Certifikát"
 
@@ -17581,11 +19841,11 @@ msgstr "Organizáčná jednotka (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Odtlačok prsta SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
 msgid "SSL Client Certificate"
 msgstr "Certifikát SSL klienta"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
 msgid "SSL Server Certificate"
 msgstr "Certifikát SSL servera"
 
@@ -17631,249 +19891,185 @@ msgid "_Edit CA Trust"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:651
+#: ../smime/lib/e-cert-db.c:679
 msgid "Certificate already exists"
 msgstr "Certifikát už existuje"
 
-#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:425
 msgid "Sign"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:426
 msgid "Encrypt"
 msgstr "Zašifrovať"
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:531
 msgid "Version"
 msgstr "Verzia"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:546
 msgid "Version 1"
 msgstr "Verzia 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:549
 msgid "Version 2"
 msgstr "Verzia 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:552
 msgid "Version 3"
 msgstr "Verzia 3"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:642
-msgid "C"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:645
-msgid "CN"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:648
-msgid "OU"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:651
-msgid "O"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:654
-msgid "L"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:657
-msgid "DN"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:660
-msgid "DC"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:663
-msgid "ST"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:667
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:670
 msgid "Certificate Key Usage"
 msgstr "Použitie kľúča certifikátu"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:673
 msgid "Netscape Certificate Type"
 msgstr "Typ certifikátu Netscape"
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:676
 msgid "Certificate Authority Key Identifier"
 msgstr "Identifikátor kľúča certifikačnej autority"
 
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr "UID"
-
-#: ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "V"
-
-#: ../smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:688
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifikátor objektu (%s)"
 
-#: ../smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:739
 msgid "Algorithm Identifier"
 msgstr "Identifikátor algoritmu"
 
-#: ../smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:747
 msgid "Algorithm Parameters"
 msgstr "Parametre algoritmu"
 
-#: ../smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:769
 msgid "Subject Public Key Info"
 msgstr "Informácie o verejnom kľúči predmetu"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmus verejného kľúča predmetu"
 
-#: ../smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:789
 msgid "Subject's Public Key"
 msgstr "Verejný kľúč predmetu"
 
-#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr "Chyba: Nie je možné spracovať rozšírenie"
 
-#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr "Signatár objektu"
 
-#: ../smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:835
 msgid "SSL Certificate Authority"
 msgstr "Certifikačná autorita SSL"
 
-#: ../smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:839
 msgid "Email Certificate Authority"
 msgstr "Certifikačná autorita elektronickej pošty"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:867
 msgid "Signing"
 msgstr "Podpisovanie"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:871
 msgid "Non-repudiation"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:875
 msgid "Key Encipherment"
 msgstr "Zašifrovanie kľúča"
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:879
 msgid "Data Encipherment"
 msgstr "Zašifrovanie dát"
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:883
 msgid "Key Agreement"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:887
 msgid "Certificate Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:939
 msgid "Critical"
 msgstr "Critické"
 
-#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
 msgstr "Nie je kritické"
 
-#: ../smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:965
 msgid "Extensions"
 msgstr "Rozšírenia"
 
-#: ../smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmus podpisu certifikátu"
 
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1101
 msgid "Issuer"
 msgstr "Vydavateľ"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "Jedinečné ID vydavateľa"
 
-#: ../smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "Jedinečné ID predmetu"
 
-#: ../smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1217
 msgid "Certificate Signature Value"
 msgstr "Hodnota podpisu certifikátu"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Heslo súboru PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "Zadajte heslo pre súbor PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "Importovaný certifikát"
 
-#: ../tools/evolution-launch-composer.c:324
-msgid "An attachment to add."
-msgstr "Pridávaná príloha."
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Content type of the attachment."
-msgstr "Typ obsahu prílohy."
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "The filename to display in the mail."
-msgstr "Meno súboru zobrazené v správe."
-
-#: ../tools/evolution-launch-composer.c:327
-msgid "Description of the attachment."
-msgstr "Popis prílohy."
-
-#: ../tools/evolution-launch-composer.c:328
-msgid "Mark attachment to be shown inline by default."
-msgstr "Označiť prílohu, že má byť zobrazená štandardne v texte."
-
-#: ../tools/evolution-launch-composer.c:329
-msgid "Default subject for the message."
-msgstr "Štandardný predmet pre správu."
-
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -17887,110 +20083,240 @@ msgstr "Nie je možné spustiť '%s': %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Vypínam %s (%s)\n"
 
+#: ../ui/evolution-addressbook.xml.h:1
+#, fuzzy
+msgid "Address _Book Properties"
+msgstr "Vlastnosti adresára"
+
 #: ../ui/evolution-addressbook.xml.h:3
 #, fuzzy
+msgid "Change the properties of the selected folder"
+msgstr "Zmení vlastnosti tohto priečinku"
+
+#: ../ui/evolution-addressbook.xml.h:4
+#, fuzzy
+msgid "Co_py All Contacts To..."
+msgstr "Kopírovať kontakty do"
+
+#: ../ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Contact _Preview"
+msgstr "Zoznam _kontaktov"
+
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopírovať"
+
+#: ../ui/evolution-addressbook.xml.h:7
+#, fuzzy
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopírovať vybrané kontakty do iného priečinka..."
 
-#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:8
+#, fuzzy
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "Kopírovať vybraný priečinok do iného priečinka"
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Skopíruje výber"
 
-#: ../ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr "Kopírovať do priečinku..."
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "Create a new addressbook folder"
+msgstr "Vytvoriť nový adresár"
+
+#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Vystrihnúť"
+
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Vystrihne výber"
 
-#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Del_ete Address Book"
+msgstr "Nový adresár"
+
+#: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr "Odstrániť vybrané kontakty"
 
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Delete the selected folder"
+msgstr "Obnoviť vybrané správy"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "Predať ďalej kontakt"
+
+#: ../ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Mo_ve All Contacts To..."
+msgstr "Presunúť kontakty do"
+
+#: ../ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Presunúť vybrané kontakty do iného priečinku..."
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:21
+#, fuzzy
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "Presunúť vybraný priečinok do iného priečinka"
+
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
 msgstr "Presunúť do priečinka..."
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Vložiť"
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Vloží obsah schránky"
 
-#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr "Náhľad kontaktov pred tlačou"
 
-#: ../ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
 msgstr "Tlačiť vybrané kontakty"
 
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:29
+#, fuzzy
+msgid "Rename the selected folder"
+msgstr "<kliknutím vyberiete priečinok>"
+
+#: ../ui/evolution-addressbook.xml.h:30
+#, fuzzy
+msgid "S_ave Address Book As VCard"
+msgstr "Nový adresár"
+
+#: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "Uloží vybrané kontakty ako vKartu."
 
-#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:33
+#, fuzzy
+msgid "Save the contacts of the selected folder as VCard"
+msgstr "Uloží vybrané kontakty ako vKartu."
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2715
 msgid "Select All"
 msgstr "Vybrať všetko"
 
-#: ../ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Vybrať _všetko"
+
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
 msgstr "Vybrať všetky kontakty"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:37
 msgid "Send a message to the selected contacts."
 msgstr "Poslať správu vybraným kontaktom."
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "Poslať správu kontaktu"
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:39
 msgid "Send selected contacts to another person."
 msgstr "Poslať vybrané kontakty inej osobe."
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr "Zobraziť okno s náhľadom kontaktu"
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:41
+#, fuzzy
+msgid "St_op"
+msgstr "Zastaviť"
+
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "Zastaviť načítavanie"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr "Zobraziť aktuálny kontakt"
 
-#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "A_kcie"
 
-#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:47
+#, fuzzy
+msgid "_Copy Contact to..."
+msgstr "Kopírovať kontakt do"
+
+#: ../ui/evolution-addressbook.xml.h:48
+#, fuzzy
+msgid "_Copy Folder Contacts To"
+msgstr "_Kopírovať priečinok do..."
+
+#: ../ui/evolution-addressbook.xml.h:50
+#, fuzzy
+msgid "_Delete Contact"
+msgstr "_Kontakt"
+
+#: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
 msgstr "_Poslať kontakt ďalej..."
 
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "_Preview Pane"
-msgstr "Panel _náhľadu"
+#: ../ui/evolution-addressbook.xml.h:53
+#, fuzzy
+msgid "_Move Contact to..."
+msgstr "Presunúť kontakt do"
 
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
+#: ../ui/evolution-addressbook.xml.h:54
+#, fuzzy
+msgid "_Move Folder Contacts To"
+msgstr "Pre_sunúť priečinok do..."
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+msgid "_New"
+msgstr "_Nový"
+
+#: ../ui/evolution-addressbook.xml.h:60
+#, fuzzy
+msgid "_Rename"
+msgstr "_Premenovať..."
+
+#: ../ui/evolution-addressbook.xml.h:61
+#, fuzzy
+msgid "_Save Contact as VCard..."
 msgstr "_Uložiť ako vKartu..."
 
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
-msgstr "Vybrať _všetko"
+#: ../ui/evolution-addressbook.xml.h:62
+#, fuzzy
+msgid "_Save Folder Contacts As VCard"
+msgstr "Uloží vybrané kontakty ako vKartu."
 
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
 msgstr "_Poslať správu kontaktu..."
 
@@ -17999,61 +20325,61 @@ msgid "Day"
 msgstr "Deň"
 
 #: ../ui/evolution-calendar.xml.h:6
-msgid "Delete All Occurrences"
-msgstr "Odstrániť všetky výskyty"
+#, fuzzy
+msgid "Delete _all Occurrences"
+msgstr "Odstrániť _všetky výskyty"
 
 #: ../ui/evolution-calendar.xml.h:7
-msgid "Delete the appointment"
-msgstr "Odstrániť schôdzku"
+#, fuzzy
+msgid "Delete all occurrences"
+msgstr "Odstrániť všetky výskyty"
 
 #: ../ui/evolution-calendar.xml.h:8
-msgid "Delete this Occurrence"
-msgstr "Odstrániť tento výskyt"
+msgid "Delete the appointment"
+msgstr "Odstrániť schôdzku"
 
-#: ../ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
 msgstr "Odstrániť tento výskyt"
 
-#: ../ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr "Prejsť na"
 
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr "Prejsť dozadu"
 
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr "Prejsť dopredu"
 
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr "Zoznam"
 
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Mesiac"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Nasledujúca"
 
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Ukážka kalendára pred tlačou"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "Predchádzajúca"
 
-#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Print this calendar"
 msgstr "Vytlačí tento kalendár"
 
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
-msgstr "Publikovať informácie o voľnom čase pre tento kalendár"
-
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr ""
@@ -18067,6 +20393,11 @@ msgstr "Verejný priečinok obsahujúci schôdzky a udalosti"
 msgid "Select _Date"
 msgstr "Vybrať _dátum"
 
+#: ../ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Vybrať _vlákno"
+
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Prejsť na zadaný dátum"
@@ -18111,33 +20442,268 @@ msgstr "Pracovný týždeň"
 msgid "_Open Appointment"
 msgstr "Otvoriť s_chôdzku"
 
-#: ../ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
 msgid "Copy selected text to the clipboard"
 msgstr "Kopírovať vybraný text do schránky"
 
-#: ../ui/evolution-composer-entries.xml.h:2
-msgid "Cu_t"
-msgstr "Vy_strihnúť"
-
 #: ../ui/evolution-composer-entries.xml.h:3
+#, fuzzy
+msgid "Copy selection to clipboard"
+msgstr "Kopírovať vybraný text do schránky"
+
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
 msgid "Cut selected text to the clipboard"
 msgstr "Vystrihnúť vybraný text do schránky"
 
-#: ../ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:7
+#, fuzzy
+msgid "Cut selection to clipboard"
+msgstr "Vystrihnúť vybraný text do schránky"
+
+#: ../ui/evolution-composer-entries.xml.h:9
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "Vloží obsah schránky"
+
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
 msgid "Paste text from the clipboard"
 msgstr "Vloží text zo schránky"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "Vybrať _všetko"
-
-#: ../ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
 msgid "Select all text"
 msgstr "Vybrať celý text"
 
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "Prispôsobiť moje Evolution"
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Priložiť"
+
+#: ../ui/evolution-editor.xml.h:2
+#, fuzzy
+msgid "Click here to attach a file"
+msgstr "<kliknutím vyberiete priečinok>"
+
+#: ../ui/evolution-editor.xml.h:3
+#, fuzzy
+msgid "Click here to close the current window"
+msgstr "Zavrie aktuálny súbor"
+
+#: ../ui/evolution-editor.xml.h:4
+#, fuzzy
+msgid "Click here to save the current window"
+msgstr "Zavrie aktuálny súbor"
+
+#: ../ui/evolution-editor.xml.h:5
+#, fuzzy
+msgid "Click here to view help available"
+msgstr "<kliknutím vyberiete dátum>"
+
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:7
+msgid "Close"
+msgstr "Zavrieť"
+
+#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "I_nsert"
+msgstr "_Vložiť"
+
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
+msgid "_Attachment..."
+msgstr "_Príloha..."
+
+#: ../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 "_Zavrieť"
+
+#: ../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:44
+msgid "_File"
+msgstr "_Súbor"
+
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Pomocník"
+
+#: ../ui/evolution-editor.xml.h:21
+#, fuzzy
+msgid "_Options"
+msgstr "Nastavenie"
+
+#: ../ui/evolution-event-editor.xml.h:2
+#, fuzzy
+msgid "All Day Event"
+msgstr "Nová celodenná udalosť"
+
+#: ../ui/evolution-event-editor.xml.h:3
+#, fuzzy
+msgid "All _Day Event"
+msgstr "Nová celodenná udalosť"
+
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
+#: ../ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Classify as Confidential"
+msgstr "Tajný"
+
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
+#: ../ui/evolution-task-editor.xml.h:2
+msgid "Classify as Private"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
+#: ../ui/evolution-task-editor.xml.h:3
+msgid "Classify as public"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "Click here to set or unset alarms for this event"
+msgstr "<kliknutím vyberiete priečinok>"
+
+#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Insert advanced send options"
+msgstr "Používateľ zrušil operáciu."
+
+#: ../ui/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "Make this a recurring event"
+msgstr "Nastaviť tento výskyt ako _presunuteľný"
+
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
+#: ../ui/evolution-task-editor.xml.h:6
+#, fuzzy
+msgid "Pu_blic"
+msgstr "Verejný"
+
+#: ../ui/evolution-event-editor.xml.h:12
+#, fuzzy
+msgid "Query free / busy information for the attendees"
+msgstr "Publikovať informácie o voľnom čase pre tento kalendár"
+
+#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "R_ole Field"
+msgstr "Pole _To"
+
+#: ../ui/evolution-event-editor.xml.h:16
+#, fuzzy
+msgid "Send _Options"
+msgstr "Popis:"
+
+#: ../ui/evolution-event-editor.xml.h:17
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Zobraziť čas ako"
+
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
+#, fuzzy
+msgid "Time _Zone"
+msgstr "Časová _zóna:"
+
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
+#, fuzzy
+msgid "Toggles whether the Attendee Type field is displayed"
+msgstr "Prepne, či má byť zobrazené pole To"
+
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
+#, fuzzy
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Prepne, či má byť zobrazené pole CC"
+
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
+#, fuzzy
+msgid "Toggles whether the Role field is displayed"
+msgstr "Prepne, či má byť zobrazené pole To"
+
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
+#, fuzzy
+msgid "Toggles whether the Status field is displayed"
+msgstr "Prepne, či má byť zobrazené pole To"
+
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
+#, fuzzy
+msgid "Toggles whether the time zone is displayed"
+msgstr "Prepne, či má byť zobrazené pole pre výber odosielateľa"
+
+#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-task-editor.xml.h:17
+#, fuzzy
+msgid "Toggles whether to display categories"
+msgstr "Prepne, či má byť zobrazené pole To"
+
+#: ../ui/evolution-event-editor.xml.h:25
+#, fuzzy
+msgid "Toggles whether to have All Day Event"
+msgstr "Prepne, či má byť zobrazené pole CC"
+
+#: ../ui/evolution-event-editor.xml.h:26
+#, fuzzy
+msgid "Toggles whether to show time as busy"
+msgstr "Prepne, či má byť zobrazené pole To"
+
+#: ../ui/evolution-event-editor.xml.h:27
+#, fuzzy
+msgid "_Alarms"
+msgstr "Pripomenutia"
+
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Kategórie"
+
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-task-editor.xml.h:19
+#, fuzzy
+msgid "_Classification"
+msgstr "K_lasifikácia"
+
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-task-editor.xml.h:20
+#, fuzzy
+msgid "_Confidential"
+msgstr "Tajný"
+
+#: ../ui/evolution-event-editor.xml.h:31
+#, fuzzy
+msgid "_Free/Busy"
+msgstr "_Voľno/Zaneprázdnený:"
+
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:21
+#, fuzzy
+msgid "_Private"
+msgstr "Súkromný"
+
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
+#, fuzzy
+msgid "_RSVP"
+msgstr "RSVP"
+
+#: ../ui/evolution-event-editor.xml.h:34
+#, fuzzy
+msgid "_Recurrence"
+msgstr "Opakovanie"
+
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
+#, fuzzy
+msgid "_Status Field"
+msgstr "_Stav:"
+
+#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
+#, fuzzy
+msgid "_Type Field"
+msgstr "Pole _To"
 
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -18161,62 +20727,102 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "Vytvoriť alebo upraviť pravidlá pre filtrovanie novej pošty"
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages for Offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8
+#, fuzzy
+msgid "Download messages for offline"
+msgstr "Vpriečinok na _odosielateľa"
+
+#: ../ui/evolution-mail-global.xml.h:9
+msgid "Download messages of accounts/folders marked for offline"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Empty _Trash"
 msgstr "Vyprázdniť _Odpadky"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:11 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "P_riečinok"
 
-#: ../ui/evolution-mail-global.xml.h:9
-msgid "Message F_ilters"
-msgstr "F_iltre správ"
-
-#: ../ui/evolution-mail-global.xml.h:10
-msgid "Message _Preview"
-msgstr "_Náhľad správy"
-
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Move the selected folder into another folder"
 msgstr "Presunúť vybraný priečinok do iného priečinka"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trvalo odstrániť všetky zmazané správy zo všetkých priečinkov"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Search F_olders"
 msgstr "Prehľadať pr_iečinky"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:16
+#, fuzzy
+msgid "Show Message _Preview"
+msgstr "_Náhľad správy"
+
+#: ../ui/evolution-mail-global.xml.h:17
+#, fuzzy
+msgid "Show message preview below the message list"
+msgstr "Zobraziť správu normálne"
+
+#: ../ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "Show message preview side-by-side with the message list"
+msgstr "Zobraziť správu normálne"
+
+#: ../ui/evolution-mail-global.xml.h:19
 msgid "Show message preview window"
 msgstr "Zobraziť okno s náhľadom správy"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prihlásiť alebo odhlásiť priečinky na vzdialených serveroch"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:21
+#, fuzzy
+msgid "_Classic View"
+msgstr "_Deň"
+
+#: ../ui/evolution-mail-global.xml.h:22
 msgid "_Copy Folder To..."
 msgstr "_Kopírovať priečinok do..."
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:23
+#, fuzzy
+msgid "_Message Filters"
+msgstr "F_iltre správ"
+
+#: ../ui/evolution-mail-global.xml.h:24
 msgid "_Move Folder To..."
 msgstr "Pre_sunúť priečinok do..."
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_New..."
 msgstr "_Nový..."
 
+#: ../ui/evolution-mail-global.xml.h:26
+#, fuzzy
+msgid "_Preview"
+msgstr "Náhľad:"
+
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:30
 msgid "_Subscriptions"
 msgstr "_Prihlásenia"
 
+#: ../ui/evolution-mail-global.xml.h:31
+#, fuzzy
+msgid "_Vertical View"
+msgstr "Kresliť vertikálnu mriežku"
+
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Zmeniť názov tohito priečinka"
@@ -18225,99 +20831,131 @@ msgstr "Zmeniť názov tohito priečinka"
 msgid "Change the properties of this folder"
 msgstr "Zmení vlastnosti tohto priečinku"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Collapse All _Threads"
+msgstr "Zoskupiť podľa _vláken"
+
+#: ../ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "Collapse all message threads"
+msgstr "Označí všetky viditeľné správy ako už prečítané"
+
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopírovať vybrané správy do schránky"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Vystrihnúť vybrané správy do schránky"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:9
 #, fuzzy
 msgid "E_xpunge"
 msgstr "_Vyčistiť"
 
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "Group By _Threads"
-msgstr "Zoskupiť podľa _vláken"
+#: ../ui/evolution-mail-list.xml.h:10
+#, fuzzy
+msgid "Expand all message threads"
+msgstr "Označí všetky viditeľné správy ako už prečítané"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
 msgstr "Skryť zvol_ené správy"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
 msgstr "Skryť _odstránené správy"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
 msgstr "Skryť p_rečítané správy"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Skryje zmazané správy namiesto zobrazenia škrtnutím"
 
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Mark Me_ssages as Read"
+#: ../ui/evolution-mail-list.xml.h:16
+#, fuzzy
+msgid "Mar_k All Messages as Read"
 msgstr "Označiť _správy ako prečítané"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
 msgstr "Vložiť správy zo schránky"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trvalo odstrániť všetky zmazané správy z tohto priečinku"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove this folder"
 msgstr "Trvalo odstrániť tento priečinok"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:20
+#, fuzzy
+msgid "Re_fresh..."
+msgstr "Aktualizovať"
+
+#: ../ui/evolution-mail-list.xml.h:21
+#, fuzzy
+msgid "Refresh the folder"
+msgstr "Aktualizujem priečinok"
+
+#: ../ui/evolution-mail-list.xml.h:22
 #, fuzzy
 msgid "Select Message _Thread"
 msgstr "Všetky _hlavičky správy"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select _All Messages"
 msgstr "Vybrať _všetky správy"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Vyberie všetky správy, ktoré momentálne nie sú vybrané"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Vyberie všetky správy v rovnakom vlákne ako je vybraná správa"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all visible messages"
 msgstr "Vybrať všetky viditeľné správy"
 
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Sh_ow Hidden Messages"
+#: ../ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "Show Hidde_n Messages"
 msgstr "Z_obraziť skryté správy"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Show messages that have been temporarily hidden"
 msgstr "Zobraziť správy, ktoré boli dočasne skryté"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Dočasne skryť všetky správy, ktoré už boli prečítané"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Temporarily hide the selected messages"
 msgstr "Dočasne skryť vybrané správy"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Threaded Message list"
 msgstr "Zoznam vlákien"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:33
+#, fuzzy
+msgid "_Group By Threads"
+msgstr "Zoskupiť podľa _vláken"
+
+#: ../ui/evolution-mail-list.xml.h:34 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Správa"
@@ -18363,82 +21001,98 @@ msgstr "Odpovedať do konferencie tejto správy"
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Odpovedať odosielateľovi tejto správy"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "Kopírovať vybrané správy do iného priečinka"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Copy selected messages to the clipboard"
+msgstr "Kopírovať vybrané správy do schránky"
+
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "Vytvoriť pr_avidlo"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a Search Folder for these recipients"
 msgstr "Vytvoriť vPriečinok pre týchto adresátov"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a Search Folder for this mailing list"
 msgstr "Vytvoriť vPriečinok pre túto konferenciu"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Create a Search Folder for this sender"
 msgstr "Vytvoriť vPriečinok pre tohoto odosielateľa"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Create a Search Folder for this subject"
 msgstr "Vytvoriť vPriečinok pre tento predmet"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "Vytvorí pravidlo pre filtrovanie správ od tohto odosielateľa"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Vytvorí pravidlo pre filtrovanie správ týmto adresátom"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Vytvoriť pravidlo pre filtrovanie správ pre túto konferenciu"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "Vytvoriť pravidlo pre filtrovanie správ s týmto predmetom"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Cut selected messages to the clipboard"
+msgstr "Vystrihnúť vybrané správy do schránky"
+
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Zmenšič veľkosť písma"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Prejsť na nasledujúcu dôležitú správu"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Prejsť na nasledujúcu správu"
 
+#: ../ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "Display the next thread"
+msgstr "Prejsť na nasledujúcu neprečítané vlákno"
+
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr "Prejsť na nasledujúcu neprečítanú správu"
 
 #: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the next unread thread"
-msgstr "Prejsť na nasledujúcu neprečítané vlákno"
-
-#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous important message"
 msgstr "Prejsť na predchádzajúcu dôležitú správu"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Prejsť na predchádzajúcu správu"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Prejsť na predchádzajúcu neprečítanú správu"
 
+#: ../ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "F_orward As..."
+msgstr "_Poslať kontakt ďalej..."
+
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filter na _konferenciu..."
@@ -18461,7 +21115,8 @@ msgid "Filter the selected messages for junk status"
 msgstr "Označí vybrané správy ako nedôležité"
 
 #: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
+#, fuzzy
+msgid "Flag selected messages for follow-up"
 msgstr "Označí vybrané správy pre follow up"
 
 #: ../ui/evolution-mail-message.xml.h:40
@@ -18497,29 +21152,33 @@ msgid "Mar_k as"
 msgstr "Oz_načiť ako"
 
 #: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
+#, fuzzy
+msgid "Mark the selected messages as having been read"
 msgstr "Označí vybrané správy ako už prečítané"
 
 #: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
+#, fuzzy
+msgid "Mark the selected messages as important"
 msgstr "Označí vybrané správy ako dôležité"
 
 #: ../ui/evolution-mail-message.xml.h:52
 #, fuzzy
-msgid "Mark the selected message(s) as junk"
+msgid "Mark the selected messages as junk"
 msgstr "Označiť vybrané správy ako nedôležité"
 
 #: ../ui/evolution-mail-message.xml.h:53
 #, fuzzy
-msgid "Mark the selected message(s) as not being junk"
+msgid "Mark the selected messages as not being junk"
 msgstr "Označiť vybrané správy ako neprečítané"
 
 #: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
+#, fuzzy
+msgid "Mark the selected messages as not having been read"
 msgstr "Označiť vybrané správy ako neprečítané"
 
 #: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
 msgstr "Označiť vybrané správy ako nedôležité"
 
 #: ../ui/evolution-mail-message.xml.h:56
@@ -18527,442 +21186,534 @@ msgid "Mark the selected messages for deletion"
 msgstr "Označiť vybrané správy na zmazanie"
 
 #: ../ui/evolution-mail-message.xml.h:57
-msgid "Message Source"
-msgstr "Zdroj správy"
-
-#: ../ui/evolution-mail-message.xml.h:58
-msgid "Move"
-msgstr "Presunúť"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Move selected message(s) to another folder"
+#, fuzzy
+msgid "Move selected messages to another folder"
 msgstr "Presunúť vybrané správy do iného priečinku"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr "Nasledujúca _dôležitá správa"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "Nasledujúce _vlákno"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "Nasledujúca _neprečítaná správa"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr "Otvoriť okno pre písanie správy"
 
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "Open the selected message in a new window"
+#: ../ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Open the selected messages in a new window"
 msgstr "Otvoriť aktuálnu správu v novom okne"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Open the selected message in the composer for editing"
+msgid "Open the selected messages in the composer for editing"
 msgstr "Otvoriť vybranú správu v composeri pre úpravu"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr "Predchádzajúca n_eprečítaná správa"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Paste messages from the clipboard"
+msgstr "Vložiť správy zo schránky"
+
+#: ../ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Pos_t New Message to Folder"
 msgstr "Poslať správu do verejného priečinku"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "Poslať odpov_eď"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
 msgstr "Poslať správu do verejného priečinku"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
 msgstr "Poslať odpoveď na správu vo verejnom priečinku"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "P_redchádzajúca dôležitá správa"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
 msgstr "Náhľad správy pred tlačou"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
 msgstr "Vytlačí túto správu"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
 msgstr "_Presmerovať"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Presmeruje (bounce) vybranú správu niekomu inému"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "Vráti text na jeho pôvodnú veľkosť"
 
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Save the message as a text file"
+#: ../ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "Save the selected messages as a text file"
 msgstr "Uložiť správu do textového súboru"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Search Folder from Mailing _List..."
 msgstr "VPriečinok na _poštový zoznam..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 #, fuzzy
-msgid "Search Folder from Recipients..."
+msgid "Search Folder from Recipien_ts..."
 msgstr "Vpriečinok na adresátov..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Search Folder from S_ubject..."
 msgstr "Vpriečinok na _predmet..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "Search Folder from Sen_der..."
 msgstr "Vpriečinok na _odosielateľa..."
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "Vybrať _celý text"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
 msgstr "Vybrať celý text správy"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:25
 msgid "Set up the page settings for your current printer"
 msgstr "Nastaví stránku pre aktuálnu tlačiareň"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Zobraziť blikajúci kurzor v texte zobrazenej správy"
 
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message in the normal style"
+#: ../ui/evolution-mail-message.xml.h:95
+#, fuzzy
+msgid "Show messages in the normal style"
 msgstr "Zobraziť správu normálne"
 
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "Show message with all email headers"
+#: ../ui/evolution-mail-message.xml.h:96
+#, fuzzy
+msgid "Show messages with all email headers"
 msgstr "Zobraziť správu so všetkými hlavičkami"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "Zobraziť zdrojový poštový formát v správe"
 
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Un-delete the selected messages"
+#: ../ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "Undelete the selected messages"
 msgstr "Obnoviť vybrané správy"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
 msgstr "Nedô_ležité"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
 msgstr "Zme_nšiť"
 
+#: ../ui/evolution-mail-message.xml.h:101
+#, fuzzy
+msgid "_Attached"
+msgstr "Priložiť"
+
 #: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Clear Flag"
+msgstr "Vyčistiť _značku"
+
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
 msgstr "_Odstrániť správu"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Find in Message..."
 msgstr "_Nájsť v správe..."
 
 #: ../ui/evolution-mail-message.xml.h:109
+#, fuzzy
+msgid "_Flag Completed"
+msgstr "Označiť ako _Dokončený"
+
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "_Prejsť na"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Important"
 msgstr "_Dôležité"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:113
+#, fuzzy
+msgid "_Inline"
+msgstr "v texte"
+
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Load Images"
 msgstr "_Načítať obrázky"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:117
+#, fuzzy
+msgid "_Message Source"
+msgstr "Zdroj správy"
+
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "_Nasledujúca správa"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Normal Size"
 msgstr "_Normálna veľkosť"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
 msgstr "_Otvoriť v novom okne"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "_Predchádzajúca správa"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:125
+#, fuzzy
+msgid "_Quoted"
+msgstr "Citovať"
+
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Uložiť správu..."
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Obnoviť vymazanú správu"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "_Neprečítané"
 
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Zoom In"
+#: ../ui/evolution-mail-message.xml.h:131
+#, fuzzy
+msgid "_Zoom"
 msgstr "_Zväčšiť"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Zavrieť"
+#: ../ui/evolution-mail-message.xml.h:132
+msgid "_Zoom In"
+msgstr "_Zväčšiť"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Zavrie toto okno"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Hlavný panel nástrojov"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Zavrieť"
+#: ../ui/evolution-memos.xml.h:3
+#, fuzzy
+msgid "Copy selected memo"
+msgstr "Kopíruje vybranú úlohu"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
-msgid "_File"
-msgstr "_Súbor"
+#: ../ui/evolution-memos.xml.h:5
+#, fuzzy
+msgid "Cut selected memo"
+msgstr "Vystihne vybranú úlohu"
 
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Priložiť"
+#: ../ui/evolution-memos.xml.h:7
+#, fuzzy
+msgid "Delete selected memos"
+msgstr "Odstrániť vybrané úlohy"
+
+#: ../ui/evolution-memos.xml.h:9
+#, fuzzy
+msgid "Paste memo from the clipboard"
+msgstr "Vloží text zo schránky"
+
+#: ../ui/evolution-memos.xml.h:10
+#, fuzzy
+msgid "Previews the list of memos to be printed"
+msgstr "Náhľad zoznamu kontaktov pred tlačou"
+
+#: ../ui/evolution-memos.xml.h:13
+#, fuzzy
+msgid "Print the list of memos"
+msgstr "Vytlačiť zoznam úloh"
+
+#: ../ui/evolution-memos.xml.h:14
+#, fuzzy
+msgid "View the selected memo"
+msgstr "Zobraziť vybranú úlohu"
+
+#: ../ui/evolution-memos.xml.h:18
+#, fuzzy
+msgid "_Open Memo"
+msgstr "_Otvoriť správy"
 
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Priložiť súbor"
 
-#: ../ui/evolution-message-composer.xml.h:3
-msgid "Check to get delivery notification when your message is read"
-msgstr ""
-
 #.
 #. <cmd name="FileSave" _label="Save"
 #. _tip="Save the current file" pixtype="stock" pixname="Save"
 #. accel="*Ctrl*s"/>
 #.
-#: ../ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:4
 #: ../ui/evolution-signature-editor.xml.h:13
 msgid "Close the current file"
 msgstr "Zavrie aktuálny súbor"
 
-#: ../ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Odstrániť všetko okrem podpisu"
 
-#: ../ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Zašifrovať túto správu pomocou PGP"
 
-#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Zašifrovať túto správu vaším šifrovacím certifikátom S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
 msgstr "_Formát"
 
+#: ../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 "_Obrátiť výber"
+
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "OtvorĂ súbor"
 
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Šifrovanie PGP"
 
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: ../ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:17
 #, fuzzy
-msgid "Request read receipt"
+msgid "PGP _Encrypt"
+msgstr "Šifrovanie PGP"
+
+#: ../ui/evolution-message-composer.xml.h:18
+#, fuzzy
+msgid "PGP _Sign"
+msgstr "Podpis PGP"
+
+#: ../ui/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "R_equest Read Receipt"
 msgstr "Správa o prečítaní"
 
-#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "S/MIME En_crypt"
+msgstr "Šifrovanie S/MIME"
+
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "S/MIME Encrypt"
 msgstr "Šifrovanie S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "S/MIME Sig_n"
+msgstr "Podpis S/MIME"
+
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "S_end"
+msgstr "Poslať"
+
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save As"
 msgstr "Uložiť ako"
 
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Save Draft"
 msgstr "Uložiť _koncept"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save _As..."
 msgstr "Uložiť _ako..."
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Save _Draft"
 msgstr "Uložiť _koncept"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Save as draft"
 msgstr "Uložiť ako koncept"
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Save in folder..."
 msgstr "Uložiť v priečinku..."
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Save the current file"
 msgstr "Uložiť aktuálny súbor"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Save the current file with a different name"
 msgstr "Uloží aktuálny súbor pod iným menom"
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Save the message in a specified folder"
 msgstr "Uložiť správu do daného priečinku"
 
-#: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:35
+msgid "Send"
+msgstr "Poslať"
+
+#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "Poslať správu vo formáte HTML"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Send this message"
 msgstr "Poslať túto správu"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:38
+#, fuzzy
+msgid "Set the message priority to high"
+msgstr "Uložiť správu do textového súboru"
+
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Sign this message with your PGP key"
 msgstr "Podpísať túto správu kľúčom PGP"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpísať túto správu podpisovým certifikátor S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Prepne, či má byť zobrazené pole BCC"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "Toggles whether the CC field is displayed"
 msgstr "Prepne, či má byť zobrazené pole CC"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Prepne, či má byť zobrazené pole pre výber odosielateľa"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Prepne, či má byť zobrazené pole Post-To"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Prepne, či má byť zobrazené pole Reply-To"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "Toggles whether the To field is displayed"
 msgstr "Prepne, či má byť zobrazené pole To"
 
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "_Attachment..."
-msgstr "_Príloha..."
-
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Bcc Field"
 msgstr "Pole _BCC"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Cc Field"
 msgstr "Pole _CC"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Delete all"
 msgstr "_Odstrániť všetky"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_From Field"
 msgstr "Pole _Od"
 
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-msgstr "_Vložiť"
-
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_Open..."
 msgstr "_Otvoriť..."
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:56
 msgid "_Post-To Field"
 msgstr "Pole _Post-To"
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:57
+#, fuzzy
+msgid "_Prioritize Message"
+msgstr "Tlačiť správu"
+
+#: ../ui/evolution-message-composer.xml.h:58
 msgid "_Reply-To Field"
 msgstr "Pole _Reply-To"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:60
 msgid "_Security"
 msgstr "Za_bezpečenie"
 
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:61
+#: ../ui/evolution-task-editor.xml.h:23
+#, fuzzy
+msgid "_Send Options"
+msgstr "Popis:"
+
+#: ../ui/evolution-message-composer.xml.h:62
 msgid "_To Field"
 msgstr "Pole _To"
 
@@ -18974,18 +21725,18 @@ msgstr "_Zavrieť"
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:17
 msgid "Save and Close"
 msgstr "Uložiť a zavrieť"
 
 #.
 #. <menuitem name="FileSave" verb="" _label="_Save"/>
 #.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:21
 msgid "Save and _Close"
 msgstr "Uložiť a _zavrieť"
 
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:22
 msgid "Save the current file and close the window"
 msgstr "Uložiť aktuálny súbor a zavrieť okno"
 
@@ -19017,12 +21768,33 @@ msgstr "Odhlásiť"
 msgid "_Invert Selection"
 msgstr "_Obrátiť výber"
 
+#: ../ui/evolution-task-editor.xml.h:4
+msgid "Click change / view the status details of the task"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:9
+#, fuzzy
+msgid "Status Details"
+msgstr "Stav: %s"
+
+#: ../ui/evolution-task-editor.xml.h:10
+#, fuzzy
+msgid "Time Zone"
+msgstr "Časová zóna "
+
+#: ../ui/evolution-task-editor.xml.h:24
+#, fuzzy
+msgid "_Status Details"
+msgstr "Stav: %s"
+
 #: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
+#, fuzzy
+msgid "Copy selected tasks"
 msgstr "Kopíruje vybranú úlohu"
 
 #: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
+#, fuzzy
+msgid "Cut selected tasks"
 msgstr "Vystihne vybranú úlohu"
 
 #: ../ui/evolution-tasks.xml.h:7
@@ -19042,7 +21814,8 @@ msgid "Mark selected tasks as complete"
 msgstr "Označiť vybrané úlohy ako dokončené"
 
 #: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
+#, fuzzy
+msgid "Paste tasks from the clipboard"
 msgstr "Vložiť úlohu zo schránky"
 
 #: ../ui/evolution-tasks.xml.h:13
@@ -19054,10 +21827,20 @@ msgid "Print the list of tasks"
 msgstr "Vytlačiť zoznam úloh"
 
 #: ../ui/evolution-tasks.xml.h:18
+#, fuzzy
+msgid "Show task preview window"
+msgstr "Zobraziť okno s náhľadom kontaktu"
+
+#: ../ui/evolution-tasks.xml.h:19
+#, fuzzy
+msgid "Task _Preview"
+msgstr "_Náhľad správy"
+
+#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "Zobraziť vybranú úlohu"
 
-#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution-tasks.xml.h:27
 msgid "_Open Task"
 msgstr "_Otvoriť úlohu"
 
@@ -19099,17 +21882,18 @@ msgid "Exit the program"
 msgstr "Ukončiť program"
 
 #: ../ui/evolution.xml.h:11
-msgid "Forget _Passwords"
-msgstr "Zabudnúť _heslá"
-
-#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zabudnúť uložené heslá, takže ich budete musieť znovu zadať"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:12
 msgid "Hide window buttons"
 msgstr "Skryť tlačidla okna"
 
+#: ../ui/evolution.xml.h:13
+#, fuzzy
+msgid "I_mport..."
+msgstr "_Importovať..."
+
 #: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
 msgstr "Ikony _a text"
@@ -19118,31 +21902,60 @@ msgstr "Ikony _a text"
 msgid "Import data from other programs"
 msgstr "Importovať dáta z iných programov"
 
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:16
+msgid "Lay_out"
+msgstr ""
+
+#: ../ui/evolution.xml.h:18
 msgid "New _Window"
 msgstr "Nové _okno"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
+#, fuzzy
+msgid "Page Set_up..."
+msgstr "Nastavenie stránky:"
+
+#: ../ui/evolution.xml.h:20
 msgid "Prefere_nces"
 msgstr "Pred_voľby"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:21
 msgid "Send / Receive"
 msgstr "Príjem / odoslanie"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:22
+#, fuzzy
+msgid "Send / _Receive"
+msgstr "Príjem / odoslanie"
+
+#: ../ui/evolution.xml.h:23
 msgid "Send queued items and retrieve new items"
 msgstr "Poslať neodoslanú poštu a prijať novú poštu"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:24
 msgid "Set up Pilot configuration"
 msgstr "Nastavenie Pilota"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:26
+#, fuzzy
+msgid "Show Side _Bar"
+msgstr "Zobraziť jeden deň"
+
+#: ../ui/evolution.xml.h:27
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "So _stavom"
+
+#: ../ui/evolution.xml.h:28
+#, fuzzy
+msgid "Show _Toolbar"
+msgstr "_Lišta nástrojov"
+
+#: ../ui/evolution.xml.h:29
 msgid "Show information about Evolution"
 msgstr "Zobraziť informácie o programe Evolution"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:30
 msgid "Submit Bug Report"
 msgstr "Poslať správu o chybe"
 
@@ -19150,80 +21963,74 @@ msgstr "Poslať správu o chybe"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:35
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:36
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 "Poslať správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v núdzi."
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Prepne, či pracujete on alebo off-line."
 
-#: ../ui/evolution.xml.h:31
-msgid "Tool_bar"
-msgstr "_Lišta nástrojov"
-
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:38
 msgid "Tool_bar style"
 msgstr "Štýl _lišty nástrojov"
 
-#: ../ui/evolution.xml.h:33
-msgid "_About Evolution..."
-msgstr "_O programe Evolution..."
+#: ../ui/evolution.xml.h:39
+msgid "View/Hide the Side Bar"
+msgstr ""
+
+#: ../ui/evolution.xml.h:40
+msgid "View/Hide the Status Bar"
+msgstr ""
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:41
+#, fuzzy
+msgid "_About"
+msgstr "_Názov účtu:"
+
+#: ../ui/evolution.xml.h:42
 msgid "_Close Window"
 msgstr "_Zatvoriť okno"
 
-#: ../ui/evolution.xml.h:37
-msgid "_Help"
-msgstr "_Pomocník"
+#: ../ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Forget Passwords"
+msgstr "Zabudnúť _heslá"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:47
 msgid "_Hide buttons"
 msgstr "_Skryť tlačidlá"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:48
 msgid "_Icons only"
 msgstr "Len _ikony"
 
-#: ../ui/evolution.xml.h:40
-msgid "_Import..."
-msgstr "_Importovať..."
-
-#: ../ui/evolution.xml.h:41
-msgid "_New"
-msgstr "_Nový"
-
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Rýchle odkazy"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Ukončiť"
 
-#: ../ui/evolution.xml.h:44
-msgid "_Send / Receive"
-msgstr "_Poslať / Prijať"
-
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "Voľby _synchronizácie..."
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:54
 msgid "_Text only"
 msgstr "Len _text"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Okno"
 
@@ -19235,9 +22042,9 @@ msgstr "Podľa _firmy"
 msgid "_Address Cards"
 msgstr "Karty _adresára"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "_Telefónny zoznam"
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "_Zoznam"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -19247,10 +22054,6 @@ msgstr "_Týždeň"
 msgid "_Day View"
 msgstr "_Deň"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "_Zoznam"
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Mesiac"
@@ -19260,29 +22063,44 @@ msgid "_Work Week View"
 msgstr "_Pracovný týždeň"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As _Sent Folder"
+#, fuzzy
+msgid "As Sent Folder for Wi_de View"
 msgstr "Ako priečinok odo_slaných"
 
 #: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "Ako priečinok odo_slaných"
+
+#: ../views/mail/galview.xml.h:3
 msgid "By S_tatus"
 msgstr "Podľa s_tavu"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
 msgstr "Podľa odosie_lateľa"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:5
 msgid "By Su_bject"
 msgstr "Podľa pre_dmetu"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
 msgstr "Podľa príznaku _Follow up"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:7
+#, fuzzy
+msgid "For _Wide View"
+msgstr "Pracovný týždeň"
+
+#: ../views/mail/galview.xml.h:8
 msgid "_Messages"
 msgstr "_Správy"
 
+#: ../views/memos/galview.xml.h:1
+#, fuzzy
+msgid "_Memos"
+msgstr "Čle_novia"
+
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "S _termínom"
@@ -19291,29 +22109,33 @@ msgstr "S _termínom"
 msgid "With _Status"
 msgstr "So _stavom"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#. Put the ""UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:410
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "<b>Time Zones</b>"
 msgstr "<b>Časové zóny</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>_Selection</b>"
 msgstr "<b>_Výber</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "Select a Time Zone"
 msgstr "Vyberte časovú zónu"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 #, fuzzy
 msgid "TimeZone Combobox"
 msgstr "Časová zóna "
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -19323,19 +22145,19 @@ msgstr ""
 "zónu.\n"
 "Pre zmenšenie použite pravé tlačidlo myši."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr ""
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:360
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definovať pohľady pre %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "Definovať pohľady"
 
@@ -19344,358 +22166,467 @@ msgstr "Definovať pohľady"
 msgid "Define Views for \"%s\""
 msgstr "Definovať pohľady pre \"%s\""
 
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "_Upraviť..."
-
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tabuľka"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:179
 msgid "Instance"
 msgstr "Výskyt"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:229
 msgid "Save Current View"
 msgstr "Uložiť aktuálny pohľad"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "_Create new view"
 msgstr "_Vytvoriť novú úlohu"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Replace existing view"
 msgstr "_Nahradiť existujúci pohľad"
 
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-menus.c:354
+msgid "Custom View"
+msgstr "Vlastný pohľad"
+
+#: ../widgets/menus/gal-view-instance.c:583
+#, fuzzy
+msgid "Save Custom View"
+msgstr "Uložiť vlastný pohľad..."
+
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:378
+msgid "Define Views..."
+msgstr "Definovať pohľady..."
+
 #: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "_Aktuálny pohľad"
+#, fuzzy
+msgid "C_urrent View"
+msgstr "Aktuálny pohľad"
+
+#: ../widgets/menus/gal-view-menus.c:315
+#, fuzzy, c-format
+msgid "Select View: %s"
+msgstr "Pohľad na týždeň: %s. %s"
 
 #: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr ""
+
+#: ../widgets/menus/gal-view-menus.c:364
 msgid "Save Custom View..."
 msgstr "Uložiť vlastný pohľad..."
 
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-menus.c:369
+#, fuzzy
+msgid "Save current custom view"
+msgstr "Uložiť aktuálny pohľad"
+
+#: ../widgets/menus/gal-view-menus.c:383
+#, fuzzy
+msgid "Create or edit views"
+msgstr "_Vytvoriť novú úlohu"
+
+#: ../widgets/menus/gal-view-new-dialog.c:72
 msgid "Factory"
 msgstr "Vytváracie rozhranie"
 
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:107
 msgid "Define New View"
 msgstr "Definovať nový pohľad"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
 msgid "Name of new view:"
 msgstr "Názov nového pohľadu:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 #, fuzzy
 msgid "Type of View"
 msgstr "Typ pohľadu:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:4
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of view:"
 msgstr "Typ pohľadu:"
 
+#: ../widgets/misc/e-attachment-bar.c:1029
+#, fuzzy
+msgid "Attachment Bar"
+msgstr "Príloha"
+
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:507 ../widgets/misc/e-attachment.c:524
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Nie je možné priložiť súbor %s: %s"
+
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:516
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Nie je možné priložiť súbor %s: nie je to normálny súbor"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "Vlastnosti prílohy"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "Meno súboru:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "Typ MIME:"
+
+#: ../widgets/misc/e-attachment.glade.h:5
+msgid "Suggest automatic display of attachment"
+msgstr "Navrhnúť automatické zobrazovanie príloh"
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "PUSŠPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1097
+#: ../widgets/misc/e-calendar-item.c:1088
+#: ../widgets/misc/e-calendar-item.c:1742
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-msgid "Previous Button"
-msgstr "Predchádzajúce tlačidlo"
-
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Kalendár mesiaca"
 
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/misc/e-canvas-background.c:453
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3635
+#: ../widgets/text/e-text.c:3636
 msgid "Fill color"
 msgstr "Farba výplne"
 
-#: ../widgets/misc/e-canvas-background.c:463
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
+#: ../widgets/misc/e-canvas-background.c:460
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3643 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651
 msgid "GDK fill color"
 msgstr "Farba výplne GDK"
 
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3657
+#: ../widgets/text/e-text.c:3658
 msgid "Fill stipple"
 msgstr "Bodkovanie výplne"
 
-#: ../widgets/misc/e-canvas-background.c:484
-#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:491
-#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:498
-#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:505
-#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3005
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-item.c:3014
 msgid "Minimum width"
 msgstr "Minimálna šírka"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum Width"
 msgstr "Minimálna šírka"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr ""
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
+#: ../widgets/misc/e-cell-date-edit.c:231
 msgid "Now"
 msgstr "Teraz"
 
-#: ../widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:795
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Čas musí byť vo formáte: %s"
 
-#: ../widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Percentuálna hodnota musí byť medzi 0 až 100"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Arabic"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Baltic"
 msgstr "Pobaltská"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Central European"
 msgstr "Stredoeurópska"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Chinese"
 msgstr "Čínska"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Greek"
 msgstr "Grécka"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Hebrew"
 msgstr "Hebrejská"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Japanese"
 msgstr "Japonská"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Korean"
 msgstr "Kórejská"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:74
+#, fuzzy
+msgid "Thai"
+msgstr "Št"
+
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Turkish"
 msgstr "Turecká"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:77
 msgid "Western European"
 msgstr "Západoeurópska"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:78
 msgid "Western European, New"
 msgstr "Západoeurópska, nová"
 
-#: ../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:97 ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
 msgid "Traditional"
 msgstr "Tradičná"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
+#: ../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
 msgid "Simplified"
 msgstr "Zjednodušená"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Ukrainian"
 msgstr "Ukrajinská"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:109
 msgid "Visual"
 msgstr "Vizuálna"
 
-#: ../widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:178
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Neznáma znaková sada: %s"
 
-#: ../widgets/misc/e-charset-picker.c:216
-#: ../widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:223
 msgid "Character Encoding"
 msgstr "Znaková sada"
 
-#: ../widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:238
 msgid "Enter the character set to use"
 msgstr "Zadajte znakovú sadu, ktorú chcete použiť"
 
-#: ../widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:345
 msgid "Other..."
 msgstr "Iné..."
 
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#: ../widgets/misc/e-charset-picker.c:486
+#, fuzzy
+msgid "Ch_aracter Encoding"
+msgstr "Znaková sada"
 
-#: ../widgets/misc/e-dateedit.c:316
-msgid "Date and Time Entry"
+#: ../widgets/misc/e-dateedit.c:322
+#, fuzzy
+msgid "Date and Time"
 msgstr "Vstup dátumu a času"
 
-#: ../widgets/misc/e-dateedit.c:335
+#: ../widgets/misc/e-dateedit.c:343
 msgid "Text entry to input date"
 msgstr "Textový vstup na zadanie dátumu"
 
-#: ../widgets/misc/e-dateedit.c:336
-msgid "Text Date Entry"
-msgstr "Textový vstup dátumu"
-
-#: ../widgets/misc/e-dateedit.c:353
+#: ../widgets/misc/e-dateedit.c:365
 msgid "Click this button to show a calendar"
 msgstr "Kliknutím na toto tlačidlo zobrazíte kalendár"
 
-#: ../widgets/misc/e-dateedit.c:354
-msgid "Date Button"
-msgstr "Tlačidlo dátumu"
-
-#: ../widgets/misc/e-dateedit.c:374
+#: ../widgets/misc/e-dateedit.c:407
 msgid "Combo box to select time"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:375
-msgid "Time Combo Box"
-msgstr ""
+#: ../widgets/misc/e-dateedit.c:408
+#, fuzzy
+msgid "Time"
+msgstr "Časová zóna "
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-dateedit.c:482
+#, fuzzy
+msgid "No_w"
+msgstr "Teraz"
+
+#: ../widgets/misc/e-dateedit.c:488
+#, fuzzy
+msgid "_Today"
+msgstr "Dnes"
+
+#: ../widgets/misc/e-dateedit.c:1641
+#, fuzzy
+msgid "Invalid Date Value"
+msgstr "Upraviť podpis"
+
+#: ../widgets/misc/e-dateedit.c:1667
+#, fuzzy
+msgid "Invalid Time Value"
+msgstr "Upraviť podpis"
+
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Rozbalené"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "Či má byť expander rozbalený"
 
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "Text návestia expandera"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "Použiť podčiarknutie"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "Medzeru, ktorú vložiť medzi návestie a potomka"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3354
 msgid "Expander Size"
 msgstr "Veľkosť expandera"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3355
 msgid "Size of the expander arrow"
 msgstr "Veľkosť šípok expandera"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "Medzera okolo šípky expandera"
 
-#: ../widgets/misc/e-filter-bar.c:195
-msgid "_Searches"
-msgstr "_Hľadania"
-
-#: ../widgets/misc/e-filter-bar.c:197
-msgid "Search Editor"
-msgstr "Editor hľadania"
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:182
+#: ../widgets/misc/e-filter-bar.c:310 ../widgets/misc/e-filter-bar.c:747
+msgid "Advanced Search"
+msgstr "Pokročilé hľadanie"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:233
 msgid "Save Search"
 msgstr "Uložiť hľadanie"
 
-#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.c:270
+msgid "_Searches"
+msgstr "_Hľadania"
+
+#: ../widgets/misc/e-filter-bar.c:272
+#, fuzzy
+msgid "Searches"
+msgstr "_Hľadania"
+
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
 msgid "_Save Search..."
 msgstr "_Uložiť hľadanie..."
 
-#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
 msgid "_Edit Saved Searches..."
 msgstr "_Upraviť uložené hľadania..."
 
-#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Advanced Search..."
 msgstr "_Pokročilé hľadanie..."
 
+#: ../widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "All Accounts"
+msgstr "Poštové účty"
+
+#: ../widgets/misc/e-filter-bar.h:104
+#, fuzzy
+msgid "Current Account"
+msgstr "Zdrojový účet"
+
+#: ../widgets/misc/e-filter-bar.h:105
+#, fuzzy
+msgid "Current Folder"
+msgstr "Vytvoriť nový priečinok"
+
+#: ../widgets/misc/e-filter-bar.h:106
+#, fuzzy
+msgid "Current Message"
+msgstr "Tlačiť správu"
+
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Vybrať obrázok"
 
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:626
 msgid "World Map"
 msgstr "Svetová mapa"
 
-#: ../widgets/misc/e-map.c:649
+#: ../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."
@@ -19713,82 +22644,95 @@ msgstr "Synchronizovať súkromné záznamy:"
 msgid "Sync Categories:"
 msgstr "Synchronizované kategórie:"
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "Prázdna správa"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
 #, fuzzy
 msgid "Reflow model"
 msgstr "Model výberu"
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "Šírka stĺpca"
 
-#. To translators: This is the accessibility name of
-#. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:345
-msgid "Search Text Entry"
-msgstr "Vstupné pole vyhľadávania"
+#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
+#: ../widgets/misc/e-search-bar.c:479
+#, fuzzy
+msgid "Search"
+msgstr "_Nájsť"
+
+#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
+#: ../widgets/misc/e-search-bar.c:479
+#, fuzzy
+msgid "Click here to change the search type"
+msgstr "Kliknutím pridáte účastníka"
 
-#: ../widgets/misc/e-search-bar.c:549
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "_Nájsť"
 
-#: ../widgets/misc/e-search-bar.c:555
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "_Nájsť teraz"
 
-#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "_Vyčistiť"
 
-#: ../widgets/misc/e-search-bar.c:647
-msgid "Search Type"
-msgstr "Typ hľadania"
-
-#: ../widgets/misc/e-search-bar.c:851
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "ID položky"
 
-#: ../widgets/misc/e-search-bar.c:858
-msgid "Subitem ID"
-msgstr "ID podpoložky"
-
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
-#: ../widgets/text/e-text.c:3463
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3557
+#: ../widgets/text/e-text.c:3558
 msgid "Text"
 msgstr "Text"
 
-#: ../widgets/misc/e-search-bar.c:945
-msgid "Find _Now"
-msgstr "Nájsť _teraz"
+#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
+#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
+#: ../widgets/misc/e-search-bar.c:1010
+msgid "Sho_w: "
+msgstr ""
 
-#: ../widgets/misc/e-selection-model-array.c:546
-#: ../widgets/table/e-tree-selection-model.c:811
+#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
+#. the term to search for
+#: ../widgets/misc/e-search-bar.c:1027
+#, fuzzy
+msgid "Sear_ch: "
+msgstr "_Nájsť"
+
+#. To Translators: The " in " label is part of the Quick Search Bar, example:
+#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
+#: ../widgets/misc/e-search-bar.c:1039
+#, fuzzy
+msgid " i_n "
+msgstr " a "
+
+#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "Riadok kurzora"
 
-#: ../widgets/misc/e-selection-model-array.c:553
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "Stĺpec kurzora"
 
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:210
 msgid "Sorter"
 msgstr "Triedenie"
 
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:217
 msgid "Selection Mode"
 msgstr "Režim výberu"
 
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:225
 msgid "Cursor Mode"
 msgstr "Režim kurzora"
 
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "Pri odstrá_není:"
 
@@ -19813,7 +22757,8 @@ msgid "A_uto-delete sent item"
 msgstr "A_utomaticky odstrániť odoslanú položku"
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "C_lassification"
+#, fuzzy
+msgid "Classification"
 msgstr "K_lasifikácia"
 
 #: ../widgets/misc/e-send-options.glade.h:7
@@ -19839,23 +22784,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Public\n"
-"Private\n"
+"Normal\n"
+"Proprietary\n"
 "Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
 msgstr ""
-"Verejné\n"
-"Súkromné\n"
-"Tajné\n"
 
-#: ../widgets/misc/e-send-options.glade.h:16
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "R_eply requested"
 msgstr "V_yžadovaná odpoveď"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid "Sta_tus Tracking"
 msgstr "Sledovanie s_tavu"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:21
 msgid ""
 "Undefined\n"
 "High\n"
@@ -19867,233 +22812,209 @@ msgstr ""
 "Štandardné\n"
 "Nízke"
 
-#: ../widgets/misc/e-send-options.glade.h:23
-#, fuzzy
-msgid "W_ithin"
-msgstr "Šírka"
-
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When acce_pted:"
 msgstr "Pri akce_ptovaní:"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When co_mpleted:"
 msgstr "Pri doko_nčení:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "When decli_ned:"
 msgstr "Pri _neprijatí:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:28
+#, fuzzy
+msgid "Wi_thin"
+msgstr "Šírka"
+
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_After:"
 msgstr "_Po:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_All information"
 msgstr "_Všetky informácie"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Delay message delivery"
 msgstr "_Oneskoriť doručenie správy"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delivered"
 msgstr "_Doručené"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Set expiration date"
 msgstr "_Nastaviť dátum vypršania platnosti"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Until:"
 msgstr "_Kým:"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_When convenient"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When opened:"
 msgstr "_Pri otvorení:"
 
-#: ../widgets/misc/e-task-widget.c:208
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
+#: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: ../widgets/misc/e-task-widget.c:213
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
+#. %d is a number between 0 and 100, describing the percentage of operation complete
+#: ../widgets/misc/e-task-widget.c:219
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotových)"
 
 #: ../widgets/misc/e-url-entry.c:107
-msgid "click here to go to url"
+#, fuzzy
+msgid "Click here to go to URL"
 msgstr "kliknutím prejdete na url"
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:1
 msgid "Edit Master Category List..."
 msgstr ""
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Item(s) belong to these _categories:"
 msgstr "Položky patriace do týchto _kategórií:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:3
 msgid "_Available Categories:"
 msgstr "_Dostupné kategórie:"
 
-#: ../widgets/misc/gal-categories.glade.h:5
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "categories"
 msgstr "kategórie"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:169
 msgid "popup list"
 msgstr "prekryť zoznam"
 
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:62
 msgid "%l:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:383
 msgid "Selected Column"
 msgstr "Vybraný stĺpec"
 
-#: ../widgets/table/e-cell-pixbuf.c:404
+#: ../widgets/table/e-cell-pixbuf.c:390
 msgid "Focused Column"
 msgstr "Aktívny stĺpec"
 
-#: ../widgets/table/e-cell-pixbuf.c:411
+#: ../widgets/table/e-cell-pixbuf.c:397
 msgid "Unselected Column"
 msgstr "Neoznačený stĺpec"
 
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1804
 msgid "Strikeout Column"
 msgstr "Prečiarknutý stĺpec"
 
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1811
 msgid "Underline Column"
 msgstr "Podčiarknuť stĺpec"
 
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1818
 msgid "Bold Column"
 msgstr "Tučný stĺpec"
 
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1825
 msgid "Color Column"
 msgstr "Stĺpec farby"
 
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1839
 msgid "BG Color Column"
 msgstr "Stĺpec farby pozadia"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<- _Odstrániť"
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "Stav"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(Vzostupne)"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(Zostupne)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "Neutriedené"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "Bez zoskupovania"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:10
+msgid "Show Fields"
+msgstr "Zobraziť polia"
+
+#: ../widgets/table/e-table-config.c:664
+#, fuzzy
+msgid "Available Fields"
+msgstr "Do_stupné polia:"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 msgstr "Do_stupné polia:"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "Vzostupne"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
 msgstr "Vyčistiť všetko"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Zostupne"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:8
 #: ../widgets/table/e-table-config.glade.h:7
 msgid "Group Items By"
 msgstr "Zoskupiť položky podľa"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:8
 msgid "Move _Down"
 msgstr "Presunúť _dole"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Up"
 msgstr "Presunúť _hore"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "Z_obraziť tieto polia v poradí:"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
-#: ../widgets/table/e-table-config.glade.h:10
-msgid "Show Fields"
-msgstr "Zobraziť polia"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show field in View"
 msgstr "Zobraziť pole v pohľade"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:12
 msgid "Sort"
 msgstr "Triediť"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:15
 #: ../widgets/table/e-table-config.glade.h:13
 msgid "Sort Items By"
 msgstr "Triediť položky podľa"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:16
 #: ../widgets/table/e-table-config.glade.h:14
 msgid "Then By"
 msgstr "Potom podľa"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "_Pridať ->"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
 #: ../widgets/table/e-table-config.glade.h:16
 msgid "_Fields Shown..."
 msgstr "Zo_brazené polia..."
 
-#: ../widgets/table/e-table-config-no-group.glade.h:19
-#: ../widgets/table/e-table-config.glade.h:20
-msgid "_Sort..."
-msgstr "_Triediť..."
-
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Stav"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Ascending)"
-msgstr "(Vzostupne)"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Descending)"
-msgstr "(Zostupne)"
-
-#: ../widgets/table/e-table-config.c:314
-msgid "Not sorted"
-msgstr "Neutriedené"
-
-#: ../widgets/table/e-table-config.c:355
-msgid "No grouping"
-msgstr "Bez zoskupovania"
-
-#: ../widgets/table/e-table-config.c:584
-#, fuzzy
-msgid "Available Fields"
-msgstr "Do_stupné polia:"
-
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "_Zoskupiť podľa..."
@@ -20102,21 +23023,25 @@ msgstr "_Zoskupiť podľa..."
 msgid "_Show these fields in order:"
 msgstr "_Zobraziť tieto polia v poradí:"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
+#: ../widgets/table/e-table-config.glade.h:20
+msgid "_Sort..."
+msgstr "_Triediť..."
+
+#: ../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
 msgid "DnD code"
 msgstr "Kód DnD"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
+#: ../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
 msgid "Full Header"
 msgstr "Plná hlavička"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
 msgstr "Pridať stĺpec..."
 
@@ -20133,340 +23058,1091 @@ msgstr ""
 "Aby ste pridali stĺpec do vašej tabuľky,\n"
 "premiestnite ho na miesto, kde ho chcete mať."
 
-#: ../widgets/table/e-table-group-container.c:350
-#, c-format
+#: ../widgets/table/e-table-group-container.c:345
+#, fuzzy, c-format
 msgid "%s : %s (%d item)"
-msgstr "%s : %s (%d položka)"
+msgid_plural "%s : %s (%d items)"
+msgstr[0] "%s : %s (%d položka)"
+msgstr[1] "%s : %s (%d položka)"
+msgstr[2] "%s : %s (%d položka)"
 
 #: ../widgets/table/e-table-group-container.c:351
-#, c-format
-msgid "%s : %s (%d items)"
-msgstr "%s : %s (%d položiek)"
-
-#: ../widgets/table/e-table-group-container.c:356
-#, c-format
+#, fuzzy, c-format
 msgid "%s (%d item)"
-msgstr "%s (%d položka)"
-
-#: ../widgets/table/e-table-group-container.c:357
-#, c-format
-msgid "%s (%d items)"
-msgstr "%s (%d položiek)"
-
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d položka)"
+msgstr[1] "%s (%d položka)"
+msgstr[2] "%s (%d položka)"
+
+#: ../widgets/table/e-table-group-container.c:896
+#: ../widgets/table/e-table-group-container.c:897
+#: ../widgets/table/e-table-group-leaf.c:572
 #: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
 msgid "Alternating Row Colors"
 msgstr "Striedavé farby riadkov"
 
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
+#: ../widgets/table/e-table-group-container.c:903
+#: ../widgets/table/e-table-group-container.c:904
+#: ../widgets/table/e-table-group-leaf.c:579
 #: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
+#: ../widgets/table/e-tree.c:3307 ../widgets/table/e-tree.c:3308
 msgid "Horizontal Draw Grid"
 msgstr "Kresliť horizontálnu mriežku"
 
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
+#: ../widgets/table/e-table-group-container.c:910
+#: ../widgets/table/e-table-group-container.c:911
+#: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
+#: ../widgets/table/e-tree.c:3313 ../widgets/table/e-tree.c:3314
 msgid "Vertical Draw Grid"
 msgstr "Kresliť vertikálnu mriežku"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:917
+#: ../widgets/table/e-table-group-container.c:918
+#: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
+#: ../widgets/table/e-tree.c:3319 ../widgets/table/e-tree.c:3320
 msgid "Draw focus"
 msgstr "Kresliť fokus"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
 msgid "Cursor mode"
 msgstr "Režim kurzoru"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
 msgid "Selection model"
 msgstr "Model výberu"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3301
+#: ../widgets/table/e-tree.c:3302
 msgid "Length Threshold"
 msgstr "Hranica dĺžky"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
-#: ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Uniform row height"
 msgstr "Rovnaká výška riadkov"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "Zamknutý"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "Prispôsobiť aktuálny pohľad"
 
-#: ../widgets/table/e-table-header-item.c:1492
-msgid "Sort Ascending"
+#: ../widgets/table/e-table-header-item.c:1472
+#, fuzzy
+msgid "Sort _Ascending"
 msgstr "Utriediť vzostupne"
 
-#: ../widgets/table/e-table-header-item.c:1493
-msgid "Sort Descending"
+#: ../widgets/table/e-table-header-item.c:1473
+#, fuzzy
+msgid "Sort _Descending"
 msgstr "Utriediť zostupne"
 
-#: ../widgets/table/e-table-header-item.c:1494
-msgid "Unsort"
+#: ../widgets/table/e-table-header-item.c:1474
+#, fuzzy
+msgid "_Unsort"
 msgstr "Netriedené"
 
-#: ../widgets/table/e-table-header-item.c:1496
-msgid "Group By This Field"
+#: ../widgets/table/e-table-header-item.c:1476
+#, fuzzy
+msgid "Group By This _Field"
 msgstr "Zoskupiť podľa tohto poľa"
 
-#: ../widgets/table/e-table-header-item.c:1497
-msgid "Group By Box"
+#: ../widgets/table/e-table-header-item.c:1477
+#, fuzzy
+msgid "Group By _Box"
 msgstr "Zoskupiť podľa boxu"
 
-#: ../widgets/table/e-table-header-item.c:1499
-msgid "Remove This Column"
+#: ../widgets/table/e-table-header-item.c:1479
+#, fuzzy
+msgid "Remove This _Column"
 msgstr "Odstráni tento stĺpec"
 
-#: ../widgets/table/e-table-header-item.c:1500
-msgid "Add a Column..."
+#: ../widgets/table/e-table-header-item.c:1480
+#, fuzzy
+msgid "Add a C_olumn..."
 msgstr "Pridať stĺpec..."
 
-#: ../widgets/table/e-table-header-item.c:1502
-msgid "Alignment"
+#: ../widgets/table/e-table-header-item.c:1482
+#, fuzzy
+msgid "A_lignment"
 msgstr "Zarovnanie"
 
-#: ../widgets/table/e-table-header-item.c:1503
-msgid "Best Fit"
+#: ../widgets/table/e-table-header-item.c:1483
+#, fuzzy
+msgid "B_est Fit"
 msgstr "Nejlepšie"
 
-#: ../widgets/table/e-table-header-item.c:1504
-msgid "Format Columns..."
+#: ../widgets/table/e-table-header-item.c:1484
+#, fuzzy
+msgid "Format Column_s..."
 msgstr "Formát stĺpcov..."
 
-#: ../widgets/table/e-table-header-item.c:1506
-msgid "Customize Current View..."
+#: ../widgets/table/e-table-header-item.c:1486
+#, fuzzy
+msgid "Custo_mize Current View..."
 msgstr "Prispôsobiť aktuálny pohľad..."
 
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264
-msgid "Fontset"
-msgstr "Sada písiem"
+#: ../widgets/table/e-table-header-item.c:1542
+#, fuzzy
+msgid "Sort By"
+msgstr "Triediť"
 
-#: ../widgets/table/e-table-header-item.c:1838
-#: ../widgets/table/e-table-sorter.c:175
+#: ../widgets/table/e-table-header-item.c:1893
+#, fuzzy
+msgid "Font Description"
+msgstr "Popis:"
+
+#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Informácie o triedení"
 
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
+#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Strom"
 
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
 msgid "Table header"
 msgstr "Hlavička tabuľky"
 
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
 msgid "Table model"
 msgstr "Model tabuľky"
 
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
 msgid "Cursor row"
 msgstr "Riadok kurzora"
 
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-tree.c:3341
+msgid "Always search"
 msgstr "Vždy hľadať"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3328
 msgid "Use click to add"
 msgstr "Pridať kliknutím"
 
-#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3326 ../widgets/table/e-tree.c:3327
 msgid "ETree table adapter"
 msgstr "Tabuľkový adaptér ETree"
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr "Vždy hľadať"
-
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-tree.c:3347
 msgid "Retro Look"
 msgstr "Retro vzhľad"
 
-#: ../widgets/table/e-tree.c:3312
+#: ../widgets/table/e-tree.c:3348
 msgid "Draw lines and +/- expanders."
 msgstr "Nakresliť čiary a +/- expandery."
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr ""
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Autorské práva © 2000, Helix Code, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr ""
+#: ../widgets/text/e-text.c:2727
+msgid "Input Methods"
+msgstr "Metódy vstupu"
 
-#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3550 ../widgets/text/e-text.c:3551
 msgid "Event Processor"
 msgstr "Spracovanie udalostí"
 
-#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
-msgid "Font"
-msgstr "Písmo"
+#: ../widgets/text/e-text.c:3564 ../widgets/text/e-text.c:3565
+msgid "Bold"
+msgstr "Tučné"
 
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-msgid "GDKFont"
-msgstr "GDKPísmo"
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+msgid "Strikeout"
+msgstr "Prečiarknuté"
+
+#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+msgid "Anchor"
+msgstr "Kotva"
 
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Justification"
 msgstr "Zarovnanie"
 
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+msgid "Clip Width"
+msgstr "Šírka orezania"
+
+#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+msgid "Clip Height"
+msgstr "Výška orezania"
+
+#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+msgid "Clip"
+msgstr "Orezanie"
+
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+msgid "Fill clip rectangle"
+msgstr "Vyplniť obdĺžnik orezania"
+
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+msgid "X Offset"
+msgstr "Posun X"
+
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+msgid "Y Offset"
+msgstr "Posun Y"
+
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+msgid "Text width"
+msgstr "Šírka textu"
+
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+msgid "Text height"
+msgstr "Výška textu"
+
+#: ../widgets/text/e-text.c:3686 ../widgets/text/e-text.c:3687
 msgid "Use ellipsis"
 msgstr "Použiť vypustenie"
 
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
 msgid "Ellipsis"
 msgstr "Vypustenie"
 
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
 msgid "Line wrap"
 msgstr "Zalamovanie riadkov"
 
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
 msgid "Break characters"
 msgstr "Znaky konca riadkov"
 
-#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
 msgid "Max lines"
 msgstr "Max. riadkov"
 
-#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
-msgid "Allow newlines"
-msgstr "Povoliť nové riadky"
-
-#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
 msgid "Draw borders"
 msgstr "Kresliť okraje"
 
-#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+msgid "Allow newlines"
+msgstr "Povoliť nové riadky"
+
+#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
 msgid "Draw background"
 msgstr "Kresliť pozadie"
 
-#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
 msgid "Draw button"
 msgstr "Kresliť tlačidlo"
 
-#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
 msgid "Cursor position"
 msgstr "Pozícia kurzora"
 
-#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
-msgid "Emulate label resize"
-msgstr "Emulovať zmenu veľkosti návestia"
+#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+msgid "IM Context"
+msgstr "Kontext IM"
 
-#: ../widgets/text/e-text.c:2696
-msgid "Input Methods"
-msgstr "Metódy vstupu"
+#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+msgid "Handle Popup"
+msgstr "Spracovať vyskakovanie okno"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Bold"
-msgstr "Tučné"
+#~ msgid "Addressbook"
+#~ msgstr "Adresár"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Strikeout"
-msgstr "Prečiarknuté"
+#~ msgid "*"
+#~ msgstr "*"
 
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Anchor"
-msgstr "Kotva"
+#, fuzzy
+#~ msgid ""
+#~ "Selecting this option means that Evolution will only try to use SSL/TLS "
+#~ "if you are in a insecure environment. For example, if you and your LDAP "
+#~ "server are behind a firewall at work, then Evolution doesn't need to use "
+#~ "SSL/TLS because your connection is already secure."
+#~ msgstr ""
+#~ "Zapnutie tejto voľby znamená, že Evolution sa bude pokúšať použiť\n"
+#~ "SSL/TLS iba v nezabezpečenom prostredí. napríklad, ak je váš\n"
+#~ "server LDAP za firewallom, Evolution nemusí tieto protokoly používať,\n"
+#~ "pretože vaše spojenie už zabezpečené je."
 
-#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
-msgid "Clip Width"
-msgstr "Šírka orezania"
+#~ msgid "E-_mail:"
+#~ msgstr "E_mail:"
 
-#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
-msgid "Clip Height"
-msgstr "Výška orezania"
+#~ msgid ""
+#~ "The changed email or name of this contact already\n"
+#~ "exists in this folder.  Would you like to add it anyway?"
+#~ msgstr ""
+#~ "Zmenený e-mail alebo meno pre tento kontakt už v tomto\n"
+#~ "priečinku existuje. Chcete ho aj tak pridať?"
 
-#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
-msgid "Clip"
-msgstr "Orezanie"
+#~ msgid "Advanced..."
+#~ msgstr "Pokročilé..."
 
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
-msgid "Fill clip rectangle"
-msgstr "Vyplniť obdĺžnik orezania"
+#~ msgid "Print cards"
+#~ msgstr "Tlačiť karty"
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
-msgid "X Offset"
-msgstr "Posun X"
+#~ msgid "Organization"
+#~ msgstr "Organizácia"
 
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
-msgid "Y Offset"
-msgstr "Posun Y"
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
-msgid "Text width"
-msgstr "Šírka textu"
+#~ msgid "Video Conferencing"
+#~ msgstr "Videokonferencia"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
-msgid "Text height"
-msgstr "Výška textu"
+#~ msgid "work"
+#~ msgstr "zamestnanie"
 
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
-msgid "IM Context"
-msgstr "Kontext IM"
+#~ msgid "WWW"
+#~ msgstr "WWW"
 
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
-msgid "Handle Popup"
-msgstr "Spracovať vyskakovanie okno"
+#~ msgid "personal"
+#~ msgstr "osobné"
+
+#~ msgid "Select target addressbook."
+#~ msgstr "Vybrať cieľový adresár."
+
+#~ msgid "(none)"
+#~ msgstr "(nič)"
+
+#~ msgid "Primary Email"
+#~ msgstr "Primárny e-mail"
+
+#~ msgid "Select an Action"
+#~ msgstr "Vyberte akciu"
+
+#~ msgid "Create a new contact \"%s\""
+#~ msgstr "Vytvoriť nový kontakt \"%s\""
+
+#~ msgid "Add address to existing contact \"%s\""
+#~ msgstr "Pridať adresu do existujúceho kontaktu \"%s\""
+
+#~ msgid "Merge E-Mail Address"
+#~ msgstr "Zliať e-mailovú adresu"
+
+#~ msgid "GTK Tree View"
+#~ msgstr "Stromový pohľad GTK"
+
+#, fuzzy
+#~ msgid "Importing ..."
+#~ msgstr "Importujem..."
+
+#~ msgid "Print envelope"
+#~ msgstr "Tlačiť obálku"
+
+#~ msgid "Print contacts"
+#~ msgstr "Tlačiť kontakty"
+
+#~ msgid "Print contact"
+#~ msgstr "Tlačiť kontakt"
+
+#~ msgid "Error loading default addressbook."
+#~ msgstr "Chyba pri načítavaní štandardného adresára"
+
+#~ msgid "Input File"
+#~ msgstr "Vstupný súbor"
+
+#~ msgid "No filename provided."
+#~ msgstr "Nezadané meno súboru."
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
+#~ msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete these {0} journal entries?"
+#~ msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete this journal entry?"
+#~ msgstr "Naozaj chcete odstrániť %d položiek denníka?"
+
+#, fuzzy
+#~ msgid "Discard Changes"
+#~ msgstr "_Zahodiť zmeny"
+
+#, fuzzy
+#~ msgid "description of appointment"
+#~ msgstr "začiatok schôdzky"
+
+#~ msgid "%.0fK"
+#~ msgstr "%.0fK"
+
+#~ msgid "%.0fM"
+#~ msgstr "%.0fM"
+
+#~ msgid "%.0fG"
+#~ msgstr "%.0fG"
+
+#~ msgid "Remove"
+#~ msgstr "Odstrániť"
+
+#, fuzzy
+#~ msgid "Don't Remove"
+#~ msgstr "Neimportovať"
+
+#~ msgid "Enable"
+#~ msgstr "Povoliť"
+
+#~ msgid "05 minutes"
+#~ msgstr "05 minút"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 minút"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 minút"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 minút"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 minút"
+
+#, fuzzy
+#~ msgid "<b>Default Free/Busy Server</b>"
+#~ msgstr "Informácie o kalendári"
+
+#, fuzzy
+#~ msgid "<b>General</b>"
+#~ msgstr "Pripomenutia"
+
+#, fuzzy
+#~ msgid "<b>Publishing</b>"
+#~ msgstr "Požiadavka na informácie o voľnom čase"
+
+#, fuzzy
+#~ msgid "<b>Task List</b>"
+#~ msgstr "Informácie o kalendári"
+
+#, fuzzy
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>Termín:</b> "
+
+#, fuzzy
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "Pracovný týždeň"
+
+#~ msgid "Calendar and Tasks Settings"
+#~ msgstr "Nastavenie kalendára a úloh"
+
+#~ msgid "Color for overdue tasks"
+#~ msgstr "Farba pre nestihnuté úlohy"
+
+#~ msgid "Color for tasks due today"
+#~ msgstr "Farba pre úlohy do dnešného dňa"
+
+#~ msgid "Days"
+#~ msgstr "Dni"
+
+#~ msgid "Hours"
+#~ msgstr "Hodiny"
+
+#~ msgid "Minutes"
+#~ msgstr "Minúty"
+
+#, fuzzy
+#~ msgid "_Add URL"
+#~ msgstr "_Pridať"
+
+#, fuzzy
+#~ msgid "Add Calendar"
+#~ msgstr "Nová Kaledónia"
+
+#, fuzzy
+#~ msgid "Add Task List"
+#~ msgstr "Zoznam úloh"
+
+#, fuzzy
+#~ msgid "_Add Calendar"
+#~ msgstr "Nová Kaledónia"
+
+#, fuzzy
+#~ msgid "_Add Task List"
+#~ msgstr "Zoznam úloh"
+
+#~ msgid "This journal entry has been deleted."
+#~ msgstr "Táto položka denníka bola odstránená."
+
+#~ msgid "This journal entry has been changed."
+#~ msgstr "Táto položka denníka bola zmenená."
+
+#~ msgid "Journal entry - %s"
+#~ msgstr "Položka denníka - %s"
+
+#~ msgid "The journal entry could not be deleted due to a corba error"
+#~ msgstr "Položku žurnálu nie je možné odstrániť kvôli chybe systému CORBA"
+
+#~ msgid "The journal entry could not be deleted because permission was denied"
+#~ msgstr "Položku žurnálu nie je možné odstrániť kvôli nedostatočným právam"
+
+#, fuzzy
+#~ msgid "The journal entry could not be deleted due to an error"
+#~ msgstr "Položku žurnálu nie je možné odstrániť kvôli chybe systému CORBA"
+
+#~ msgid "Scheduling"
+#~ msgstr "Plánovanie"
+
+#, fuzzy
+#~ msgid "Invitations"
+#~ msgstr "Informácia"
+
+#, fuzzy
+#~ msgid "<b>Basics</b>"
+#~ msgstr "Informácie o kalendári"
+
+#, fuzzy
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "Dátum a čas"
+
+#~ msgid "A_ll day event"
+#~ msgstr "_Celodenná udalosť"
+
+#, fuzzy
+#~ msgid "Cale_ndar:"
+#~ msgstr "Kalen_dár:"
+
+#, fuzzy
+#~ msgid "Classi_fication:"
+#~ msgstr "Klasifikácia"
+
+#, fuzzy
+#~ msgid "Locat_ion:"
+#~ msgstr "Umiestnenie:"
+
+#, fuzzy
+#~ msgid "<b>Dele_gatees</b>"
+#~ msgstr "<b>Stav:</b>"
+
+#, fuzzy
+#~ msgid "<b>From:</b>"
+#~ msgstr "<b>Domov</b>"
+
+#, fuzzy
+#~ msgid "Con_tacts..."
+#~ msgstr "Kontakty"
+
+#, fuzzy
+#~ msgid "<b>Calendar options</b>"
+#~ msgstr "Informácie o kalendári"
+
+#, fuzzy
+#~ msgid "Add New Calendar"
+#~ msgstr "Nová Kaledónia"
+
+#, fuzzy
+#~ msgid "Calendar Group"
+#~ msgstr "Chyba iCalendar"
+
+#, fuzzy
+#~ msgid "Calendar Location"
+#~ msgstr "Informácie o kalendári"
+
+#, fuzzy
+#~ msgid "Calendar Name"
+#~ msgstr "Kalendár"
+
+#, fuzzy
+#~ msgid "Add New Task List"
+#~ msgstr "Zoznam úloh"
+
+#, fuzzy
+#~ msgid "Task List Group"
+#~ msgstr "Zoznam úloh"
+
+#, fuzzy
+#~ msgid "Task List Name"
+#~ msgstr "Zoznam úloh"
+
+#~ msgid ""
+#~ "You are modifying a recurring journal entry, what would you like to "
+#~ "modify?"
+#~ msgstr "Upravujete opakujúcu sa položku žurnálu. Čo chcete zmeniť?"
+
+#~ msgid "Assignment"
+#~ msgstr "Priradenie"
+
+#, fuzzy
+#~ msgid "<b>Free/Busy C_alendars</b>"
+#~ msgstr "Informácie o kalendári"
+
+#, fuzzy
+#~ msgid "Free/Busy Publishing Settings"
+#~ msgstr "Požiadavka na informácie o voľnom čase"
+
+#, fuzzy
+#~ msgid "_Daily"
+#~ msgstr "Deň"
+
+#, fuzzy
+#~ msgid "_Manual"
+#~ msgstr "Managua"
+
+#, fuzzy
+#~ msgid "_Weekly"
+#~ msgstr "Týždeň"
+
+#, fuzzy
+#~ msgid "Task Table"
+#~ msgstr "Aktualizácia úlohy"
+
+#~ msgid "Task sort"
+#~ msgstr "Triedenie úloh"
+
+#~ msgid "_Publish Free/Busy Information"
+#~ msgstr "_Publikovať informácie o voľnom čase"
+
+#~ msgid "Removal Complete"
+#~ msgstr "Odstránenie dokončené"
+
+#~ msgid "%P %%"
+#~ msgstr "%P %%"
+
+#~ msgid "date-end"
+#~ msgstr "dátum konca"
+
+#~ msgid "date-start"
+#~ msgstr "dátum začiatku"
+
+#, fuzzy
+#~ msgid "Enter the password for %s"
+#~ msgstr "Zadajte vaše heslo pre %s"
+
+#, fuzzy
+#~ msgid "Timezone Button"
+#~ msgstr "Časová zóna "
+
+#~ msgid "Selected day (%a %b %d %Y)"
+#~ msgstr "Vybraný deň (%a %b %d %Y)"
+
+#~ msgid "%a %b %d"
+#~ msgstr "%a %b %d"
+
+#~ msgid "%a %b %d %Y"
+#~ msgstr "%a %b %d %Y"
+
+#~ msgid "Selected week (%s - %s)"
+#~ msgstr "Vybraný týždeň (%s - %s)"
+
+#~ msgid "Selected month (%b %Y)"
+#~ msgstr "Vybraný mesiac (%b - %Y)"
+
+#~ msgid "Selected year (%Y)"
+#~ msgstr "Vybraný rok (%Y)"
+
+#~ msgid "Print Preview"
+#~ msgstr "Ukážka pred tlačou"
+
+#, fuzzy
+#~ msgid "The Evolution Groupware Suite"
+#~ msgstr "Sada groupvérových nástrojov Evolution"
+
+#~ msgid "      "
+#~ msgstr "      "
+
+#~ msgid "<b>Receiving Email</b>"
+#~ msgstr "<b>Príjem pošty</b>"
+
+#~ msgid "<b>Sending Email:</b>"
+#~ msgstr "<b>Posielanie pošty:</b>"
+
+#~ msgid ""
+#~ "<small>This page allows you to choose if you want to be notified via a "
+#~ "read receipt when a message you\n"
+#~ "sent is read, and to specify what Evolution should do when someone "
+#~ "requests a receipt from you.</small>"
+#~ msgstr ""
+#~ "<small>Tento dialóg umožňuje vybrať, či chcete byť upozornený, že\n"
+#~ "si adresát prečítal vašu správu. Ďalej tu môžete nastaviť, ako sa\n"
+#~ "má Evolution chovať v prípade, že ste si správu prečítali vy.</small>"
+
+#, fuzzy
+#~ msgid "Always send back a read receipt"
+#~ msgstr "Vždy poslať späť správu o prečítaní"
+
+#~ msgid "Ask me if I want to send back a read receipt"
+#~ msgstr "Pýtať sa pred poslaním správy o prečítaní"
+
+#~ msgid "Never send back a read receipt"
+#~ msgstr "Nikdy neposielať správu o prečítaní"
+
+#~ msgid "Read Receipts"
+#~ msgstr "Správa o prečítaní"
+
+#~ msgid ""
+#~ "Unless the message is sent to a mailing list, and not to me personally"
+#~ msgstr "Nie v prípade, že sa posiela do konferencie alebo mne"
+
+#~ msgid ""
+#~ "When you receive an email with a read receipt request, what should "
+#~ "Evolution do?"
+#~ msgstr ""
+#~ "Čo má Evolution urobiť, ak dostanete správu s požiadavkou na potvrdenie "
+#~ "prečítania?"
+
+#~ msgid ""
+#~ "A file by that name already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Súbor s týmto menom už existuje\n"
+#~ "Prepísať ho?"
+
+#~ msgid "%a %m/%d/%Y %I:%M %p"
+#~ msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#~ msgid "%a %m/%d/%Y %H:%M"
+#~ msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#~ msgid "%a %m/%d/%Y %I %p"
+#~ msgstr "%a %d/%m/%Y %I %p"
+
+#~ msgid "%a %m/%d/%Y %H"
+#~ msgstr "%a %d/%m/%Y %H"
+
+#~ msgid "%m/%d/%Y %I:%M:%S %p"
+#~ msgstr "%d/%m/%Y %I:%M:%S %p"
+
+#~ msgid "%m/%d/%Y %H:%M:%S"
+#~ msgstr "%d/%m/%Y %H:%M:%S"
+
+#~ msgid "%m/%d/%Y %I:%M %p"
+#~ msgstr "%d/%m/%Y %I:%M %p"
+
+#~ msgid "%m/%d/%Y %H:%M"
+#~ msgstr "%d/%m/%Y %H:%M"
+
+#~ msgid "%m/%d/%Y %I %p"
+#~ msgstr "%d/%m/%Y %I %p"
+
+#~ msgid "%m/%d/%Y %H"
+#~ msgstr "%d/%m/%Y %H"
+
+#~ msgid "%I:%M:%S %p"
+#~ msgstr "%I:%M:%S %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%I:%M %p"
+#~ msgstr "%I:%M %p"
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%I %p"
+#~ msgstr "%I %p"
+
+#, fuzzy
+#~ msgid "The orientation of the tray."
+#~ msgstr "Popis prílohy."
+
+#, fuzzy
+#~ msgid "_Rule name:"
+#~ msgstr "Meno pravidla: "
+
+#, fuzzy
+#~ msgid "If"
+#~ msgstr "I"
+
+#, fuzzy
+#~ msgid "Mail Accounts Table"
+#~ msgstr "Poštové účty"
+
+#, fuzzy
+#~ msgid "<b>Then</b>"
+#~ msgstr "<b>Termín:</b> "
+
+#, fuzzy
+#~ msgid "Attachment Button"
+#~ msgstr "Príloha"
+
+#~ msgid "Filters"
+#~ msgstr "Filtre"
+
+#~ msgid "Priority Filter \"%s\""
+#~ msgstr "Filter priority \"%s\""
+
+#~ msgid ""
+#~ "Some of your Netscape email filters are based on\n"
+#~ "email priorities, which are not used in Evolution.\n"
+#~ "Instead, Evolution provides scores in the range of\n"
+#~ "-3 to 3 that can be assigned to emails and filtered\n"
+#~ "accordingly.\n"
+#~ "\n"
+#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
+#~ "was added that converts Netscape's email priorities into\n"
+#~ "Evolution's scores, and the affected filters use scores instead\n"
+#~ "of priorities. Check the imported filters to make sure\n"
+#~ "everything still works as intended."
+#~ msgstr ""
+#~ "Niektoré poštové filtre Netscape sú založené na prioritách\n"
+#~ "správ, Evolution nepodporuje. Namiesto toho podporuje\n"
+#~ "skóre v rozsahu -3 až 3, ktoré je možné správam priradiť.\n"
+#~ "\n"
+#~ "Ako náhradu bola pridaná kategória filtrov \"Filter priority\",\n"
+#~ "ktorá prevádza priority Netscape na skóre Evolution.\n"
+#~ "Zodpovedajúce importované filtre budú používať skóre.\n"
+#~ "Overte naimportované filtre, že všetky funguje tak, ako má."
+
+#~ msgid ""
+#~ "Some of your Netscape email filters use\n"
+#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
+#~ "feature, which is not supported in Evolution.\n"
+#~ "These filters will be dropped."
+#~ msgstr ""
+#~ "Niektoré poštové filtre Netscape používajú funkciu\n"
+#~ "\"Ignorovať vlákno\" a \"Sledovať vlákno\", ktorú\n"
+#~ "Evolution nepodporuje. Tieto filtre budú zahodené."
+
+#~ msgid ""
+#~ "Some of your Netscape email filters test the\n"
+#~ "body of emails for (in)equality to a given string,\n"
+#~ "which is not supported in Evolution. Those filters\n"
+#~ "were modified to test whether that string is or is not\n"
+#~ "contained in the message body."
+#~ msgstr ""
+#~ "Niektoré poštové filtre Netscape testujú telo\n"
+#~ "správ, či sú zhodné ako zadaný reťazec.\n"
+#~ "Táto možnosť nie je v Evolution podporovaná.\n"
+#~ "Tieto filtre boli upravené, aby testovali, či\n"
+#~ "je reťazec je alebo nie je v tele správy."
+
+#~ msgid "Evolution is importing your old Netscape data"
+#~ msgstr "Evolution importuje vaše staré dáta Netscape"
+
+#, fuzzy
+#~ msgid "Importing Netscape data"
+#~ msgstr "Evolution importuje vaše staré dáta Netscape"
+
+#~ msgid "Settings"
+#~ msgstr "Nastavenie"
+
+#~ msgid "Mail Filters"
+#~ msgstr "Poštové filtre"
+
+#~ msgid ""
+#~ "Evolution has found Netscape mail files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgstr ""
+#~ "Evolution našiel poštové súbory Netscape.\n"
+#~ "Chcete ich naimportovať do Evolution?"
+
+#~ msgid "Execute Command..."
+#~ msgstr "Vykonať príkaz..."
+
+#, fuzzy
+#~ msgid "HTML Mail"
+#~ msgstr "_HTML správy"
+
+#, fuzzy
+#~ msgid "T_erminal Font:"
+#~ msgstr "Písmo _terminálu:"
+
+#~ msgid "_Show animated images"
+#~ msgstr "Zobraziť _animované obrázky"
+
+#~ msgid "_Subscribe"
+#~ msgstr "_Prihlásiť si"
+
+#~ msgid "Filtering Folder"
+#~ msgstr "Filtrujem priečinok"
+
+#~ msgid ""
+#~ "Unable to create output file: %s\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
+#~ " %s"
+
+#~ msgid "Server: %s, Type: %s"
+#~ msgstr "Server: %s, Typ: %s"
+
+#~ msgid "Path: %s, Type: %s"
+#~ msgstr "Cesta: %s, Typ: %s"
+
+#~ msgid "Type: %s"
+#~ msgstr "Typ: %s"
+
+#~ msgid "Original Location"
+#~ msgstr "Pôvodný umiestnenie:"
+
+#, fuzzy
+#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
+#~ msgstr "Zobrazené správy:"
+
+#, fuzzy
+#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+#~ msgstr "Odoslané a koncepty"
+
+#~ msgid "dialog1"
+#~ msgstr "dialog1"
+
+#~ msgid "Meetings and Tasks"
+#~ msgstr "Stretnutia a úlohy"
+
+#, fuzzy
+#~ msgid "<span weight=\"bold\">Conflict Search</span>"
+#~ msgstr "Zobrazené správy:"
+
+#~ msgid "System error: %s"
+#~ msgstr "Systémová chyba: %s"
+
+#, fuzzy
+#~ msgid "Camel error: %s"
+#~ msgstr "Chyba validácie: %s"
+
+#~ msgid "Account cannot send e-mail"
+#~ msgstr "Účet nemôže odoslať elektronickú poštu"
+
+#, fuzzy
+#~ msgid "No store available"
+#~ msgstr "Popis nie je k dispozícii."
+
+#, fuzzy
+#~ msgid "Mail Remote"
+#~ msgstr "Poštové filtre"
+
+#~ msgid "New mail notify"
+#~ msgstr "Upozornenie na novú poštu"
+
+#~ msgid "Plugin manager"
+#~ msgstr "Správca zásuvných modulov"
+
+#~ msgid "Id"
+#~ msgstr "Id"
+
+#~ msgid "Path"
+#~ msgstr "Cesta"
+
+#~ msgid "Uid"
+#~ msgstr "Uid"
+
+#~ msgid "Url"
+#~ msgstr "Url"
+
+#~ msgid "Printer settings"
+#~ msgstr "Nastavenia tlačiarne"
+
+#~ msgid "(Untitled)"
+#~ msgstr "(Bez mena)"
+
+#~ msgid "Evolution Settings"
+#~ msgstr "Nastavenie Evolution"
+
+#~ msgid "E"
+#~ msgstr "V"
+
+#~ msgid "Content type of the attachment."
+#~ msgstr "Typ obsahu prílohy."
+
+#~ msgid "The filename to display in the mail."
+#~ msgstr "Meno súboru zobrazené v správe."
+
+#~ msgid "Description of the attachment."
+#~ msgstr "Popis prílohy."
+
+#~ msgid "Mark attachment to be shown inline by default."
+#~ msgstr "Označiť prílohu, že má byť zobrazená štandardne v texte."
+
+#~ msgid "_Preview Pane"
+#~ msgstr "Panel _náhľadu"
+
+#~ msgid "_Select All"
+#~ msgstr "Vybrať _všetko"
+
+#~ msgid "Delete this Occurrence"
+#~ msgstr "Odstrániť tento výskyt"
+
+#~ msgid "Customize My Evolution"
+#~ msgstr "Prispôsobiť moje Evolution"
+
+#~ msgid "Move"
+#~ msgstr "Presunúť"
+
+#~ msgid "_About Evolution..."
+#~ msgstr "_O programe Evolution..."
+
+#~ msgid "_Send / Receive"
+#~ msgstr "_Poslať / Prijať"
+
+#~ msgid "_Phone List"
+#~ msgstr "_Telefónny zoznam"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Upraviť..."
+
+#~ msgid "Previous Button"
+#~ msgstr "Predchádzajúce tlačidlo"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "Text Date Entry"
+#~ msgstr "Textový vstup dátumu"
+
+#~ msgid "Date Button"
+#~ msgstr "Tlačidlo dátumu"
+
+#~ msgid "Search Text Entry"
+#~ msgstr "Vstupné pole vyhľadávania"
+
+#~ msgid "Search Type"
+#~ msgstr "Typ hľadania"
+
+#~ msgid "Subitem ID"
+#~ msgstr "ID podpoložky"
+
+#~ msgid "Find _Now"
+#~ msgstr "Nájsť _teraz"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- _Odstrániť"
+
+#~ msgid "Sh_ow these fields in order:"
+#~ msgstr "Z_obraziť tieto polia v poradí:"
+
+#~ msgid "%s : %s (%d items)"
+#~ msgstr "%s : %s (%d položiek)"
+
+#~ msgid "%s (%d items)"
+#~ msgstr "%s (%d položiek)"
+
+#~ msgid "Fontset"
+#~ msgstr "Sada písiem"
+
+#~ msgid "Always Search"
+#~ msgstr "Vždy hľadať"
+
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Autorské práva © 2000, Helix Code, Inc."
+
+#~ msgid "Font"
+#~ msgstr "Písmo"
+
+#~ msgid "GDKFont"
+#~ msgstr "GDKPísmo"
+
+#~ msgid "Emulate label resize"
+#~ msgstr "Emulovať zmenu veľkosti návestia"
author	Marcel Telka <marcel@telka.sk>	2007-11-14 05:10:43 +0800
committer	Marcel Telka <marcel@src.gnome.org>	2007-11-14 05:10:43 +0800
commit	301a69d41491e3d65dbe312e008b610b53eaa955 (patch)
tree	5db030b10df5fc769fc969bb7e607664c964e798
parent	df7b5b4b43b1befbf42b084954a6987cdc8d554a (diff)
download	gsoc2013-evolution-301a69d41491e3d65dbe312e008b610b53eaa955.tar.gz gsoc2013-evolution-301a69d41491e3d65dbe312e008b610b53eaa955.tar.zst gsoc2013-evolution-301a69d41491e3d65dbe312e008b610b53eaa955.zip