Updated Slovenian translation

svn path=/trunk/; revision=8144

1 files changed, 1992 insertions, 1609 deletions

diff --git a/po/sl.po b/po/sl.po
index e14702fca5..2e1cdb2f7c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,4 +1,3 @@
-
 # Slovenian translation file for Evolution.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Andraz Tori <andraz.tori1@guest.arnes.si> 2000
@@ -7,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-01-25 02:12+0100\n"
+"POT-Creation-Date: 2001-02-08 21:42+0100\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -15,842 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-executive-summary.xml.h:6
-msgid "Add Service"
-msgstr "Dodaj storitev"
-
-#: po/tmp/evolution-executive-summary.xml.h:7
-msgid "Add a new service to the Executive Summary"
-msgstr "Dodaj novo storitev v povzetek"
-
-#: po/tmp/evolution-executive-summary.xml.h:8
-msgid "Create a new email"
-msgstr "Ustvari novo e-pošto"
-
-#: po/tmp/evolution-executive-summary.xml.h:9
-msgid "Executive Summary Settings..."
-msgstr "Nastaviteve povzetka..."
-
-#: po/tmp/evolution-executive-summary.xml.h:10
-msgid "New Mail"
-msgstr "Nova pošta"
-
-#: executive-summary/component/component-factory.c:159
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, c-format
-msgid "No such message: %s"
-msgstr "Ni takšnega sporočila: %s"
-
-#: executive-summary/component/e-summary-callbacks.c:285
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Za ozadje izvlečka lahko izberete drugačno HTML stran.\n"
-"\n"
-"Pustite pravno za privzete nastavitve"
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Odpri %s s privzetim GNOMEovim programom"
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Odpri %s s privzetim GNOMEovim brskalnikom"
-
-#: executive-summary/component/e-summary-url.c:63
-#, c-format
-msgid "Send an email to %s"
-msgstr "Pošlji e-pošto %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr "Spremeni pogled na %s"
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr "Poženi %s"
-
-#: executive-summary/component/e-summary-url.c:67
-#, c-format
-msgid "Close %s"
-msgstr "Zapri %s"
-
-#: executive-summary/component/e-summary-url.c:68
-#, c-format
-msgid "Move %s to the left"
-msgstr "Premakni %s na levo"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr "Premakni %s na desno"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Premakni %s v prešnjo vrstico"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Premakni %s v naslednjo vrstico"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr "Nastavi %s"
-
-#: executive-summary/component/e-summary.c:916
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti HTML datoteke:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:930
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Napaka ob branju podatkov:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:948
-msgid "File does not have a place for the services.\n"
-msgstr "Datoteka nima mesta za storitve.\n"
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Komponenta Povzetek ni mogla inicializirati Bonoba.\n"
-"Če se je pokazalo opozorilo o RootPOA, to verjetno pomeni,\n"
-"da ste prevedli Bonobo z GOAD-om namesto z OAF-om."
-
-#: executive-summary/test-service/rdf-summary.c:455
-#: executive-summary/test-service/rdf-summary.c:491
-#: executive-summary/test-service/rdf-summary.c:536
-msgid "Error"
-msgstr "Napaka"
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr "Vzpostavljam povezavo s strežnikom"
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr "Poveži se s strežnikom"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-event-editor.xml.h:6
-#: po/tmp/evolution-task-editor-dialog.xml.h:6
-msgid "About this application"
-msgstr "O tem programu"
-
-#: po/tmp/evolution-event-editor.xml.h:7
-#: po/tmp/evolution-task-editor-dialog.xml.h:7
-msgid "About..."
-msgstr "O..."
-
-#: po/tmp/evolution-event-editor.xml.h:8
-#: po/tmp/evolution-task-editor-dialog.xml.h:8
-msgid "Actio_ns"
-msgstr "_Dejanja"
-
-#: po/tmp/evolution-event-editor.xml.h:9
-#: po/tmp/evolution-task-editor-dialog.xml.h:9
-msgid "C_lear"
-msgstr "Poč_isti"
-
-#: po/tmp/evolution-event-editor.xml.h:10
-#: po/tmp/evolution-task-editor-dialog.xml.h:10
-msgid "C_ut"
-msgstr "_Izreži"
-
-#: po/tmp/evolution-event-editor.xml.h:11
-#: po/tmp/evolution-task-editor-dialog.xml.h:11
-msgid "Clear"
-msgstr "Počisti"
-
-#: po/tmp/evolution-event-editor.xml.h:12
-#: po/tmp/evolution-task-editor-dialog.xml.h:12
-msgid "Clear the selection"
-msgstr "Počisti izbiro"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
-#: po/tmp/evolution-event-editor.xml.h:13
-#: po/tmp/evolution-message-composer.xml.h:8
-#: po/tmp/evolution-subscribe.xml.h:7
-#: po/tmp/evolution-task-editor-dialog.xml.h:13 po/tmp/evolution.xml.h:7
-msgid "Close"
-msgstr "Zapri"
-
-#: po/tmp/evolution-message-composer.xml.h:9
-#: po/tmp/evolution-task-editor-dialog.xml.h:14
-msgid "Close the current file"
-msgstr "Zapri trenutno datoteko"
-
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
-#: po/tmp/evolution-task-editor-dialog.xml.h:15
-msgid "Copy"
-msgstr "Kopiraj"
-
-#: po/tmp/evolution-event-editor.xml.h:16
-#: po/tmp/evolution-task-editor-dialog.xml.h:16
-msgid "Copy the selection"
-msgstr "Kopiraj izbrano"
-
-#: po/tmp/evolution-event-editor.xml.h:17
-#: po/tmp/evolution-task-editor-dialog.xml.h:17
-msgid "Cut"
-msgstr "Izreži"
-
-#: po/tmp/evolution-event-editor.xml.h:18
-#: po/tmp/evolution-task-editor-dialog.xml.h:18
-msgid "Cut the selection"
-msgstr "Izreži izbrano"
-
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:684 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
-#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:19
-#: po/tmp/evolution-mail.xml.h:11 po/tmp/evolution-task-editor-dialog.xml.h:19
-#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:24
-msgid "Delete"
-msgstr "Zbriši"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:20
-msgid "Delete this task"
-msgstr "Zbriši to nalogo"
-
-#: po/tmp/evolution-event-editor.xml.h:21
-#: po/tmp/evolution-task-editor-dialog.xml.h:21
-msgid "Dump XML"
-msgstr "Shrani kot XML"
-
-#: po/tmp/evolution-event-editor.xml.h:22
-#: po/tmp/evolution-task-editor-dialog.xml.h:22
-msgid "Dump the UI Xml description"
-msgstr "Shranio Xml opis uporabniškega vmesnika"
-
-#: po/tmp/evolution-event-editor.xml.h:23
-#: po/tmp/evolution-task-editor-dialog.xml.h:23
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: A_dresar..."
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:24
-msgid "FIXME: Assig_n Task"
-msgstr "FIXME: Dodali _nalogo"
-
-#: po/tmp/evolution-event-editor.xml.h:24
-#: po/tmp/evolution-task-editor-dialog.xml.h:25
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Izberi izmed..."
-
-#: po/tmp/evolution-event-editor.xml.h:25
-#: po/tmp/evolution-task-editor-dialog.xml.h:26
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Preve_ri imena"
-
-#: po/tmp/evolution-event-editor.xml.h:26
-#: po/tmp/evolution-task-editor-dialog.xml.h:27
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Kopiraj v mapo..."
-
-#: po/tmp/evolution-event-editor.xml.h:27
-#: po/tmp/evolution-task-editor-dialog.xml.h:28
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Oblikuj obrazec..."
-
-#: po/tmp/evolution-event-editor.xml.h:28
-#: po/tmp/evolution-task-editor-dialog.xml.h:29
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Določi _sloge tiskanja"
-
-#: po/tmp/evolution-event-editor.xml.h:29
-#: po/tmp/evolution-task-editor-dialog.xml.h:30
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Obli_kuj ta obrazec"
-
-#: po/tmp/evolution-event-editor.xml.h:30
-#: po/tmp/evolution-task-editor-dialog.xml.h:31
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: P_rvi predmet v mapi"
-
-#: po/tmp/evolution-event-editor.xml.h:31
-#: po/tmp/evolution-task-editor-dialog.xml.h:32
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Posreduj naprej"
-
-#: po/tmp/evolution-event-editor.xml.h:33
-#: po/tmp/evolution-task-editor-dialog.xml.h:33
-msgid "FIXME: Help"
-msgstr "FIXME: Pomoč"
-
-#: po/tmp/evolution-event-editor.xml.h:34
-#: po/tmp/evolution-task-editor-dialog.xml.h:34
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Do_končana naloga"
-
-#: po/tmp/evolution-event-editor.xml.h:35
-#: po/tmp/evolution-task-editor-dialog.xml.h:35
-msgid "FIXME: Insert File"
-msgstr "FIXME: Vstavi datoteko"
-
-#: po/tmp/evolution-event-editor.xml.h:36
-#: po/tmp/evolution-task-editor-dialog.xml.h:36
-msgid "FIXME: It_em..."
-msgstr "FIXME: Pr_edmet..."
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:37
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: Za_hteva po sestanku"
-
-#: po/tmp/evolution-event-editor.xml.h:37
-#: po/tmp/evolution-task-editor-dialog.xml.h:38
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Prilepi po_sebno..."
-
-#: po/tmp/evolution-event-editor.xml.h:38
-#: po/tmp/evolution-task-editor-dialog.xml.h:39
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Predogled tiskanja"
-
-#: po/tmp/evolution-event-editor.xml.h:39
-#: po/tmp/evolution-task-editor-dialog.xml.h:40
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: O_bjavi obrazec kot..."
-
-#: po/tmp/evolution-event-editor.xml.h:40
-#: po/tmp/evolution-task-editor-dialog.xml.h:41
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Ob_javi obrazec..."
-
-#: po/tmp/evolution-event-editor.xml.h:41
-#: po/tmp/evolution-task-editor-dialog.xml.h:42
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: Ponovitve..."
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:43
-msgid "FIXME: Reply to A_ll"
-msgstr "FIXME: Odgovori v_sem"
-
-#: po/tmp/evolution-event-editor.xml.h:42
-#: po/tmp/evolution-task-editor-dialog.xml.h:44
-msgid "FIXME: S_end"
-msgstr "FIXME: Pošlji"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:45
-msgid "FIXME: S_end Status Report"
-msgstr "FIXME: Pošlji poročilo stanja"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:46
-msgid "FIXME: S_kip Occurrence"
-msgstr "FIXME: Preskoči ponovitev"
-
-#: po/tmp/evolution-event-editor.xml.h:43
-#: po/tmp/evolution-task-editor-dialog.xml.h:47
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Dodaj prilogo..."
-
-#: po/tmp/evolution-event-editor.xml.h:44
-#: po/tmp/evolution-task-editor-dialog.xml.h:48
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Razhroščevalnik skript"
-
-#: po/tmp/evolution-event-editor.xml.h:45
-#: po/tmp/evolution-task-editor-dialog.xml.h:49
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Zahteva po _nalogi"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:50
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Zmenek"
-
-#: po/tmp/evolution-event-editor.xml.h:46
-#: po/tmp/evolution-task-editor-dialog.xml.h:51
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Stik"
-
-#: po/tmp/evolution-event-editor.xml.h:47
-#: po/tmp/evolution-task-editor-dialog.xml.h:52
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Prilagodi..."
-
-#: po/tmp/evolution-event-editor.xml.h:48
-#: po/tmp/evolution-task-editor-dialog.xml.h:53
-msgid "FIXME: _File..."
-msgstr "FIXME: _Datoteka..."
-
-#: po/tmp/evolution-event-editor.xml.h:49
-#: po/tmp/evolution-task-editor-dialog.xml.h:54
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Pisava..."
-
-#: po/tmp/evolution-event-editor.xml.h:50
-#: po/tmp/evolution-task-editor-dialog.xml.h:55
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _Oblikovanje"
-
-#: po/tmp/evolution-event-editor.xml.h:51
-#: po/tmp/evolution-task-editor-dialog.xml.h:56
-msgid "FIXME: _Item"
-msgstr "FIXME: _Predmet"
-
-#: po/tmp/evolution-event-editor.xml.h:52
-#: po/tmp/evolution-task-editor-dialog.xml.h:57
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _Vpis v dnevniku"
-
-#: po/tmp/evolution-event-editor.xml.h:53
-#: po/tmp/evolution-task-editor-dialog.xml.h:58
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Zadnji predmet v mapi"
-
-#: po/tmp/evolution-event-editor.xml.h:54
-#: po/tmp/evolution-task-editor-dialog.xml.h:59
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Pošlji sporočilo"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:60
-msgid "FIXME: _Mark Complete"
-msgstr "FIXME: _Označi kot dokončano"
-
-#: po/tmp/evolution-event-editor.xml.h:55
-#: po/tmp/evolution-task-editor-dialog.xml.h:61
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: V slogu zabeležka"
-
-#: po/tmp/evolution-event-editor.xml.h:56
-#: po/tmp/evolution-task-editor-dialog.xml.h:62
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: Prestavi v mapo..."
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:63
-msgid "FIXME: _New Task"
-msgstr "FIXME: _Nova naloga"
-
-#: po/tmp/evolution-event-editor.xml.h:59
-#: po/tmp/evolution-task-editor-dialog.xml.h:64
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Zadeva..."
-
-#: po/tmp/evolution-event-editor.xml.h:60
-#: po/tmp/evolution-task-editor-dialog.xml.h:65
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Odstavek..."
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:66
-msgid "FIXME: _Reply"
-msgstr "FIXME: _Odgovori"
-
-#: po/tmp/evolution-event-editor.xml.h:61
-#: po/tmp/evolution-task-editor-dialog.xml.h:67
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Črkovanje..."
-
-#: po/tmp/evolution-event-editor.xml.h:62
-#: po/tmp/evolution-task-editor-dialog.xml.h:68
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Običajno"
-
-#: po/tmp/evolution-event-editor.xml.h:63
-#: po/tmp/evolution-task-editor-dialog.xml.h:69
-msgid "FIXME: _Task"
-msgstr "FIXME: _Naloga"
-
-#: po/tmp/evolution-event-editor.xml.h:64
-#: po/tmp/evolution-task-editor-dialog.xml.h:70
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: _Neprebran predmet"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:71
-msgid "FIXME: _note"
-msgstr "FIXME: _opomba"
-
-#: po/tmp/evolution-event-editor.xml.h:65
-#: po/tmp/evolution-task-editor-dialog.xml.h:72
-msgid "FIXME: what goes here?"
-msgstr "FIXME: kaj pride sem?"
-
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
-#: po/tmp/evolution-task-editor-dialog.xml.h:73
-msgid "F_ormat"
-msgstr "O_blikuj izpis"
-
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
-#: po/tmp/evolution-task-editor-dialog.xml.h:74
-msgid "Find"
-msgstr "Poišči"
-
-#: po/tmp/evolution-event-editor.xml.h:68
-#: po/tmp/evolution-task-editor-dialog.xml.h:75
-msgid "Find Again"
-msgstr "Poišči znova"
-
-#: po/tmp/evolution-event-editor.xml.h:69
-#: po/tmp/evolution-task-editor-dialog.xml.h:76
-msgid "Find _Again"
-msgstr "Poišči znova"
-
-#: po/tmp/evolution-event-editor.xml.h:70
-#: po/tmp/evolution-task-editor-dialog.xml.h:77
-msgid "Go to the next item"
-msgstr "Pojdi na naslednji predmet"
-
-#: po/tmp/evolution-event-editor.xml.h:71
-#: po/tmp/evolution-task-editor-dialog.xml.h:78
-msgid "Go to the previous item"
-msgstr "Pojdi na prejšnji predmet"
-
-#: po/tmp/evolution-event-editor.xml.h:72
-#: po/tmp/evolution-task-editor-dialog.xml.h:79
-msgid "Modify the file's properties"
-msgstr "Spremeni lastnosti datoteke"
-
-#: po/tmp/evolution-event-editor.xml.h:73
-#: po/tmp/evolution-task-editor-dialog.xml.h:80
-msgid "N_ext"
-msgstr "Napr_ej"
-
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
-#: po/tmp/evolution-mail.xml.h:30 po/tmp/evolution-task-editor-dialog.xml.h:81
-msgid "Next"
-msgstr "Naprej"
-
-#: po/tmp/evolution-event-editor.xml.h:75
-#: po/tmp/evolution-task-editor-dialog.xml.h:82
-msgid "Paste"
-msgstr "Prilepi"
-
-#: po/tmp/evolution-event-editor.xml.h:76
-#: po/tmp/evolution-task-editor-dialog.xml.h:83
-msgid "Paste the clipboard"
-msgstr "Prilepi odložišče"
-
-#: po/tmp/evolution-event-editor.xml.h:77
-#: po/tmp/evolution-task-editor-dialog.xml.h:84
-msgid "Pre_vious"
-msgstr "P_rejšnji"
-
-#: po/tmp/evolution-event-editor.xml.h:78 po/tmp/evolution-mail.xml.h:32
-#: po/tmp/evolution-task-editor-dialog.xml.h:85
-msgid "Previous"
-msgstr "Prejšnji"
-
-#: po/tmp/evolution-event-editor.xml.h:79
-#: po/tmp/evolution-task-editor-dialog.xml.h:86
-msgid "Print S_etup..."
-msgstr "Nas_tavitev tiskanja..."
-
-#: po/tmp/evolution-event-editor.xml.h:80
-#: po/tmp/evolution-task-editor-dialog.xml.h:87
-msgid "Print Setup"
-msgstr "Nastavitev tiskanja"
-
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
-#: po/tmp/evolution-task-editor-dialog.xml.h:88
-msgid "Print this item"
-msgstr "Natisni ta predmet"
-
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
-#: po/tmp/evolution-task-editor-dialog.xml.h:89
-msgid "Print..."
-msgstr "Natisni..."
-
-#: po/tmp/evolution-event-editor.xml.h:83
-#: po/tmp/evolution-task-editor-dialog.xml.h:90
-msgid "Properties"
-msgstr "Lastnosti"
-
-#: po/tmp/evolution-event-editor.xml.h:84
-#: po/tmp/evolution-task-editor-dialog.xml.h:91
-msgid "Redo"
-msgstr "Obnovi"
-
-#: po/tmp/evolution-event-editor.xml.h:85
-#: po/tmp/evolution-task-editor-dialog.xml.h:92
-msgid "Redo the undone action"
-msgstr "Obnovi razveljavljeno dejanje"
-
-#: po/tmp/evolution-event-editor.xml.h:86
-#: po/tmp/evolution-task-editor-dialog.xml.h:93
-msgid "Replace"
-msgstr "Zamenjaj"
-
-#: po/tmp/evolution-event-editor.xml.h:87
-#: po/tmp/evolution-task-editor-dialog.xml.h:94
-msgid "Replace a string"
-msgstr "Zamenjaj niz"
-
-#: po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
-#: po/tmp/evolution-task-editor-dialog.xml.h:95
-msgid "Save"
-msgstr "Shrani"
-
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:21
-#: po/tmp/evolution-task-editor-dialog.xml.h:96
-msgid "Save _As..."
-msgstr "Shrani _kot..."
-
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:90
-#: po/tmp/evolution-task-editor-dialog.xml.h:97
-msgid "Save and Close"
-msgstr "Shrani in zapri"
-
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:25
-#: po/tmp/evolution-task-editor-dialog.xml.h:98
-msgid "Save the current file"
-msgstr "Shrani trenutno datoteko"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:99
-msgid "Save the task and close the dialog box"
-msgstr "Shrani posel in zapri dialog"
-
-#: po/tmp/evolution-event-editor.xml.h:96
-#: po/tmp/evolution-task-editor-dialog.xml.h:100
-msgid "Search again for the same string"
-msgstr "Išči enak niz znova"
-
-#: po/tmp/evolution-event-editor.xml.h:97
-#: po/tmp/evolution-task-editor-dialog.xml.h:101
-msgid "Search for a string"
-msgstr "Išči niz"
-
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
-#: po/tmp/evolution-task-editor-dialog.xml.h:102
-msgid "See online help"
-msgstr "Glej pomoč na liniji"
-
-#: po/tmp/evolution-event-editor.xml.h:99
-#: po/tmp/evolution-task-editor-dialog.xml.h:103
-msgid "Select All"
-msgstr "Izberi vse"
-
-#: po/tmp/evolution-event-editor.xml.h:100
-#: po/tmp/evolution-task-editor-dialog.xml.h:104
-msgid "Select everything"
-msgstr "Izberi vse"
-
-#: po/tmp/evolution-event-editor.xml.h:101
-#: po/tmp/evolution-task-editor-dialog.xml.h:105
-msgid "Setup the page settings for your current printer"
-msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
-
-#: po/tmp/evolution-event-editor.xml.h:102
-#: po/tmp/evolution-task-editor-dialog.xml.h:106
-msgid "Undo"
-msgstr "Razveljavi"
-
-#: po/tmp/evolution-event-editor.xml.h:103
-#: po/tmp/evolution-task-editor-dialog.xml.h:107
-msgid "Undo the last action"
-msgstr "Razveljavi zadnje dejanje"
-
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:39
-#: po/tmp/evolution-task-editor-dialog.xml.h:108
-msgid "_About..."
-msgstr "_O..."
-
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:40
-#: po/tmp/evolution-task-editor-dialog.xml.h:109 po/tmp/evolution.xml.h:33
-msgid "_Close"
-msgstr "_Zapri"
-
-#: po/tmp/evolution-event-editor.xml.h:106
-#: po/tmp/evolution-task-editor-dialog.xml.h:110
-msgid "_Copy"
-msgstr "_Kopiraj"
-
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-task-editor-dialog.xml.h:111
-msgid "_Debug"
-msgstr "_Razhroščuj"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:56
-#: po/tmp/evolution-task-editor-dialog.xml.h:112
-msgid "_Delete"
-msgstr "_Zbriši"
-
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:15
-#: po/tmp/evolution-task-editor-dialog.xml.h:113 po/tmp/evolution.xml.h:35
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:43
-#: po/tmp/evolution-subscribe.xml.h:16
-#: po/tmp/evolution-task-editor-dialog.xml.h:114 po/tmp/evolution.xml.h:36
-msgid "_File"
-msgstr "_Datoteka"
-
-#: po/tmp/evolution-event-editor.xml.h:111
-#: po/tmp/evolution-task-editor-dialog.xml.h:115
-msgid "_Find..."
-msgstr "_Poišči..."
-
-#: po/tmp/evolution-event-editor.xml.h:112
-#: po/tmp/evolution-task-editor-dialog.xml.h:116
-msgid "_Forms"
-msgstr "_Obrazci"
-
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:44
-#: po/tmp/evolution-task-editor-dialog.xml.h:117 po/tmp/evolution.xml.h:39
-msgid "_Help"
-msgstr "_Pomoč"
-
-#: po/tmp/evolution-event-editor.xml.h:114
-#: po/tmp/evolution-task-editor-dialog.xml.h:118
-msgid "_Insert"
-msgstr "Vstavi"
-
-#: po/tmp/evolution-event-editor.xml.h:115
-#: po/tmp/evolution-task-editor-dialog.xml.h:119
-msgid "_Object"
-msgstr "_Predmet"
-
-#: po/tmp/evolution-event-editor.xml.h:116
-#: po/tmp/evolution-task-editor-dialog.xml.h:120
-msgid "_Paste"
-msgstr "_Prilepi"
-
-#: po/tmp/evolution-event-editor.xml.h:117
-#: po/tmp/evolution-task-editor-dialog.xml.h:121
-#: po/tmp/evolution-tasks.xml.h:12
-msgid "_Print"
-msgstr "_Natisni"
-
-#: po/tmp/evolution-event-editor.xml.h:118
-#: po/tmp/evolution-task-editor-dialog.xml.h:122
-msgid "_Properties..."
-msgstr "_Lastnosti..."
-
-#: po/tmp/evolution-event-editor.xml.h:119
-#: po/tmp/evolution-task-editor-dialog.xml.h:123
-msgid "_Redo"
-msgstr "Obnovi"
-
-#: po/tmp/evolution-event-editor.xml.h:120
-#: po/tmp/evolution-task-editor-dialog.xml.h:124
-msgid "_Replace..."
-msgstr "_Zamenjaj..."
-
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:47
-#: po/tmp/evolution-task-editor-dialog.xml.h:125
-msgid "_Save"
-msgstr "_Shrani"
-
-#: po/tmp/evolution-event-editor.xml.h:122
-#: po/tmp/evolution-task-editor-dialog.xml.h:126
-msgid "_Toolbars"
-msgstr "_Orodjarne"
-
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:123
-#: po/tmp/evolution-task-editor-dialog.xml.h:127
-msgid "_Tools"
-msgstr "_Orodja"
-
-#: po/tmp/evolution-event-editor.xml.h:124
-#: po/tmp/evolution-task-editor-dialog.xml.h:128
-msgid "_Undo"
-msgstr "_Razveljavi"
-
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:49
-#: po/tmp/evolution-task-editor-dialog.xml.h:129 po/tmp/evolution.xml.h:46
-#: shell/e-storage-set-view.c:338
-msgid "_View"
-msgstr "_Pogled"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-calendar.xml.h:7 po/tmp/evolution-tasks.xml.h:6
-msgid "Alter preferences"
-msgstr "Alternativne nastavitve"
-
-#: po/tmp/evolution-tasks.xml.h:7
-msgid "Create a new task"
-msgstr "Ustvari nov posel"
-
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
-#: po/tmp/evolution-tasks.xml.h:8
-msgid "New"
-msgstr "Nov"
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:33 po/tmp/evolution-tasks.xml.h:9
-msgid "Print"
-msgstr "Natisni"
-
-#: po/tmp/evolution-tasks.xml.h:10
-msgid "Save task as something else"
-msgstr "Shrani posel kot nekaj drugega"
-
-#: po/tmp/evolution-tasks.xml.h:11
-msgid "Tasks Preferences..."
-msgstr "Nastavitve poslov..."
-
-#: po/tmp/evolution-calendar.xml.h:35 po/tmp/evolution-tasks.xml.h:13
-msgid "_Save As..."
-msgstr "_Shrani kot..."
-
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3053
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "Name: "
@@ -858,7 +26,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Prefix:     "
@@ -866,7 +34,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3057
 msgid ""
 "\n"
 "  Given:      "
@@ -874,7 +42,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3058
 msgid ""
 "\n"
 "  Additional: "
@@ -882,7 +50,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3059
 msgid ""
 "\n"
 "  Family:     "
@@ -890,7 +58,7 @@ msgstr ""
 "\n"
 "  Družinsko:     "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3060
 msgid ""
 "\n"
 "  Suffix:     "
@@ -898,7 +66,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3074
 msgid ""
 "\n"
 "Birth Date: "
@@ -906,7 +74,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "Address:"
@@ -914,7 +82,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -922,7 +90,7 @@ msgstr ""
 "\n"
 "  Poštni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Ext:         "
@@ -930,7 +98,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Street:      "
@@ -938,7 +106,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3090
 msgid ""
 "\n"
 "  City:        "
@@ -946,7 +114,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3091
 msgid ""
 "\n"
 "  Region:      "
@@ -954,7 +122,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3092
 msgid ""
 "\n"
 "  Postal Code: "
@@ -962,7 +130,7 @@ msgstr ""
 "\n"
 "  Poštna številka: "
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3093
 msgid ""
 "\n"
 "  Country:     "
@@ -970,7 +138,7 @@ msgstr ""
 "\n"
 "  Država:      "
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3106
 msgid ""
 "\n"
 "Delivery Label: "
@@ -978,7 +146,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3118
 msgid ""
 "\n"
 "Telephones:\n"
@@ -986,7 +154,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3121
 msgid ""
 "\n"
 "Telephone:"
@@ -994,7 +162,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3145
 msgid ""
 "\n"
 "E-mail:\n"
@@ -1002,7 +170,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3148
 msgid ""
 "\n"
 "E-mail:"
@@ -1010,7 +178,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3167
 msgid ""
 "\n"
 "Mailer: "
@@ -1018,7 +186,7 @@ msgstr ""
 "\n"
 "Poštni program: "
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3173
 msgid ""
 "\n"
 "Time Zone: "
@@ -1026,7 +194,7 @@ msgstr ""
 "\n"
 "Časovna cona: "
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Geo Location: "
@@ -1034,7 +202,7 @@ msgstr ""
 "\n"
 "Geografski položaj: "
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3185
 msgid ""
 "\n"
 "Business Role: "
@@ -1042,7 +210,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "Org: "
@@ -1050,7 +218,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Name:  "
@@ -1058,7 +226,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "  Unit:  "
@@ -1066,7 +234,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "  Unit2: "
@@ -1074,7 +242,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3201
 msgid ""
 "\n"
 "  Unit3: "
@@ -1082,7 +250,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "  Unit4: "
@@ -1090,7 +258,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3206
 msgid ""
 "\n"
 "Categories: "
@@ -1098,7 +266,7 @@ msgstr ""
 "\n"
 "Categorije: "
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3207
 msgid ""
 "\n"
 "Comment: "
@@ -1116,7 +284,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3220
 msgid ""
 "\n"
 "Unique String: "
@@ -1124,7 +292,7 @@ msgstr ""
 "\n"
 "Enoličen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3223
 msgid ""
 "\n"
 "Public Key: "
@@ -1139,7 +307,7 @@ msgstr ""
 #: addressbook/conduit/address-conduit.c:1089
 #: addressbook/gui/component/addressbook-factory.c:38
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
@@ -1304,6 +472,12 @@ msgstr "Zbriši stik?"
 msgid "_Add"
 msgstr "_Dodaj"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: po/tmp/evolution-event-editor.xml.h:62 po/tmp/evolution-mail.xml.h:54
+#: po/tmp/evolution-task-editor-dialog.xml.h:74
+msgid "_Delete"
+msgstr "_Zbriši"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:9
 msgid "Phone Types"
 msgstr "Tipi telefonov"
@@ -1377,7 +551,7 @@ msgid "C_ontacts..."
 msgstr "_Stiki..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
+#: po/tmp/event-editor-dialog.glade.h:10 po/tmp/task-editor-dialog.glade.h:7
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
@@ -1394,7 +568,7 @@ msgid "_Address..."
 msgstr "_Naslov..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config.glade.h:31
+#: po/tmp/mail-config.glade.h:33
 msgid "General"
 msgstr "Splošno"
 
@@ -1444,23 +618,23 @@ msgid "Details"
 msgstr "Podrobnosti"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Assistant"
 msgstr "Pomočnik"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Business"
 msgstr "Služba"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business 2"
 msgstr "Služba"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Business Fax"
 msgstr "Službeni faks"
 
@@ -1469,7 +643,7 @@ msgid "Callback"
 msgstr "Povratni klic"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Car"
 msgstr "Avto"
 
@@ -1479,34 +653,34 @@ msgstr "Podjetje"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Home"
 msgstr "Doma"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home 2"
 msgstr "Doma 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Home Fax"
 msgstr "Domači faks"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: po/tmp/mail-config.glade.h:50
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: po/tmp/mail-config.glade.h:52
 msgid "Other"
 msgstr "Drugo"
 
@@ -1515,12 +689,12 @@ msgid "Other Fax"
 msgstr "Drugi faks"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Pager"
 msgstr "Pozivnik"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Primary"
 msgstr "Prvi"
 
@@ -1537,12 +711,12 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Email 2"
 msgstr "E-naslov 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Email 3"
 msgstr "E-naslov 3"
 
@@ -1726,127 +900,163 @@ msgstr "URI, ki naj ga prikaže brskalnik map"
 msgid "Other Contacts"
 msgstr "Drugo stiki"
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/component/addressbook-config.c:143
 msgid "LDAP Server"
 msgstr "LDAP strežnik"
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/component/addressbook-config.c:145
 msgid "File"
 msgstr "Datoteka"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "Unknown addressbook type"
 msgstr "Neznan tip adresarja"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-config.c:158
 msgid "None (anonymous mode)"
 msgstr "Brez (anonimni način)"
 
-#: addressbook/gui/component/addressbook-config.c:155
+#: addressbook/gui/component/addressbook-config.c:160
 #: camel/providers/imap/camel-imap-store.c:249
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid "Password"
 msgstr "Geslo"
 
-#: addressbook/gui/component/addressbook-config.c:157
+#: addressbook/gui/component/addressbook-config.c:162
 msgid "SASL"
 msgstr "SASL"
 
-#: addressbook/gui/component/addressbook-config.c:160
+#: addressbook/gui/component/addressbook-config.c:165
 msgid "Unknown auth type"
 msgstr "Neznan način avtentifikacije"
 
-#: addressbook/gui/component/addressbook-config.c:169
+#: addressbook/gui/component/addressbook-config.c:174
 msgid "Base"
 msgstr "Osnovno"
 
-#: addressbook/gui/component/addressbook-config.c:171
+#: addressbook/gui/component/addressbook-config.c:176
 msgid "One"
 msgstr "Ena"
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/component/addressbook-config.c:178
 msgid "Subtree"
 msgstr "Poddrevo"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Unknown scope type"
 msgstr "Neznan tip dosega"
 
-#: addressbook/gui/component/addressbook-config.c:309
+#: addressbook/gui/component/addressbook-config.c:348
 msgid "Bind DN:"
 msgstr "Povezan z domeno:"
 
-#: addressbook/gui/component/addressbook-config.c:311
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "FIXME Bind DN Help text here"
+msgstr "FIXME Bind DN Help text here"
+
+#: addressbook/gui/component/addressbook-config.c:351
 msgid "Remember this password"
 msgstr "Zapomni si geslo"
 
-#: addressbook/gui/component/addressbook-config.c:360
-#: po/tmp/mail-config.glade.h:32
+#: addressbook/gui/component/addressbook-config.c:401
+#: po/tmp/mail-config.glade.h:34
 msgid "Host:"
 msgstr "Gostitelj:"
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/component/addressbook-config.c:402
+msgid "FIXME Host help text here."
+msgstr "FIXME Host help text here."
+
+#: addressbook/gui/component/addressbook-config.c:404
 msgid "Port:"
 msgstr "Vrata:"
 
-#: addressbook/gui/component/addressbook-config.c:364
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Port help text here."
+msgstr "FIXME Port help text here."
+
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Root DN:"
 msgstr "Kornsko ime domene:"
 
-#: addressbook/gui/component/addressbook-config.c:384
+#: addressbook/gui/component/addressbook-config.c:410
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Root DN help text here."
+
+#: addressbook/gui/component/addressbook-config.c:430
 msgid "Search Scope:"
 msgstr "Doseg iskanja:"
 
-#: addressbook/gui/component/addressbook-config.c:438
+#: addressbook/gui/component/addressbook-config.c:484
 #: po/tmp/mail-config.glade.h:14
 msgid "Authentication:"
 msgstr "Avtentifikacija:"
 
-#: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.c:460 po/tmp/mail-config.glade.h:53
+#: addressbook/gui/component/addressbook-config.c:502
+#: mail/mail-config-druid.c:491 po/tmp/mail-config.glade.h:55
 msgid "Path:"
 msgstr "Pot:"
 
-#: addressbook/gui/component/addressbook-config.c:460
+#: addressbook/gui/component/addressbook-config.c:503
+msgid "FIXME Path Help text here"
+msgstr "FIXME Path help text here"
+
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "Create path if it doesn't exist."
 msgstr "Če pot ne obstaja jo ustvari."
 
-#: addressbook/gui/component/addressbook-config.c:593
+#: addressbook/gui/component/addressbook-config.c:642
 msgid "Edit Addressbook"
 msgstr "Uredi adresar"
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/component/addressbook-config.c:644
 msgid "Add Addressbook"
 msgstr "Dodaj adresar"
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: addressbook/gui/component/addressbook-config.c:660
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 "Izberite tip adresarja, ki ga imate in vnestite potrebne podatke o njem."
 
-#: addressbook/gui/component/addressbook-config.c:616
-#: po/tmp/mail-config.glade.h:45
+#: addressbook/gui/component/addressbook-config.c:666
+#: po/tmp/mail-config.glade.h:47
 msgid "Name:"
 msgstr "Ime:"
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: addressbook/gui/component/addressbook-config.c:667
+msgid "FIXME Name help text here"
+msgstr "FIXME Name help text here"
+
+#: addressbook/gui/component/addressbook-config.c:669
 #: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "Description:"
 msgstr "Opis:"
 
+#: addressbook/gui/component/addressbook-config.c:670
+msgid "FIXME Description help text here"
+msgstr "FIXME Description help text here"
+
 #: po/tmp/addressbook-config.glade.h:7
 msgid "Addressbook Sources"
 msgstr "Viri adresarja"
 
+#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684 mail/mail-view.c:150
+#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:14
+#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:22
+#: po/tmp/evolution-mail.xml.h:11 po/tmp/evolution-task-editor-dialog.xml.h:23
+#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:26
+msgid "Delete"
+msgstr "Zbriši"
+
 #: mail/folder-browser.c:670 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:27
+#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:29
 msgid "Edit"
 msgstr "Uredi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 #: po/tmp/addressbook-config.glade.h:10
 msgid "Name"
 msgstr "Ime"
@@ -1875,8 +1085,7 @@ msgstr "Izberi imena"
 msgid "Select name from:"
 msgstr "Izberi ime iz:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
 msgid "Search"
 msgstr "Iskanje"
 
@@ -1992,56 +1201,60 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-addressbook-view.c:474
 #: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Shrani kot vVizitko"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "* Click here to add a contact *"
+msgstr "* Kliknite tu za dodajo stika *"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Email"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Web Site"
 msgstr "Spletna stran"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Department"
 msgstr "Oddelek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "Office"
 msgstr "Pisarna"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:591
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Profession"
 msgstr "Poklic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Manager"
 msgstr "Upravljalec"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 msgid "Spouse"
 msgstr "Partner(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 msgid "Note"
 msgstr "Opomba"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
@@ -2223,7 +1436,7 @@ msgstr "Ime stila:"
 msgid "Top:"
 msgstr "Zgoraj:"
 
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:75
+#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:77
 msgid "Type:"
 msgstr "Tip:"
 
@@ -2266,19 +1479,19 @@ msgstr "Nastavitveno orodje za Evolucijin za-opravit veznik.\n"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama za-opravit"
 
-#: calendar/gui/calendar-commands.c:245
+#: calendar/gui/calendar-commands.c:248
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
 
-#: calendar/gui/calendar-commands.c:269
+#: calendar/gui/calendar-commands.c:272
 msgid "Open calendar"
 msgstr "Odpri koledar"
 
-#: calendar/gui/calendar-commands.c:311
+#: calendar/gui/calendar-commands.c:314
 msgid "Save calendar"
 msgstr "Shrani koledar"
 
-#: calendar/gui/calendar-commands.c:448
+#: calendar/gui/calendar-commands.c:451
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -2286,7 +1499,7 @@ msgstr ""
 "in OAF-a."
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
+#: calendar/gui/calendar-model.c:337
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -2294,58 +1507,59 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
+#: calendar/gui/calendar-model.c:341 calendar/gui/calendar-model.c:771
 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,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
+#: calendar/gui/calendar-model.c:345 calendar/gui/calendar-model.c:774
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:374 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:379
 msgid "Public"
 msgstr "Javno"
 
-#: calendar/gui/calendar-model.c:377 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:382
 msgid "Private"
 msgstr "Osebno"
 
-#: calendar/gui/calendar-model.c:380 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:385
 msgid "Confidential"
 msgstr "Zaupno"
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:388 calendar/gui/calendar-model.c:556
+#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
 #: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Unknown"
 msgstr "Neznano"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:476
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:476
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:478
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:478
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:550
 msgid "Transparent"
 msgstr "Prozorno"
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:553
 msgid "Opaque"
 msgstr "Prosojno"
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:779
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2357,7 +1571,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:880 calendar/gui/calendar-model.c:928
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -2365,27 +1579,27 @@ msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
+#: calendar/gui/calendar-model.c:898
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
+#: calendar/gui/calendar-model.c:901
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
+#: calendar/gui/calendar-model.c:905
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
+#: calendar/gui/calendar-model.c:908
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1028
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2395,47 +1609,47 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1068
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost v procentih mora biti med vključno 0 in 100"
 
-#: calendar/gui/calendar-model.c:1103
+#: calendar/gui/calendar-model.c:1108
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteta mora biti med vključno 1 in 9"
 
-#: calendar/gui/calendar-summary.c:97
+#: calendar/gui/calendar-summary.c:197
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:302
+#: calendar/gui/calendar-summary.c:438
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Napaka ob nalaganju koledarja</b>"
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:450
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Napaka ob nalaganju koledarja: <br>Postopek ni podprt"
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/calendar-summary.c:620
 msgid "Display"
 msgstr "Prikaz"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:625
 msgid "Show appointments"
 msgstr "Kaži zmenke"
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/calendar-summary.c:633
 msgid "Show tasks"
 msgstr "Kaži posle"
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/calendar-summary.c:719
 msgid "Loading Calendar"
 msgstr "Nalagam koledar"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -2451,6 +1665,18 @@ msgstr "Obvestilo o vašem zmenku na %A %d %b %Y ob %H:%M"
 msgid "No summary available."
 msgstr "Povzetek ni na voljo."
 
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
+#: po/tmp/evolution-event-editor.xml.h:15
+#: po/tmp/evolution-message-composer.xml.h:8
+#: po/tmp/evolution-subscribe.xml.h:7
+#: po/tmp/evolution-task-editor-dialog.xml.h:16 po/tmp/evolution.xml.h:7
+msgid "Close"
+msgstr "Zapri"
+
 #: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Uredi zmenek"
@@ -2507,7 +1733,7 @@ msgstr "Zvočni alarmi"
 msgid "Beep when alarm windows appear."
 msgstr "Pozvoni, ko se pokažejo okna alarmov."
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: po/tmp/cal-prefs-dialog.glade.h:16 po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar"
 msgstr "Koledar"
 
@@ -2555,7 +1781,7 @@ msgstr "Prvi dan tedna:"
 msgid "Fri"
 msgstr "pet"
 
-#: calendar/gui/event-editor.c:440 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:477 po/tmp/cal-prefs-dialog.glade.h:28
 msgid "Friday"
 msgstr "petek"
 
@@ -2583,7 +1809,7 @@ msgstr "Predmeti z rokom v prihodnosti:"
 msgid "Mon"
 msgstr "pon"
 
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:473 po/tmp/cal-prefs-dialog.glade.h:35
 msgid "Monday"
 msgstr "ponedeljek"
 
@@ -2607,7 +1833,7 @@ msgstr "Prioriteta"
 msgid "Remind me of all appointments"
 msgstr "Opomni me na vse zmenke"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: po/tmp/cal-prefs-dialog.glade.h:41 po/tmp/event-editor-dialog.glade.h:26
 msgid "Reminders"
 msgstr "Opozorila"
 
@@ -2615,7 +1841,7 @@ msgstr "Opozorila"
 msgid "Sat"
 msgstr "sob"
 
-#: calendar/gui/event-editor.c:441 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:478 po/tmp/cal-prefs-dialog.glade.h:43
 msgid "Saturday"
 msgstr "sobota"
 
@@ -2639,7 +1865,7 @@ msgstr "Začetek dneva:"
 msgid "Sun"
 msgstr "ned"
 
-#: calendar/gui/event-editor.c:442 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:479 po/tmp/cal-prefs-dialog.glade.h:49
 msgid "Sunday"
 msgstr "nedeljo"
 
@@ -2651,7 +1877,7 @@ msgstr "Naloge"
 msgid "Thu"
 msgstr "čet"
 
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:476 po/tmp/cal-prefs-dialog.glade.h:52
 msgid "Thursday"
 msgstr "četrtek"
 
@@ -2671,7 +1897,7 @@ msgstr "Oblika izpisa časa:"
 msgid "Tue"
 msgstr "tor"
 
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:474 po/tmp/cal-prefs-dialog.glade.h:57
 msgid "Tuesday"
 msgstr "torek"
 
@@ -2683,7 +1909,7 @@ msgstr "Vidni alarmi"
 msgid "Wed"
 msgstr "sre"
 
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:475 po/tmp/cal-prefs-dialog.glade.h:60
 msgid "Wednesday"
 msgstr "sreda"
 
@@ -2695,38 +1921,38 @@ msgstr "Delavni teden"
 msgid "minutes before they occur."
 msgstr "minut preden se zgodijo."
 
-#: po/tmp/cal-prefs-dialog.glade.h:63 po/tmp/mail-config.glade.h:81
+#: po/tmp/cal-prefs-dialog.glade.h:63 po/tmp/mail-config.glade.h:84
 msgid "seconds."
 msgstr "sekundah."
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/delete-comp.c:68
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ste prepričani, da želite zbrisati ta zmenek `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:66
+#: calendar/gui/dialogs/delete-comp.c:71
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ste prepričani, želite zbrisati ta neimenovan zmenek?"
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/delete-comp.c:77
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:75
+#: calendar/gui/dialogs/delete-comp.c:80
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ste prepričani, da želite zbrisati ta neimenovan posel?"
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/delete-comp.c:86
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:89
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ste prepričani, da želite izbrisati ta neimenovan dnevniški vpis?"
 
-#: calendar/gui/dialogs/save-comp.c:46
+#: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "Želite shraniti spremembe"
 
@@ -2738,18 +1964,23 @@ msgstr "Želite shraniti spremembe"
 msgid "% Comp_lete:"
 msgstr "% konča_no:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "_Uvrstitev:"
-
-#: po/tmp/task-editor-dialog.glade.h:9
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Cancelled"
 msgstr "Preklicano"
 
+#: calendar/gui/e-calendar-table.c:155 po/tmp/event-editor-dialog.glade.h:11
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr "Uvrstitev"
+
 #: po/tmp/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Končano"
 
+#: po/tmp/event-editor-dialog.glade.h:13 po/tmp/task-editor-dialog.glade.h:11
+msgid "Date &amp; Time"
+msgstr "Datum in ura"
+
 #: po/tmp/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Končano dne:"
@@ -2766,32 +1997,34 @@ msgstr "V teku"
 msgid "Low"
 msgstr "Nizka"
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:674 mail/mail-account-editor.c:676
-#: mail/mail-account-editor.c:725 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:872 po/tmp/mail-config.glade.h:47
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1116
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Brez"
-
-#: po/tmp/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:17
 msgid "Normal"
 msgstr "Običajna"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: po/tmp/task-editor-dialog.glade.h:18
 msgid "Not Started"
 msgstr "Ni pričeto"
 
-#: po/tmp/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr "_Povzetek"
+#: po/tmp/event-editor-dialog.glade.h:21 po/tmp/task-editor-dialog.glade.h:19
+msgid "Pri_vate"
+msgstr "Pri_vatno"
+
+#: po/tmp/task-editor-dialog.glade.h:20
+msgid "Progress"
+msgstr "Napredek"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: po/tmp/event-editor-dialog.glade.h:22 po/tmp/task-editor-dialog.glade.h:21
+msgid "Pu_blic"
+msgstr "_Javno"
+
+#: po/tmp/task-editor-dialog.glade.h:22
 msgid "Sta_rt Date:"
 msgstr "Datum _pričetka:"
 
+#: po/tmp/event-editor-dialog.glade.h:32 po/tmp/task-editor-dialog.glade.h:23
+msgid "Su_mmary:"
+msgstr "_Povzetek:"
+
 #: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Naloga"
@@ -2804,45 +2037,45 @@ msgstr "URL:"
 msgid "Undefined"
 msgstr "Ni definiran"
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: po/tmp/event-editor-dialog.glade.h:33 po/tmp/task-editor-dialog.glade.h:27
+msgid "_Confidential"
+msgstr "_Zaupno"
+
+#: po/tmp/event-editor-dialog.glade.h:34 po/tmp/task-editor-dialog.glade.h:28
 msgid "_Contacts..."
 msgstr "_Stiki..."
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:29
 msgid "_Due Date:"
 msgstr "_Do datuma:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: po/tmp/task-editor-dialog.glade.h:30
 msgid "_Priority:"
 msgstr "_Prioriteta:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:31
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: po/tmp/task-editor-dialog.glade.h:31
-msgid "task-editor-dialog"
-msgstr "dialog-urejevalnik-dogodkov"
-
-#: calendar/gui/dialogs/task-editor.c:692
+#: calendar/gui/dialogs/task-editor.c:689
 msgid "Edit Task"
 msgstr "Uredi nalogo"
 
-#: calendar/gui/dialogs/task-editor.c:698 calendar/gui/event-editor.c:338
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:344
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zmenek - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:347
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/task-editor.c:710 calendar/gui/event-editor.c:350
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
@@ -2851,10 +2084,6 @@ msgstr "Vpis v dnevniku - %s"
 msgid "Categories"
 msgstr "kategorije"
 
-#: calendar/gui/e-calendar-table.c:155 po/tmp/event-editor-dialog.glade.h:10
-msgid "Classification"
-msgstr "Uvrstitev"
-
 #: calendar/gui/e-calendar-table.c:156
 msgid "Completion Date"
 msgstr "Datum zaključka"
@@ -2891,92 +2120,175 @@ msgstr "URL"
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Odpri..."
+#: calendar/gui/e-calendar-table.c:167
+msgid "Click here to add a task"
+msgstr "Kliknite tu za dodajo opravila"
 
 #: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "Odpri nalogo"
-
-#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:399
 msgid "Mark the task complete"
 msgstr "Označi nalogo kot opravljeno"
 
 #: calendar/gui/e-calendar-table.c:404
+msgid "Edit this task..."
+msgstr "Uredi to opravilo..."
+
+#: calendar/gui/e-calendar-table.c:405
+msgid "Edit the task"
+msgstr "Uredi opravilo"
+
+#: calendar/gui/e-calendar-table.c:407
+#: po/tmp/evolution-task-editor-dialog.xml.h:24
+msgid "Delete this task"
+msgstr "Zbriši to nalogo"
+
+#: calendar/gui/e-calendar-table.c:408
 msgid "Delete the task"
 msgstr "Zbriši nalogo"
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i deljenj minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
 #: calendar/gui/e-week-view-main-item.c:330
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
 #: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
+#: calendar/gui/print.c:612
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
+#: calendar/gui/print.c:611
 msgid "pm"
 msgstr "pop"
 
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
+#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
+#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
+#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
 msgid "New appointment..."
 msgstr "Nov zmenek..."
 
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
+#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
+#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
+msgid "Schedule meeting"
+msgstr "Načrtuj sestanek"
+
+#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
+#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
 msgid "Edit this appointment..."
 msgstr "Uredi ta zmenek..."
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
+#: po/tmp/evolution-event-editor.xml.h:23
 msgid "Delete this appointment"
 msgstr "Zbriši ta zmenek"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
+#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
 msgid "Make this appointment movable"
 msgstr "Naredi zmenek prestavljiv"
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
 msgid "Delete this occurrence"
 msgstr "Zbriši to pojavitev"
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
+#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
 msgid "Delete all occurrences"
 msgstr "Zbriši vse pojavitve"
 
+#: calendar/gui/e-itip-control.c:153
+msgid "I couldn't update your calendar file!\n"
+msgstr "Nisem mogel posodobiti vašege datoteeke koledarja!\n"
+
+#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+msgid "Component successfully updated."
+msgstr "Komponenta je bila uspešno posodobljena."
+
+#: calendar/gui/e-itip-control.c:165
+msgid "There was an error loading the calendar file."
+msgstr "Napaka ob nalaganju datoteke koledarja."
+
+#: calendar/gui/e-itip-control.c:189
+msgid "I couldn't open your calendar file!\n"
+msgstr "Nisem mogel odpreti datoteke koledarja!\n"
+
+#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+msgid "I couldn't load your calendar file!\n"
+msgstr "Nisem mogel naložiti vašege datoteke koledarja!\n"
+
+#: calendar/gui/e-itip-control.c:462
+msgid "I couldn't read your calendar file!\n"
+msgstr "Nisem mogel prebrati datoteke vašega koledarja!"
+
+#: calendar/gui/e-itip-control.c:475
+msgid "This is a reply from someone who was uninvited!"
+msgstr "To je odgovor nekoga, ki ni bil povabljen!"
+
+#: calendar/gui/e-itip-control.c:491
+msgid "I couldn't update your calendar store."
+msgstr "Nisem mogel posodobiti vaše shrambe koledarja."
+
+#: calendar/gui/e-itip-control.c:532
+msgid "I couldn't delete the calendar component!\n"
+msgstr "Nisem mogel zbriati komponente koledarja!\n"
+
+#: calendar/gui/e-itip-control.c:542
+msgid "Component successfully deleted."
+msgstr "Komponenta uspešno zbrisana."
+
+#: calendar/gui/e-itip-control.c:686
+msgid "I don't recognize this type of calendar component."
+msgstr "Ne preoznam te vrste komponente koledarja."
+
+#: calendar/gui/e-itip-control.c:772
+msgid "Add to Calendar"
+msgstr "Dodaj _koledarju"
+
+#: calendar/gui/e-itip-control.c:806
+msgid "Accept"
+msgstr "Sprejmi"
+
+#: calendar/gui/e-itip-control.c:807
+msgid "Decline"
+msgstr "Zavrni"
+
+#: calendar/gui/e-itip-control.c:808
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Poskusno"
+
+#: calendar/gui/e-itip-control.c:852
+msgid "Update Calendar"
+msgstr "Posodobi koledar"
+
+#: calendar/gui/e-itip-control.c:875
+msgid "Cancel Meeting"
+msgstr "Prekliči sestanek"
+
 #: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:454
 #: calendar/gui/e-tasks.c:487
 msgid "All"
@@ -3012,196 +2324,242 @@ msgid "A_ll day event"
 msgstr "_Celodnevni dogodek"
 
 #: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment"
+msgstr "Zmenek"
+
+#: po/tmp/event-editor-dialog.glade.h:9
 msgid "Appointment Basics"
 msgstr "Osnove zmenkov"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: po/tmp/event-editor-dialog.glade.h:12
 msgid "Custom recurrence"
 msgstr "Ponovitev po meri"
 
-#: po/tmp/event-editor-dialog.glade.h:12
-msgid "Days"
-msgstr "Dni"
-
-#: po/tmp/event-editor-dialog.glade.h:14
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "Every"
 msgstr "Vsak"
 
-#: po/tmp/event-editor-dialog.glade.h:15
+#: po/tmp/event-editor-dialog.glade.h:16
 msgid "Exceptions"
 msgstr "Izjeme"
 
 #: po/tmp/event-editor-dialog.glade.h:17
-msgid "Hours"
-msgstr "Ur"
-
-#: po/tmp/event-editor-dialog.glade.h:18
-msgid "Mail _to:"
-msgstr "Pošlji pošto _za:"
-
-#: po/tmp/event-editor-dialog.glade.h:19
-msgid "Minutes"
-msgstr "Minut"
-
-#: po/tmp/event-editor-dialog.glade.h:20
 msgid "Modify"
 msgstr "Spremeni"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: po/tmp/event-editor-dialog.glade.h:18
 msgid "No recurrence"
 msgstr "Ni ponovitev"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1566 po/tmp/event-editor-dialog.glade.h:19
+msgid "Play a sound"
+msgstr "Predvajaj zvok"
+
+#: po/tmp/event-editor-dialog.glade.h:20
 msgid "Preview"
 msgstr "Predogled"
 
 #: po/tmp/event-editor-dialog.glade.h:23
-msgid "Pri_vate"
-msgstr "Pri_vatno"
-
-#: po/tmp/event-editor-dialog.glade.h:24
-msgid "Pu_blic"
-msgstr "_Javno"
-
-#: po/tmp/event-editor-dialog.glade.h:25
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: po/tmp/event-editor-dialog.glade.h:24
 msgid "Recurrence Rule"
 msgstr "Pravilo ponovitev"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: po/tmp/event-editor-dialog.glade.h:25
 msgid "Reminder"
 msgstr "Opozorilo"
 
-#: po/tmp/event-editor-dialog.glade.h:28
-msgid "Simple recurrence"
-msgstr "Enostavna ponovitev"
+#: calendar/gui/event-editor.c:1575 po/tmp/event-editor-dialog.glade.h:27
+msgid "Run a program"
+msgstr "Poženi program"
+
+#: calendar/gui/event-editor.c:1572 po/tmp/event-editor-dialog.glade.h:28
+msgid "Send an email"
+msgstr "Pošlji e-pošto"
 
 #: po/tmp/event-editor-dialog.glade.h:29
-msgid "Su_mmary:"
-msgstr "_Povzetek:"
+msgid "Settings..."
+msgstr "Nastavitve..."
 
-#: po/tmp/event-editor-dialog.glade.h:30
-msgid "Time"
-msgstr "Čas"
+#: calendar/gui/event-editor.c:1569 po/tmp/event-editor-dialog.glade.h:30
+msgid "Show a dialog"
+msgstr "Kaži dialog"
 
 #: po/tmp/event-editor-dialog.glade.h:31
-msgid "_Audio"
-msgstr "_Zvok"
-
-#: po/tmp/event-editor-dialog.glade.h:32
-msgid "_Confidential"
-msgstr "_Zaupno"
-
-#: po/tmp/event-editor-dialog.glade.h:33
-msgid "_Contacts"
-msgstr "_Stiki"
-
-#: po/tmp/event-editor-dialog.glade.h:34
-msgid "_Display"
-msgstr "_Prikaz"
+msgid "Simple recurrence"
+msgstr "Enostavna ponovitev"
 
 #: po/tmp/event-editor-dialog.glade.h:35
 msgid "_End time:"
 msgstr "_Čas konca:"
 
 #: po/tmp/event-editor-dialog.glade.h:36
-msgid "_Mail"
-msgstr "_Pošlji pošto"
-
-#: po/tmp/event-editor-dialog.glade.h:37
-msgid "_Program"
-msgstr "_Program"
-
-#: po/tmp/event-editor-dialog.glade.h:38
-msgid "_Run program:"
-msgstr "_Poženi program:"
-
-#: po/tmp/event-editor-dialog.glade.h:39
 msgid "_Start time:"
 msgstr "_Čas pričetka:"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: po/tmp/event-editor-dialog.glade.h:37
 msgid "_Starting date:"
 msgstr "Datum _pričetka:"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: filter/libfilter-i18n.h:25 po/tmp/event-editor-dialog.glade.h:38
+msgid "after"
+msgstr "po"
+
+#: filter/libfilter-i18n.h:26 po/tmp/event-editor-dialog.glade.h:39
+msgid "before"
+msgstr "pred"
+
+#: po/tmp/event-editor-dialog.glade.h:40
 msgid "day(s)"
 msgstr "dni"
 
-#: po/tmp/event-editor-dialog.glade.h:42
-msgid "event-editor-dialog"
-msgstr "dialog-urejevalec-dogodkov"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "end of appointment"
+msgstr "konec zmenka"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: po/tmp/event-editor-dialog.glade.h:42
 msgid "for"
 msgstr "za"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: po/tmp/event-editor-dialog.glade.h:43
 msgid "forever"
 msgstr "vseskozi"
 
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "hour(s)"
+msgstr "ur"
+
 #: po/tmp/event-editor-dialog.glade.h:45
 msgid "label21"
 msgstr "označba21"
 
 #: po/tmp/event-editor-dialog.glade.h:46
+msgid "label55"
+msgstr "label55"
+
+#: po/tmp/event-editor-dialog.glade.h:47
+msgid "minute(s)"
+msgstr "minut"
+
+#: po/tmp/event-editor-dialog.glade.h:48
 msgid "month(s)"
 msgstr "mesec"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: po/tmp/event-editor-dialog.glade.h:49
+msgid "start of appointment"
+msgstr "pričetek zmenka"
+
+#: po/tmp/event-editor-dialog.glade.h:50
 msgid "until"
 msgstr "do"
 
-#: po/tmp/event-editor-dialog.glade.h:48
+#: po/tmp/event-editor-dialog.glade.h:51
 msgid "week(s)"
 msgstr "tednov"
 
-#: po/tmp/event-editor-dialog.glade.h:49
+#: po/tmp/event-editor-dialog.glade.h:52
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/event-editor.c:332
+#: calendar/gui/event-editor.c:369
 msgid "Edit Appointment"
 msgstr "Uredi zmenek"
 
-#: calendar/gui/event-editor.c:410
+#: calendar/gui/event-editor.c:447
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/event-editor.c:435 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:599
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/event-editor.c:569
+#: calendar/gui/event-editor.c:606
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/event-editor.c:723
+#: calendar/gui/event-editor.c:752
 msgid "occurrences"
 msgstr "pojavitve"
 
-#: calendar/gui/event-editor.c:840
+#: calendar/gui/event-editor.c:869
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ta zmenek vsebuje pojavitve, ki jih Evolucija ne zna urejati."
 
-#: calendar/gui/event-editor.c:3092 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:1521
+msgid " %d days"
+msgstr " %d dni"
+
+#: calendar/gui/event-editor.c:1523
+msgid " 1 day"
+msgstr " 1 dan"
+
+#: calendar/gui/event-editor.c:1526
+msgid " %d weeks"
+msgstr " %d tedenov"
+
+#: calendar/gui/event-editor.c:1528
+msgid " 1 week"
+msgstr " 1 teden"
+
+#: calendar/gui/event-editor.c:1531
+#, fuzzy, c-format
+msgid " %d hours"
+msgstr " %d ur"
+
+#: calendar/gui/event-editor.c:1533
+msgid " 1 hour"
+msgstr " 1 ura"
+
+#: calendar/gui/event-editor.c:1536
+msgid " %d minutes"
+msgstr " %d minut"
+
+#: calendar/gui/event-editor.c:1538
+msgid " 1 minute"
+msgstr " 1 minuta"
+
+#: calendar/gui/event-editor.c:1541
+msgid " %d seconds"
+msgstr " %d sekund"
+
+#: calendar/gui/event-editor.c:1543
+msgid " 1 second"
+msgstr " 1 sekunda"
+
+#: calendar/gui/event-editor.c:1590
+msgid " before start of appointment"
+msgstr " pred pričetkom zmenka"
+
+#: calendar/gui/event-editor.c:1592
+msgid " after start of appointment"
+msgstr " po pričetku zmenka"
+
+#: calendar/gui/event-editor.c:1600
+msgid " before end of appointment"
+msgstr " pred koncem zmenka"
+
+#: calendar/gui/event-editor.c:1602
+#, fuzzy
+msgid " after end of appointment"
+msgstr " po koncu zmenka"
+
+#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1094 calendar/gui/print.c:1095
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/gnome-cal.c:696
+#: calendar/gui/gnome-cal.c:694
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:705
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
@@ -3266,199 +2624,199 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/main.c:50
+#: calendar/gui/main.c:49
 msgid "Could not initialize GNOME"
 msgstr "Nisem mogel inicializirati GNOMEa"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:295
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:295
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:295
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:295
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:295
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:296
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:296
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:296
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:296
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:296
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:297
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:297
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:297
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:297
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:297
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:298
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:298
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:298
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:298
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:298
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:299
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:299
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:299
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:299
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:299
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:300
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:300
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:300
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:300
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:300
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:301
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:357
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:357
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:357
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:357
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:357
 msgid "Th"
 msgstr "če"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:357
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:357
 msgid "Sa"
 msgstr "so"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:943
 msgid "Tasks"
 msgstr "Naloge"
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1073
 msgid "Current day (%a %b %d %Y)"
 msgstr "Trenuten dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1091
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1088
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Trenutni teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1107
 msgid "Current month (%b %Y)"
 msgstr "Trenutni mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1114
 msgid "Current year (%Y)"
 msgstr "Trenutno leto (%Y)"
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1151
 msgid "Print Calendar"
 msgstr "Natisni _koledar"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1035
+#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1161
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
@@ -3470,10 +2828,49 @@ msgstr "URI mape poslov, ki naj se kaže"
 msgid "SMTWTFS"
 msgstr "PTSČPSN"
 
+#: camel/camel-filter-driver.c:767
+msgid "Error parsing filter: %s: %s"
+msgstr "Napaka ob razčlenjanju filtra: %s: %s"
+
+#: camel/camel-filter-driver.c:772
+msgid "Error executing filter: %s: %s"
+msgstr "Napaka ob izvajanju filtra: %s: %s"
+
 #: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
+#, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
 
+#: camel/camel-folder-search.c:320
+#, fuzzy, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Nisem mogel razčleniti iskalnega izraza %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:330
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Napaka ob izvajanju iskalnega izraza %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) zahteva enojen booleanov rezultat"
+
+#: camel/camel-folder-search.c:547
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Opravljam poizvedbo na neznani glavi: %s"
+
+#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
+msgid "Invalid type in body-contains, expecting string"
+msgstr "Neveljaven tip v body-contains, pričakovan niz"
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
 #: camel/camel-movemail.c:183
@@ -3562,67 +2959,72 @@ msgstr "Nisem mogel naložiti %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nisem mogel naložiti %s: V modulu ni inicializacijske kode."
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:183
 #, c-format
 msgid "%s server %s"
 msgstr "strežnik %s %s"
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:187
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "storitev %s za %s na %s"
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:313
 msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: camel/camel-remote-store.c:316 camel/camel-remote-store.c:329
 #: camel/providers/smtp/camel-smtp-transport.c:214
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:330
 msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
+#: camel/camel-remote-store.c:421 camel/camel-remote-store.c:483
+#: camel/camel-remote-store.c:551
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
-#: camel/camel-service.c:137
+#: camel/camel-search-private.c:105
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
+
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabniškega imena"
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:523
 #, c-format
 msgid "No such host %s."
 msgstr "Ni takšnega gostitelja %s."
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:526
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Trenutno ne morem poizvedeti po gostitelju %s."
 
-#: camel/camel-session.c:299
+#: camel/camel-session.c:298
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:389
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3719,12 +3121,12 @@ msgid ""
 msgstr ""
 "Ta možnost narekuje povezavo s strežnikom IMAP s Kerberos 4 avtentifikacijo."
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:368
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsim vpišite IMAP geslo za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:389
+#: camel/providers/imap/camel-imap-store.c:396
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3735,7 +3137,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:652
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
@@ -3956,66 +3358,77 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:240
+msgid "Summarising folder"
+msgstr "Delam povzetek mape"
+
+#: camel/providers/local/camel-mbox-summary.c:245
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Nisem mogel odpreti mape: %s: povzetek delam od %ld dalje: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:274
+#: camel/providers/local/camel-mbox-summary.c:287
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Usodna napaka razčlenjevanja pošte na mestu %ld v mapi %s"
 
-#: camel/providers/local/camel-mbox-summary.c:349
+#: camel/providers/local/camel-mbox-summary.c:362
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Ne morem narediti povzetka mape %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:483
-#: camel/providers/local/camel-mbox-summary.c:674
+#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1346
+msgid "Synchronising folder"
+msgstr "Uskljajujem mapo %s"
+
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Nisem mogel odpreti mape za izdelavo povzetka %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:499
+#: camel/providers/local/camel-mbox-summary.c:515
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:528
-#: camel/providers/local/camel-mbox-summary.c:707
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:745
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Povzetek se ne ujema z mapo, celo po uskladitvi"
 
-#: camel/providers/local/camel-mbox-summary.c:571
+#: camel/providers/local/camel-mbox-summary.c:591
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Napaka ob pisanju v začasni poštni predal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:608
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:606
-#: camel/providers/local/camel-mbox-summary.c:765
+#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:795
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:635
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti začasne mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:646
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:836
+#: camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
@@ -4099,16 +3512,24 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:145
+msgid "Retrieving POP summary"
+msgstr "Prenašam povzetek POP"
+
+#: camel/providers/pop3/camel-pop3-folder.c:188
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nisem mogel odpreti mape: seznam sporočil je bil nepopoln."
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:282
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporočila z uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:286
+msgid "Retrieving POP message %d"
+msgstr "Prenašam sporočilo POP %d"
+
+#: camel/providers/pop3/camel-pop3-folder.c:304
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nisem uspel prenesti sporočila s POP strežnika %s: %s"
@@ -4126,7 +3547,7 @@ msgstr ""
 "prenašanje pošte iz nekaterih spletnih nuditeljev pošte in zaprtih sistemov "
 "e-pošte."
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:150
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4134,7 +3555,7 @@ msgstr ""
 "Ta možnost narekuje povezavo s strežnikom POP z nešifriranim geslom. To je v "
 "večini edina možnost, ki jo strežniki POP podpirajo."
 
-#: camel/providers/pop3/camel-pop3-store.c:158
+#: camel/providers/pop3/camel-pop3-store.c:160
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4144,29 +3565,29 @@ msgstr ""
 "preko protokola APOP. To ni nujno, da bo delovalo za vse uporabnike in celo "
 "za strežnike, ki trdijo, da jo podpirajo."
 
-#: camel/providers/pop3/camel-pop3-store.c:170
+#: camel/providers/pop3/camel-pop3-store.c:172
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "To se bo povezalo s strežnikom POP in uporabilo Kerbos 4 za ustrezno "
 "avtentifikacijo."
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nisem se mogel avtentificirati do strežnika KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:334
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nisem se mogel povezati s strežnikom POP na %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:375
+#: camel/providers/pop3/camel-pop3-store.c:381
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sProsim vpišite POP3 geslo za %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:400
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4175,12 +3596,12 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju uporabniškega imena: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:403
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid "(Unknown)"
 msgstr "(Neznana)"
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:430
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4188,7 +3609,7 @@ msgstr ""
 "Ne morem se povezati s strežnikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:438
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4197,13 +3618,13 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:547
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config.glade.h:64
+#: po/tmp/mail-config.glade.h:66
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -4253,7 +3674,7 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 po/tmp/mail-config.glade.h:59
+#: camel/providers/smtp/camel-smtp-provider.c:34 po/tmp/mail-config.glade.h:61
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4362,7 +3783,7 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:348
 #: camel/providers/smtp/camel-smtp-transport.c:353
-#: po/tmp/mail-config.glade.h:15
+#: po/tmp/mail-config.glade.h:16
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -4470,6 +3891,11 @@ msgstr "Zahtevek QUIT je prekoračil časovno omejitev: %s: ni usodno"
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
 
+#: camel/providers/vee/camel-vee-folder.c:604
+#, c-format
+msgid "No such message: %s"
+msgstr "Ni takšnega sporočila: %s"
+
 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
 msgstr "Nuditelj virutalne mape e-pošte"
@@ -4503,7 +3929,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:154
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
 msgid "attachment"
 msgstr "priloga"
 
@@ -4533,7 +3959,7 @@ msgstr "Priloži datoteko k sporočilu"
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: mail/message-list.c:1109 po/tmp/e-msg-composer-attachment.glade.h:6
+#: mail/message-list.c:1152 po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment"
 msgstr "Priloga"
 
@@ -4557,40 +3983,40 @@ msgstr "MIME tip:"
 msgid "Send as:"
 msgstr "Pošlji kot:"
 
-#: composer/e-msg-composer-hdrs.c:149 composer/e-msg-composer-hdrs.c:353
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
+#: mail/mail-format.c:627
 msgid "From:"
 msgstr "Od:"
 
-#: composer/e-msg-composer-hdrs.c:297
+#: composer/e-msg-composer-hdrs.c:330
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
-#: composer/e-msg-composer-hdrs.c:354
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Enter the identity you wish to send this message from"
 msgstr "Vnesite identiteto s katero želite poslati to sporočilo"
 
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: composer/e-msg-composer-hdrs.c:363 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporočila"
 
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4598,11 +4024,11 @@ msgstr ""
 "Vnesite naslove, ki bodo prejeli karbonske kopije sporočila, a  se ne bodo "
 "pojavili v seznamu prejemnikov sporočila."
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the subject of the mail"
 msgstr "Vnesite zadevo spročila"
 
@@ -4700,6 +4126,117 @@ msgstr "Nisem mogel ustvariti okna skladatelja."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne morem inicializirati Evolucijinega skladatelja."
 
+#: executive-summary/component/component-factory.c:159
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
+
+#: executive-summary/component/e-summary-callbacks.c:285
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+"Za ozadje izvlečka lahko izberete drugačno HTML stran.\n"
+"\n"
+"Pustite pravno za privzete nastavitve"
+
+#: executive-summary/component/e-summary-url.c:61
+#: executive-summary/component/e-summary-url.c:66
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr "Odpri %s s privzetim GNOMEovim programom"
+
+#: executive-summary/component/e-summary-url.c:62
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr "Odpri %s s privzetim GNOMEovim brskalnikom"
+
+#: executive-summary/component/e-summary-url.c:63
+#, c-format
+msgid "Send an email to %s"
+msgstr "Pošlji e-pošto %s"
+
+#: executive-summary/component/e-summary-url.c:64
+#, c-format
+msgid "Change the view to %s"
+msgstr "Spremeni pogled na %s"
+
+#: executive-summary/component/e-summary-url.c:65
+#, c-format
+msgid "Run %s"
+msgstr "Poženi %s"
+
+#: executive-summary/component/e-summary-url.c:67
+#, c-format
+msgid "Close %s"
+msgstr "Zapri %s"
+
+#: executive-summary/component/e-summary-url.c:68
+#, c-format
+msgid "Move %s to the left"
+msgstr "Premakni %s na levo"
+
+#: executive-summary/component/e-summary-url.c:69
+#, c-format
+msgid "Move %s to the right"
+msgstr "Premakni %s na desno"
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Move %s into the previous row"
+msgstr "Premakni %s v prešnjo vrstico"
+
+#: executive-summary/component/e-summary-url.c:71
+#, c-format
+msgid "Move %s into the next row"
+msgstr "Premakni %s v naslednjo vrstico"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Configure %s"
+msgstr "Nastavi %s"
+
+#: executive-summary/component/e-summary.c:916
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Nisem mogel odpreti HTML datoteke:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:930
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+"Napaka ob branju podatkov:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:948
+msgid "File does not have a place for the services.\n"
+msgstr "Datoteka nima mesta za storitve.\n"
+
+#: executive-summary/component/main.c:59
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+"Komponenta Povzetek ni mogla inicializirati Bonoba.\n"
+"Če se je pokazalo opozorilo o RootPOA, to verjetno pomeni,\n"
+"da ste prevedli Bonobo z GOAD-om namesto z OAF-om."
+
+#: executive-summary/test-service/rdf-summary.c:455
+#: executive-summary/test-service/rdf-summary.c:491
+#: executive-summary/test-service/rdf-summary.c:536
+#: widgets/misc/e-messagebox.c:155
+msgid "Error"
+msgstr "Napaka"
+
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "leto"
@@ -4869,7 +4406,7 @@ msgstr "Vnesite URI mape"
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:189
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4914,17 +4451,17 @@ msgstr "Dodaj pogoj"
 msgid "Remove criterion"
 msgstr "Odstrani pogoj"
 
-#: filter/filter-system-flag.c:63
+#: filter/filter-system-flag.c:67
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
 #. { _("Deleted"), "Deleted" },
 #. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
+#: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "Pomembno"
 
-#: filter/filter-system-flag.c:67
+#: filter/filter-system-flag.c:71
 msgid "Read"
 msgstr "Beri"
 
@@ -5003,14 +4540,14 @@ msgstr "Prestavi v mapo"
 
 #: filter/libfilter-i18n.h:15
 msgid "Recipients"
-msgstr "Prejemniki"
+msgstr "Prejemnik"
 
 #: filter/libfilter-i18n.h:16
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
 #: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
+#: mail/message-list.c:1152
 msgid "Score"
 msgstr "Točke"
 
@@ -5030,7 +4567,7 @@ msgstr "Vir"
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1152
 msgid "Status"
 msgstr "Stanje"
 
@@ -5038,18 +4575,10 @@ msgstr "Stanje"
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1153
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "po"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "pred"
-
 #: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "vsebuje"
@@ -5138,11 +4667,11 @@ msgstr "Dodaj pravilo vMape"
 msgid "Edit VFolder Rule"
 msgstr "Uredi pravilo vMape"
 
-#: mail/component-factory.c:291
+#: mail/component-factory.c:297
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:326
+#: mail/component-factory.c:323
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
@@ -5151,29 +4680,29 @@ msgid "Store search as vFolder"
 msgstr "Shrani iskanje kot vMapo"
 
 #: mail/folder-browser.c:239
-msgid "Sender contains"
-msgstr "Pošiljatelj vsebuje"
-
-#: mail/folder-browser.c:240
 msgid "Body or subject contains"
 msgstr "Telo ali zadeva vsebuje"
 
-#: mail/folder-browser.c:241
+#: mail/folder-browser.c:240
 msgid "Body contains"
 msgstr "Telo vsebuje"
 
-#: mail/folder-browser.c:242
+#: mail/folder-browser.c:241
 msgid "Subject contains"
 msgstr "Zadeva vsebuje"
 
-#: mail/folder-browser.c:243
+#: mail/folder-browser.c:242
 msgid "Body does not contain"
 msgstr "Telo ne vsebuje"
 
-#: mail/folder-browser.c:244
+#: mail/folder-browser.c:243
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
+#: mail/folder-browser.c:244
+msgid "Sender contains"
+msgstr "Pošiljatelj vsebuje"
+
 #: mail/folder-browser.c:656
 msgid "VFolder on Subject"
 msgstr "vMapa glede na Zadevo"
@@ -5202,7 +4731,8 @@ msgstr "Filter glede na Prejemnike"
 msgid "Filter on Mailing List"
 msgstr "Filter glede na Poštni seznam"
 
-#: mail/folder-browser.c:669 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:669 po/tmp/evolution-calendar.xml.h:22
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Odpri"
 
@@ -5210,12 +4740,18 @@ msgstr "Odpri"
 msgid "Save As..."
 msgstr "Shrani kot..."
 
+#: mail/folder-browser.c:672 mail/mail-view.c:148
+#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:25
+#: po/tmp/evolution-mail.xml.h:31 po/tmp/evolution-tasks.xml.h:9
+msgid "Print"
+msgstr "Natisni"
+
 #: mail/folder-browser.c:674
 msgid "Reply to Sender"
 msgstr "Odgovori pošiljatelju"
 
 #: mail/folder-browser.c:675 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:39
+#: po/tmp/evolution-mail.xml.h:37
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
@@ -5303,6 +4839,15 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
+#: mail/mail-account-editor.c:746 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:916 po/tmp/mail-config.glade.h:49
+#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Brez"
+
 #: mail/mail-accounts.c:115
 msgid " (default)"
 msgstr " (privzeto)"
@@ -5312,7 +4857,7 @@ msgstr " (privzeto)"
 msgid "Evolution Account Manager"
 msgstr "Upravljalnik Evolucijinih računov"
 
-#: mail/mail-account-editor.c:265
+#: mail/mail-account-editor.c:286
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
@@ -5321,7 +4866,7 @@ msgstr ""
 "Vseeno shrani?"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:625
+#: mail/mail-account-editor.c:646
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
@@ -5345,7 +4890,7 @@ msgstr "Pošta od %s"
 msgid "%s mailing list"
 msgstr "%s poštnih seznamov"
 
-#: mail/mail-callbacks.c:82
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5357,7 +4902,7 @@ msgstr ""
 "ali skladate pošto.\n"
 "Bi ga želeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:135
+#: mail/mail-callbacks.c:134
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5365,7 +4910,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5373,11 +4918,11 @@ msgstr ""
 "Nastaviti morate način prenosa pošte\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:191
+#: mail/mail-callbacks.c:190
 msgid "You have not set a mail transport method"
 msgstr "Niste nastavili postopka prenašanja pošte"
 
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:223
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5393,19 +4938,24 @@ msgstr "Nastaviti morate račun preden lahko pošljete to e-pošto."
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:507
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr "Na %s, je %s zapisal:\n"
+
+#: mail/mail-callbacks.c:661
 msgid "Forwarded message:\n"
 msgstr "Posredovano sporočilo:\n"
 
-#: mail/mail-callbacks.c:618
+#: mail/mail-callbacks.c:744
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:620
+#: mail/mail-callbacks.c:746
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:755
+#: mail/mail-callbacks.c:881
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5413,11 +4963,11 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:788 mail/mail-display.c:78
+#: mail/mail-callbacks.c:914 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Prepiši datoteko?"
 
-#: mail/mail-callbacks.c:792 mail/mail-display.c:82
+#: mail/mail-callbacks.c:918 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5425,15 +4975,15 @@ msgstr ""
 "Mapa z enakim imenom že obstaja.\n"
 "Naj jo prepišem?"
 
-#: mail/mail-callbacks.c:836
+#: mail/mail-callbacks.c:962
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:964
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:946
+#: mail/mail-callbacks.c:1072
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5442,14 +4992,22 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:995
+#: mail/mail-callbacks.c:1121
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:1042
+#: mail/mail-callbacks.c:1168
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
+#: mail/mail-config.c:834
+msgid "Connecting to server"
+msgstr "Vzpostavljam povezavo s strežnikom"
+
+#: mail/mail-config.c:836
+msgid "Connect to server"
+msgstr "Poveži se s strežnikom"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -5482,196 +5040,204 @@ msgstr "Avtentifikacija"
 msgid "Authentication Type:"
 msgstr "Način avtentifikacije:"
 
-#: po/tmp/mail-config.glade.h:16
+#: po/tmp/mail-config.glade.h:15
+msgid "Automatically check mail every"
+msgstr "Samodejno preveri pošto vsakih"
+
+#: po/tmp/mail-config.glade.h:17
+msgid "Check settings"
+msgstr "Preveri nastavitve"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Congratulations, your mail configuration is complete.\n"
 msgstr "Čestitamo, vaša nastavitev pošte je opravljena.\n"
 
-#: po/tmp/mail-config.glade.h:17 po/tmp/mail-config.glade.h:20
-#: po/tmp/mail-config.glade.h:79
+#: po/tmp/mail-config.glade.h:19 po/tmp/mail-config.glade.h:22
+#: po/tmp/mail-config.glade.h:81
 msgid "\n"
 msgstr "\n"
 
-#: po/tmp/mail-config.glade.h:18
+#: po/tmp/mail-config.glade.h:20
 msgid "You are now ready to send and receive email \n"
 msgstr "Sedaj ste pripravljeni za sprejemanje e-pošte \n"
 
-#: po/tmp/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:21
 msgid "using Evolution. \n"
 msgstr "z Evolucijo. \n"
 
-#: po/tmp/mail-config.glade.h:21
+#: po/tmp/mail-config.glade.h:23
 msgid "Click \"Finish\" to save your settings."
 msgstr "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: po/tmp/mail-config.glade.h:22
+#: po/tmp/mail-config.glade.h:24
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: po/tmp/mail-config.glade.h:23
+#: po/tmp/mail-config.glade.h:25
 msgid "Default"
 msgstr "Privzeto"
 
-#: po/tmp/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:27
 msgid "Done"
 msgstr "Opravljeno"
 
-#: po/tmp/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:28
 msgid "E-Mail Address:"
 msgstr "E-poštni naslov:"
 
-#: po/tmp/mail-config.glade.h:28
+#: po/tmp/mail-config.glade.h:30
 msgid "Email Address:"
 msgstr "E-poštni naslov:"
 
-#: po/tmp/mail-config.glade.h:29
+#: po/tmp/mail-config.glade.h:31
 msgid "Evolution Mail Configuration"
 msgstr "Nastavitev Evolucijine pošte"
 
-#: po/tmp/mail-config.glade.h:30
+#: po/tmp/mail-config.glade.h:32
 msgid "Full Name:"
 msgstr "Polno ime:"
 
-#: po/tmp/mail-config.glade.h:33
+#: po/tmp/mail-config.glade.h:35
 msgid "Hostname:"
 msgstr "Ime gostitelja:"
 
-#: po/tmp/mail-config.glade.h:34
+#: po/tmp/mail-config.glade.h:36
 msgid "Identity"
 msgstr "Identiteta"
 
-#: po/tmp/mail-config.glade.h:35
+#: po/tmp/mail-config.glade.h:37
 msgid "Incoming Mail Server"
 msgstr "Strežnik dohodne pošte"
 
-#: po/tmp/mail-config.glade.h:36
+#: po/tmp/mail-config.glade.h:38
 msgid "Keep mail on server"
 msgstr "Ohrani pošto na strežniku"
 
-#: po/tmp/mail-config.glade.h:37
+#: po/tmp/mail-config.glade.h:39
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: po/tmp/mail-config.glade.h:38
+#: po/tmp/mail-config.glade.h:40
 msgid "Mail"
 msgstr "Pošta"
 
-#: po/tmp/mail-config.glade.h:39
+#: po/tmp/mail-config.glade.h:41
 msgid "Mail Account"
 msgstr "Poštni račun"
 
-#: po/tmp/mail-config.glade.h:40
+#: po/tmp/mail-config.glade.h:42
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: po/tmp/mail-config.glade.h:41
+#: po/tmp/mail-config.glade.h:43
 msgid "Mail Configuration Druid"
 msgstr "Druid za nastavitev pošte"
 
-#: po/tmp/mail-config.glade.h:42
+#: po/tmp/mail-config.glade.h:44
 msgid "Make this my default account"
 msgstr "Naj bo to moj privzet račun"
 
-#: po/tmp/mail-config.glade.h:43
+#: po/tmp/mail-config.glade.h:45
 msgid "Mark messages as \"Read\" after:"
 msgstr "Označi sporočila kot \"Prebrana\" po:"
 
-#: po/tmp/mail-config.glade.h:44
+#: po/tmp/mail-config.glade.h:46
 msgid "Miscellaneous"
 msgstr "Razno"
 
-#: po/tmp/mail-config.glade.h:46
+#: po/tmp/mail-config.glade.h:48
 msgid "News"
 msgstr "Novice"
 
-#: po/tmp/mail-config.glade.h:48
+#: po/tmp/mail-config.glade.h:50
 msgid "Optional"
 msgstr "Dodatno"
 
-#: po/tmp/mail-config.glade.h:49
+#: po/tmp/mail-config.glade.h:51
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: po/tmp/mail-config.glade.h:51
+#: po/tmp/mail-config.glade.h:53
 msgid "Outgoing Mail Server"
 msgstr "Strežnik odhodne pošte"
 
-#: po/tmp/mail-config.glade.h:52
+#: po/tmp/mail-config.glade.h:54
 msgid "Password:"
 msgstr "Geslo:"
 
-#: po/tmp/mail-config.glade.h:54
+#: po/tmp/mail-config.glade.h:56
 msgid "Plain Text"
 msgstr "Nešifrirano"
 
-#: po/tmp/mail-config.glade.h:55
+#: po/tmp/mail-config.glade.h:57
 msgid "Receiving Email"
 msgstr "Sprejemanje e-pošte"
 
-#: po/tmp/mail-config.glade.h:56
+#: po/tmp/mail-config.glade.h:58
 msgid "Remember my password"
 msgstr "Zapomni si geslo"
 
-#: mail/mail-format.c:628 po/tmp/mail-config.glade.h:57
+#: mail/mail-format.c:629 po/tmp/mail-config.glade.h:59
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
-#: po/tmp/mail-config.glade.h:58
+#: po/tmp/mail-config.glade.h:60
 msgid "Required"
 msgstr "Potrebno"
 
-#: po/tmp/mail-config.glade.h:60
+#: po/tmp/mail-config.glade.h:62
 msgid "Save password"
 msgstr "Shrani geslo"
 
-#: po/tmp/mail-config.glade.h:61
+#: po/tmp/mail-config.glade.h:63
 msgid "Select signature file"
 msgstr "Izberi datoteko s podpisom"
 
-#: po/tmp/mail-config.glade.h:62
+#: po/tmp/mail-config.glade.h:64
 msgid "Send mail in HTML format by default."
 msgstr "Privzeto pošlji pošto v HTML obliki."
 
-#: po/tmp/mail-config.glade.h:63
+#: po/tmp/mail-config.glade.h:65
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: po/tmp/mail-config.glade.h:65
+#: po/tmp/mail-config.glade.h:67
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: po/tmp/mail-config.glade.h:66
+#: po/tmp/mail-config.glade.h:68
 msgid "Server Type: "
 msgstr "Vrsta strežnika:"
 
-#: po/tmp/mail-config.glade.h:67
+#: po/tmp/mail-config.glade.h:69
 msgid "Server requires authentication"
 msgstr "Strežnik zahteva avtentifikacijo"
 
-#: po/tmp/mail-config.glade.h:68
+#: po/tmp/mail-config.glade.h:70
 msgid "Servers"
 msgstr "Strežniki"
 
-#: po/tmp/mail-config.glade.h:69
+#: po/tmp/mail-config.glade.h:71
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: po/tmp/mail-config.glade.h:70
+#: po/tmp/mail-config.glade.h:72
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: po/tmp/mail-config.glade.h:71
+#: po/tmp/mail-config.glade.h:73
 msgid "Sources"
 msgstr "Viri"
 
-#: po/tmp/mail-config.glade.h:72
+#: po/tmp/mail-config.glade.h:74
 msgid "This server requires a secure connection (SSL)"
 msgstr "Ta strežnik zahteva varno povezavo (SSL)"
 
-#: po/tmp/mail-config.glade.h:73
+#: po/tmp/mail-config.glade.h:75
 msgid "Type"
 msgstr "Vrsta"
 
-#: po/tmp/mail-config.glade.h:74
+#: po/tmp/mail-config.glade.h:76
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
@@ -5679,23 +5245,27 @@ msgstr ""
 "Vpišite ime s katerimi želite nazivati te strežnike. Naprimer:\"službeni\" "
 "ali \"domači\"."
 
-#: po/tmp/mail-config.glade.h:76
+#: po/tmp/mail-config.glade.h:78
 msgid "User Information"
 msgstr "Podatki o uporabniku"
 
-#: po/tmp/mail-config.glade.h:77
+#: po/tmp/mail-config.glade.h:79
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: po/tmp/mail-config.glade.h:78
+#: po/tmp/mail-config.glade.h:80
 msgid "Welcome to the Evolution Mail Configuration Druid.\n"
 msgstr "Dobrodošli v Evolucijinem Druidu za nastavitev pošte.\n"
 
-#: po/tmp/mail-config.glade.h:80
+#: po/tmp/mail-config.glade.h:82
 msgid "Click \"Next\" to begin. "
 msgstr "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config-druid.c:363
+#: po/tmp/mail-config.glade.h:83
+msgid "minutes."
+msgstr "minut."
+
+#: mail/mail-config-druid.c:399
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -5704,11 +5274,11 @@ msgstr ""
 "Nisem uspel preveriti nastavitve dohodne pošte.\n"
 "Morda boste naleteli na probleme ob dobivanju pošte z %s"
 
-#: mail/mail-config-druid.c:458
+#: mail/mail-config-druid.c:489
 msgid "Namespace:"
 msgstr "Imenski prostor:"
 
-#: mail/mail-config-druid.c:643
+#: mail/mail-config-druid.c:677
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5718,148 +5288,130 @@ msgstr ""
 "Morda boste naleteli na probleme ob pošiljanju pošte preko %s"
 
 #. set window title
-#: mail/mail-config-druid.c:992
+#: mail/mail-config-druid.c:1036
 msgid "Evolution Account Wizard"
 msgstr "Evolucijin čarovnik za račune"
 
-#: mail/mail-display.c:97
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti datoteke: %s:\n"
-"%s"
-
-#: mail/mail-display.c:130
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Nisem model pisati podatkov: %s"
-
-#: mail/mail-display.c:228
+#: mail/mail-display.c:189
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:268
+#: mail/mail-display.c:229
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/mail-display.c:310
+#: mail/mail-display.c:290
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:312
+#: mail/mail-display.c:292
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:314
+#: mail/mail-display.c:294
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:323
 msgid "External Viewer"
 msgstr "Zunanji pregledovalec"
 
-#: mail/mail-display.c:364
+#: mail/mail-display.c:346
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:368
+#: mail/mail-display.c:350
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-format.c:505
+#: mail/mail-format.c:506
 #, c-format
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:653
+#: mail/mail-format.c:654
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-format.c:941
+#: mail/mail-format.c:943
 msgid "Encrypted message not displayed"
 msgstr "Šifrirano sporočilo ni prikazano"
 
-#: mail/mail-format.c:947
+#: mail/mail-format.c:949
 msgid "Encrypted message"
 msgstr "Šifrirano sporočilo"
 
-#: mail/mail-format.c:948
+#: mail/mail-format.c:950
 msgid "Click icon to decrypt."
 msgstr "Kliknite ikono za dešifriranje."
 
-#: mail/mail-format.c:1350
+#: mail/mail-format.c:1019 mail/mail-format.c:1399
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "To sporočilo ima elektronski podpis in je ugotovljeno za avtentično."
 
-#: mail/mail-format.c:1358
+#: mail/mail-format.c:1027 mail/mail-format.c:1407
 msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "To sporočilo ima elektronski podpis, a se ne, da dokazati da je avtentično."
+msgstr ""
+"To sporočilo ima elektronski podpis, a se ne, da dokazati da je avtentično."
 
-#: mail/mail-format.c:1562
+#: mail/mail-format.c:1611
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:1574
+#: mail/mail-format.c:1623
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
 
-#: mail/mail-format.c:1578
+#: mail/mail-format.c:1627
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:1612
+#: mail/mail-format.c:1661
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:1617
+#: mail/mail-format.c:1666
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-format.c:1788
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Na %s, je %s zapisal:\n"
-
-#: mail/mail-local.c:204
+#: mail/mail-local.c:211
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:215
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:258
 msgid "Reconfiguring folder"
 msgstr "Prenastavljam mapo"
 
-#: mail/mail-local.c:269
+#: mail/mail-local.c:276
 msgid "Closing current folder"
 msgstr "Zapiram trenutno mapo"
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:302
 msgid "Renaming old folder and opening"
 msgstr "Preimenujem in odpiram staro mapo"
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:320
 msgid "Creating new folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:334
 msgid "Copying messages"
 msgstr "Kopiram sporočilo"
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:355
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5868,7 +5420,7 @@ msgstr ""
 "Nisem mogel shraniti meta podatkov mape; verjetno ne boste več mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:379
+#: mail/mail-local.c:386
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -5876,15 +5428,15 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:794
 msgid "Registering local folder"
 msgstr "Registriam krajevno mapo"
 
-#: mail/mail-local.c:789
+#: mail/mail-local.c:796
 msgid "Register local folder"
 msgstr "Registriaj krajevno mapo"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:900
 #, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5893,7 +5445,7 @@ msgstr ""
 "Nisem mogel registriati mape '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:88
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -5902,7 +5454,7 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:89
+#: mail/mail-mt.c:90
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -5911,116 +5463,116 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:372 mail/mail-mt.c:401
+#: mail/mail-mt.c:386 mail/mail-mt.c:415
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-ops.c:510
+#: mail/mail-ops.c:519
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:512
+#: mail/mail-ops.c:521
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: mail/mail-ops.c:740 mail/mail-ops.c:747
+#: mail/mail-ops.c:749 mail/mail-ops.c:756
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Dodajam \"%s\""
 
-#: mail/mail-ops.c:744 mail/mail-ops.c:750
+#: mail/mail-ops.c:753 mail/mail-ops.c:759
 msgid "Appending a message without a subject"
 msgstr "Dodajam sporočilo brez navedene zadeve"
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:842
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Prestavljam sporočila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:835
+#: mail/mail-ops.c:844
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiram sporočila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:847
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Prestavi sporočilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:840
+#: mail/mail-ops.c:849
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiraj sporočilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:880
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:874
+#: mail/mail-ops.c:883
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:894
+#: mail/mail-ops.c:903
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s sporočilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:969
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osvežujem mape v \"%s\""
 
-#: mail/mail-ops.c:1035 mail/subscribe-dialog.c:356
+#: mail/mail-ops.c:1044 mail/subscribe-dialog.c:359
 msgid "(No description)"
 msgstr "(ni opisa)"
 
-#: mail/mail-ops.c:1100
+#: mail/mail-ops.c:1109
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1141 mail/mail-ops.c:1210
+#: mail/mail-ops.c:1150 mail/mail-ops.c:1284
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1272
-msgid "Synchronising folder"
-msgstr "Uskljajujem mapo %s"
+#: mail/mail-ops.c:1215
+msgid "Opening store %s"
+msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1396
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1371
+#: mail/mail-ops.c:1445
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1438
+#: mail/mail-ops.c:1512
 msgid "Retrieving messages"
 msgstr "Prenašam sporočilo"
 
-#: mail/mail-ops.c:1448
+#: mail/mail-ops.c:1522
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Prenašam sporočilo številka %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1596
+#: mail/mail-ops.c:1670
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Nalagam mapo %s za %s"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1672
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Naloži mapo %s za %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1838
 msgid "Saving messages"
 msgstr "Shranjujem sporočila"
 
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1917
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6029,12 +5581,12 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1856
+#: mail/mail-ops.c:1930
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Shranjujem sporočilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:1944
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6043,13 +5595,58 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "V redu"
+#: mail/mail-ops.c:2018
+msgid "Saving attachment"
+msgstr "Shranjujem prilogo"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Prekliči"
+#: mail/mail-ops.c:2033
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+"Nisem mogel ustvariti izhodne datoteke: %s:\n"
+" %s"
+
+#: mail/mail-ops.c:2061
+#, c-format
+msgid "Could not write data: %s"
+msgstr "Nisem model pisati podatkov: %s"
+
+#: mail/mail-search-dialogue.c:107
+msgid "_Search"
+msgstr "_Iskanje"
+
+#: mail/mail-send-recv.c:127
+msgid "Cancelling ..."
+msgstr "Preklicujem ..."
+
+#: mail/mail-send-recv.c:218
+msgid "Send & Receive mail"
+msgstr "Oddaja in sprejem pošte"
+
+#: mail/mail-send-recv.c:221
+msgid "Receiving"
+msgstr "Sprejemam"
+
+#: mail/mail-send-recv.c:267
+msgid "Updating ..."
+msgstr "Posodabljam ..."
+
+#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
+msgid "Waiting ..."
+msgstr "Čakam ..."
+
+#: mail/mail-send-recv.c:288
+msgid "Sending"
+msgstr "Pošiljam"
+
+#: mail/mail-send-recv.c:483
+msgid "Cancelled."
+msgstr "Preklicano."
+
+#: mail/mail-send-recv.c:487
+msgid "Complete."
+msgstr "Končano."
 
 #: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
@@ -6125,21 +5722,21 @@ msgstr ""
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:302
+#: mail/mail-vfolder.c:303
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:36
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:43
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:41
 msgid "Reply to the sender of this message"
 msgstr "Odgovori pošiljatelju tega sporočila"
 
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:42
+#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:40
 msgid "Reply to all recipients of this message"
 msgstr "Odgovori vsem prejemnikom tega sporočila"
 
@@ -6147,7 +5744,7 @@ msgstr "Odgovori vsem prejemnikom tega sporočila"
 msgid "Forward this message"
 msgstr "Sporočilo posreduj naprej"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:35
 msgid "Print the selected message"
 msgstr "Natisni izbrano sporočilo"
 
@@ -6155,78 +5752,86 @@ msgstr "Natisni izbrano sporočilo"
 msgid "Delete this message"
 msgstr "Zbriši to sporčilo"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:608
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:602
+#: mail/message-list.c:611
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:605
+#: mail/message-list.c:614
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:890
+#: mail/message-list.c:617
+msgid "Multiple Unseen Messages"
+msgstr "več nevidenih sporočil"
+
+#: mail/message-list.c:620
+msgid "Multiple Messages"
+msgstr "Več sporočil"
+
+#: mail/message-list.c:933
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
+#: mail/message-list.c:945 mail/message-list.c:961
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:905 mail/message-list.c:921
+#: mail/message-list.c:948 mail/message-list.c:964
 msgid "<unknown>"
 msgstr "<neznan>"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1016
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:1023
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:989
+#: mail/message-list.c:1032
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1044
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1052
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:1054
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1152
 msgid "Flagged"
 msgstr "Označeno"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1153
 msgid "From"
 msgstr "Od"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1153
 msgid "Date"
 msgstr "Datum"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1153
 msgid "Received"
 msgstr "Sprejeto"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1154
 msgid "To"
 msgstr "Za"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1154
 msgid "Size"
 msgstr "Velikost"
 
@@ -6287,22 +5892,22 @@ msgstr "Dobivam shrambo za \"%s\""
 msgid "Get store for \"%s\""
 msgstr "Dobi shrambo za \"%s\""
 
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:292
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Naročam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:296
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Preklicujem naročnino na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:297
+#: mail/subscribe-dialog.c:300
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Naroči se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:300
+#: mail/subscribe-dialog.c:303
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Prekliči naročnino na mapo \"%s\""
@@ -6333,8 +5938,8 @@ msgid "Evolution files successfully installed."
 msgstr "Evolucijine datoteke so se uspešno namestile."
 
 #: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr "Izgleda, da je tokrat vaš prvi zagon Evolucije."
+msgid "This seems to be the first time you are running Evolution."
+msgstr "Kaže, da je to vaš prvi zagon Evolucije."
 
 #: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
@@ -6384,7 +5989,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:96
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6393,11 +5998,11 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:153
 msgid "The specified folder name is not valid."
 msgstr "Izbrano ime mape ni veljavno."
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:245
 msgid "Evolution - Create new folder"
 msgstr "Evolucija - Ustvar novo mapo"
 
@@ -6409,7 +6014,7 @@ msgstr ""
 "Tip izbrane mape ni veljaven za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:318
 msgid "New..."
 msgstr "Nova..."
 
@@ -6439,7 +6044,7 @@ msgstr ""
 "GNOME za delo v skupinah, za pošto, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:347
+#: shell/e-shell-view-menu.c:349
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
@@ -6447,16 +6052,16 @@ msgstr "Pojdi v mapo..."
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:471
+#: shell/e-shell-view.c:474
 msgid "Folders"
 msgstr "Mape"
 
-#: shell/e-shell-view.c:1121
+#: shell/e-shell-view.c:1124
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolucija %s"
 
-#: shell/e-shell-view.c:1123
+#: shell/e-shell-view.c:1126
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolucija %s [%s]"
@@ -6472,8 +6077,8 @@ msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
-"Opa!  Pogled za `%s' je nepričakovano umru.  :-(\n"
-"To verjetno pomeni, da se je sesula komponenta %s."
+"Opa!  Pogled `%s' je nepričakovano umru.  :-(\n"
+"To verjetno pomeni, da se je komponenta %s sesula."
 
 #: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
@@ -6552,7 +6157,14 @@ msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bližnjic."
 
-#: shell/e-storage-set-view.c:338
+#: po/tmp/evolution-event-editor.xml.h:81
+#: po/tmp/evolution-message-composer.xml.h:49
+#: po/tmp/evolution-task-editor-dialog.xml.h:95 po/tmp/evolution.xml.h:46
+#: shell/e-storage-set-view.c:345
+msgid "_View"
+msgstr "_Pogled"
+
+#: shell/e-storage-set-view.c:345
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
@@ -6665,23 +6277,119 @@ msgstr "Izključeno."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:155
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Uvažam %s\n"
+"Uvoznik ni pripravljen.\n"
+"Čakam 5 sekund na nov poskus."
+
+#: shell/importer/importer.c:173 shell/importer/importer.c:200
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Uvažam %s\n"
+"Uvažam predmet %d."
+
+#: shell/importer/importer.c:307
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "Ni uvoznika, ki bi lahko obravnaval\n %s"
+
+#: shell/importer/importer.c:317
+msgid "Importing"
+msgstr "Uvažam"
+
+#: shell/importer/importer.c:325
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Uvažam %s.\n"
+"Pričenjam %s"
+
+#: shell/importer/importer.c:340
+msgid "Error loading %s"
+msgstr "Napaka ob nalaganju %s"
+
+#: shell/importer/importer.c:355
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Uvažam %s\n"
+"Uvažam predmet 1."
+
+#: shell/importer/importer.c:426
+msgid "Automatic"
+msgstr "Samodeno"
+
+#: shell/importer/importer.c:476
+msgid "Filename:"
+msgstr "Ime datoteke:"
+
+#: shell/importer/importer.c:481
+msgid "Select a file"
+msgstr "Izberi datoteko"
+
+#: shell/importer/importer.c:491
+msgid "File type:"
+msgstr "Vrsta datoteke:"
+
+#: shell/importer/importer.c:572
+msgid "Import"
+msgstr "Uvozi"
+
+#: shell/importer/importer.c:605
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Izberite datoteko, ki jo želite uvoziti v Evolucijo in izberite "
+"vrsto datoteke s seznama\n"
+"\n"
+"Če ne veste, lahko izberete \"Samodejno\" in Evolucija bo poskusila ugotoviti."
+
 #: po/tmp/evolution-addressbook.xml.h:7
-msgid "Create a new contact"
+msgid "Create new contact"
 msgstr "Ustvari nov stik"
 
 #: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Zbriši stik"
 
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-task-editor-dialog.xml.h:28
+msgid "Find"
+msgstr "Poišči"
+
 #: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Poišči stik"
 
+#: po/tmp/evolution-addressbook.xml.h:12
+msgid "New contact"
+msgstr "Nov stik"
+
 #: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Natisni stike"
 
-#: po/tmp/evolution-addressbook.xml.h:15 po/tmp/evolution-mail.xml.h:48
+#: po/tmp/evolution-addressbook.xml.h:15 po/tmp/evolution-mail.xml.h:46
 msgid "Stop"
 msgstr "Ustavi"
 
@@ -6709,6 +6417,12 @@ msgstr "_Natisni stike..."
 msgid "_Search for contacts"
 msgstr "_Išči po kontaktih"
 
+#: po/tmp/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:79
+#: po/tmp/evolution-task-editor-dialog.xml.h:93
+msgid "_Tools"
+msgstr "_Orodja"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -6717,102 +6431,129 @@ msgstr "_Išči po kontaktih"
 msgid "5 Days"
 msgstr "5 dni"
 
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-calendar.xml.h:7 po/tmp/evolution-tasks.xml.h:6
+msgid "Alter preferences"
+msgstr "Alternativne nastavitve"
+
 #: po/tmp/evolution-calendar.xml.h:8
 msgid "Ca_lendar"
 msgstr "Ko_ledar"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Calendar Preferences..."
 msgstr "Nastavitve koledarja..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new appointment"
 msgstr "Ustvari nov zmenek"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "Dan"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go back in time"
 msgstr "Pojdi po času nazaj"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go forward in time"
 msgstr "Pojdi po času naprej"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to"
 msgstr "Pojdi na"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to a specific date"
 msgstr "Pojdi na določen datum"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Go to present time"
 msgstr "Pojdi na sedanjost"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: po/tmp/evolution-calendar.xml.h:19
 msgid "Month"
 msgstr "Mesec"
 
-#: po/tmp/evolution-calendar.xml.h:21
-msgid "Open a calendar"
+#: po/tmp/evolution-calendar.xml.h:20
+msgid "New appointment"
+msgstr "Nov zmenek"
+
+#: po/tmp/evolution-calendar.xml.h:21 po/tmp/evolution-event-editor.xml.h:34
+#: po/tmp/evolution-task-editor-dialog.xml.h:37
+msgid "Next"
+msgstr "Naprej"
+
+#: po/tmp/evolution-calendar.xml.h:23
+msgid "Open Calendar"
 msgstr "Odpri koledar"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Prev"
 msgstr "Nazaj"
 
-#: po/tmp/evolution-calendar.xml.h:24
-msgid "Print this calendar"
+#: po/tmp/evolution-calendar.xml.h:26
+msgid "Print this Calendar"
 msgstr "Natisni ta koledar"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: po/tmp/evolution-calendar.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Shrani kot"
+
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Save calendar as something else"
 msgstr "Shrani koledar kot nekaj drugega"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show 1 day"
 msgstr "Kaži en dan"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: po/tmp/evolution-calendar.xml.h:30
 msgid "Show 1 month"
 msgstr "Kaži en mesec"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Show 1 week"
 msgstr "Kaži en teden"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: po/tmp/evolution-calendar.xml.h:32
 msgid "Show the working week"
 msgstr "Pokaži delavni teden"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#: po/tmp/evolution-calendar.xml.h:33 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Danes"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "Week"
 msgstr "Teden"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:43
+#: po/tmp/evolution-calendar.xml.h:35 po/tmp/evolution-event-editor.xml.h:71
+#: po/tmp/evolution-task-editor-dialog.xml.h:84 po/tmp/evolution.xml.h:43
 msgid "_New"
 msgstr "_Nova"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: po/tmp/evolution-calendar.xml.h:36
 msgid "_Open Calendar"
 msgstr "Odpri ko_ledar"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: po/tmp/evolution-calendar.xml.h:37
 msgid "_Print this calendar"
 msgstr "_Natisni ta koledar"
 
+#: po/tmp/evolution-calendar.xml.h:38 po/tmp/evolution-tasks.xml.h:13
+msgid "_Save As..."
+msgstr "_Shrani kot..."
+
 #: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Zbriši ta predmet"
@@ -6829,6 +6570,31 @@ msgstr "Pomoč"
 msgid "Print En_velope..."
 msgstr "Tiskaj kuverto..."
 
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:42
+#: po/tmp/evolution-task-editor-dialog.xml.h:45
+msgid "Print this item"
+msgstr "Natisni ta predmet"
+
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:43
+#: po/tmp/evolution-task-editor-dialog.xml.h:46
+msgid "Print..."
+msgstr "Natisni..."
+
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:46
+#: po/tmp/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-task-editor-dialog.xml.h:56
+msgid "Save _As..."
+msgstr "Shrani _kot..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:47
+#: po/tmp/evolution-task-editor-dialog.xml.h:57
+msgid "Save and Close"
+msgstr "Shrani in zapri"
+
 #: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Shrani stik in zapri dialog"
@@ -6837,46 +6603,374 @@ msgstr "Shrani stik in zapri dialog"
 msgid "Se_nd contact to other..."
 msgstr "Pošlji stik drugim..."
 
+#: po/tmp/evolution-contact-editor.xml.h:17
+msgid "See online help"
+msgstr "Glej pomoč na liniji"
+
 #: po/tmp/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Pošlji _sporočilo stiku..."
 
+#: po/tmp/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:64
+#: po/tmp/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-subscribe.xml.h:16
+#: po/tmp/evolution-task-editor-dialog.xml.h:76 po/tmp/evolution.xml.h:36
+msgid "_File"
+msgstr "_Datoteka"
+
 #: po/tmp/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "_Natisni..."
 
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:76
+#: po/tmp/evolution-message-composer.xml.h:47
+#: po/tmp/evolution-task-editor-dialog.xml.h:90
+msgid "_Save"
+msgstr "_Shrani"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-event-editor.xml.h:6
+#: po/tmp/evolution-task-editor-dialog.xml.h:6
+msgid "About this application"
+msgstr "O tem programu"
+
+#: po/tmp/evolution-event-editor.xml.h:7
+#: po/tmp/evolution-task-editor-dialog.xml.h:7
+msgid "About..."
+msgstr "O..."
+
+#: po/tmp/evolution-event-editor.xml.h:8
+#: po/tmp/evolution-task-editor-dialog.xml.h:8
+msgid "Actio_ns"
+msgstr "_Dejanja"
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#: po/tmp/evolution-task-editor-dialog.xml.h:9
+msgid "Address _Book... (FIXME)"
+msgstr "A_dresar... (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:10
+#: po/tmp/evolution-task-editor-dialog.xml.h:11
+msgid "C_lear"
+msgstr "Poč_isti"
+
+#: po/tmp/evolution-event-editor.xml.h:11
+#: po/tmp/evolution-task-editor-dialog.xml.h:12
+msgid "C_ut"
+msgstr "_Izreži"
+
+#: po/tmp/evolution-event-editor.xml.h:12
+#: po/tmp/evolution-task-editor-dialog.xml.h:13
+msgid "Chec_k Names (FIXME)"
+msgstr "_Preveri imena (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-task-editor-dialog.xml.h:14
+msgid "Clear"
+msgstr "Počisti"
+
 #: po/tmp/evolution-event-editor.xml.h:14
+#: po/tmp/evolution-task-editor-dialog.xml.h:15
+msgid "Clear the selection"
+msgstr "Počisti izbiro"
+
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Close this appointment"
 msgstr "Zapri ta zmenek"
 
+#: po/tmp/evolution-event-editor.xml.h:17
+#: po/tmp/evolution-task-editor-dialog.xml.h:18
+msgid "Cop_y to Folder... (FIXME)"
+msgstr "_Kopiraj v mapo... (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:18 po/tmp/evolution-mail.xml.h:8
+#: po/tmp/evolution-task-editor-dialog.xml.h:19
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: po/tmp/evolution-event-editor.xml.h:19
+#: po/tmp/evolution-task-editor-dialog.xml.h:20
+msgid "Copy the selection"
+msgstr "Kopiraj izbrano"
+
+#: po/tmp/evolution-event-editor.xml.h:20
+#: po/tmp/evolution-task-editor-dialog.xml.h:21
+msgid "Cut"
+msgstr "Izreži"
+
+#: po/tmp/evolution-event-editor.xml.h:21
+#: po/tmp/evolution-task-editor-dialog.xml.h:22
+msgid "Cut the selection"
+msgstr "Izreži izbrano"
+
+#: po/tmp/evolution-event-editor.xml.h:24
+#: po/tmp/evolution-task-editor-dialog.xml.h:25
+msgid "Dump XML"
+msgstr "Shrani kot XML"
+
+#: po/tmp/evolution-event-editor.xml.h:25
+#: po/tmp/evolution-task-editor-dialog.xml.h:26
+msgid "Dump the UI Xml description"
+msgstr "Shranio Xml opis uporabniškega vmesnika"
+
+#: po/tmp/evolution-event-editor.xml.h:26
+#: po/tmp/evolution-task-editor-dialog.xml.h:27
+msgid "Fi_rst Item in Folder (FIXME)"
+msgstr "P_rvi predmet v mapi (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:27
+#: po/tmp/evolution-task-editor-dialog.xml.h:30
+msgid "For_ward (FIXME)"
+msgstr "Posreduj (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:28
+msgid "Forward as v_Calendar (FIXME)"
+msgstr "Posreduj naprej kot v_Koledar (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:29
+#: po/tmp/evolution-task-editor-dialog.xml.h:31
+msgid "Go to the next item"
+msgstr "Pojdi na naslednji predmet"
+
+#: po/tmp/evolution-event-editor.xml.h:30
+#: po/tmp/evolution-task-editor-dialog.xml.h:32
+msgid "Go to the previous item"
+msgstr "Pojdi na prejšnji predmet"
+
+#: po/tmp/evolution-event-editor.xml.h:31
+#: po/tmp/evolution-task-editor-dialog.xml.h:33
+msgid "In_complete Task (FIXME)"
+msgstr "Ne_popolna naloga (FIXME)"
+
 #: po/tmp/evolution-event-editor.xml.h:32
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Posreduj naprej kot v_Koledar"
+#: po/tmp/evolution-task-editor-dialog.xml.h:35
+msgid "Modify the file's properties"
+msgstr "Spremeni lastnosti datoteke"
 
-#: po/tmp/evolution-event-editor.xml.h:57
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Nov zmenek"
+#: po/tmp/evolution-event-editor.xml.h:33
+#: po/tmp/evolution-task-editor-dialog.xml.h:36
+msgid "N_ext"
+msgstr "Napr_ej"
 
-#: po/tmp/evolution-event-editor.xml.h:58
-msgid "FIXME: _Note"
-msgstr "FIXME: _Opomba"
+#: po/tmp/evolution-event-editor.xml.h:35
+#: po/tmp/evolution-task-editor-dialog.xml.h:38
+msgid "Paste"
+msgstr "Prilepi"
+
+#: po/tmp/evolution-event-editor.xml.h:36
+#: po/tmp/evolution-task-editor-dialog.xml.h:39
+msgid "Paste the clipboard"
+msgstr "Prilepi odložišče"
 
-#: po/tmp/evolution-event-editor.xml.h:91
+#: po/tmp/evolution-event-editor.xml.h:37
+#: po/tmp/evolution-task-editor-dialog.xml.h:40
+msgid "Pre_vious"
+msgstr "P_rejšnji"
+
+#: po/tmp/evolution-event-editor.xml.h:38
+#: po/tmp/evolution-task-editor-dialog.xml.h:41
+msgid "Previous"
+msgstr "Prejšnji"
+
+#: po/tmp/evolution-event-editor.xml.h:39
+#: po/tmp/evolution-task-editor-dialog.xml.h:42
+msgid "Print Pre_view"
+msgstr "Predogled _tiskanja"
+
+#: po/tmp/evolution-event-editor.xml.h:40
+#: po/tmp/evolution-task-editor-dialog.xml.h:43
+msgid "Print S_etup..."
+msgstr "Nas_tavitev tiskanja..."
+
+#: po/tmp/evolution-event-editor.xml.h:41
+#: po/tmp/evolution-task-editor-dialog.xml.h:44
+msgid "Print Setup"
+msgstr "Nastavitev tiskanja"
+
+#: po/tmp/evolution-event-editor.xml.h:44
+#: po/tmp/evolution-task-editor-dialog.xml.h:47
+msgid "Properties"
+msgstr "Lastnosti"
+
+#: po/tmp/evolution-event-editor.xml.h:45
+#: po/tmp/evolution-message-composer.xml.h:19
+#: po/tmp/evolution-task-editor-dialog.xml.h:55
+msgid "Save"
+msgstr "Shrani"
+
+#: po/tmp/evolution-event-editor.xml.h:48
 msgid "Save the appointment and close the dialog box"
 msgstr "Shrani zmenek in zapri dialog"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: po/tmp/evolution-event-editor.xml.h:49
+#: po/tmp/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-task-editor-dialog.xml.h:58
+msgid "Save the current file"
+msgstr "Shrani trenutno datoteko"
+
+#: po/tmp/evolution-event-editor.xml.h:50
 msgid "Schedule Meeting"
 msgstr "Načrtuj sestanek"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "Schedule _Meeting"
 msgstr "_Načrtuj sestanek"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: po/tmp/evolution-event-editor.xml.h:52
 msgid "Schedule some sort of a meeting"
 msgstr "Načrtuj nek tip sestanka"
 
+#: po/tmp/evolution-event-editor.xml.h:53
+#: po/tmp/evolution-task-editor-dialog.xml.h:62
+msgid "Select All"
+msgstr "Izberi vse"
+
+#: po/tmp/evolution-event-editor.xml.h:54
+#: po/tmp/evolution-task-editor-dialog.xml.h:63
+msgid "Select everything"
+msgstr "Izberi vse"
+
+#: po/tmp/evolution-event-editor.xml.h:55
+#: po/tmp/evolution-task-editor-dialog.xml.h:64
+msgid "Setup the page settings for your current printer"
+msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
+
+#: po/tmp/evolution-event-editor.xml.h:56
+#: po/tmp/evolution-task-editor-dialog.xml.h:65
+msgid "Task _Request (FIXME)"
+msgstr "Zahtevek opravila (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:57
+#: po/tmp/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-task-editor-dialog.xml.h:68
+msgid "_About..."
+msgstr "_O..."
+
+#: po/tmp/evolution-event-editor.xml.h:58
+#: po/tmp/evolution-message-composer.xml.h:40
+#: po/tmp/evolution-task-editor-dialog.xml.h:70 po/tmp/evolution.xml.h:33
+msgid "_Close"
+msgstr "_Zapri"
+
+#: po/tmp/evolution-event-editor.xml.h:59
+#: po/tmp/evolution-task-editor-dialog.xml.h:71 po/tmp/evolution.xml.h:34
+msgid "_Contact (FIXME)"
+msgstr "_Kontakt (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:60
+#: po/tmp/evolution-task-editor-dialog.xml.h:72
+msgid "_Copy"
+msgstr "_Kopiraj"
+
+#: po/tmp/evolution-event-editor.xml.h:61
+#: po/tmp/evolution-message-composer.xml.h:41
+#: po/tmp/evolution-task-editor-dialog.xml.h:73
+msgid "_Debug"
+msgstr "_Razhroščuj"
+
+#: po/tmp/evolution-event-editor.xml.h:63
+#: po/tmp/evolution-message-composer.xml.h:42
+#: po/tmp/evolution-subscribe.xml.h:15
+#: po/tmp/evolution-task-editor-dialog.xml.h:75 po/tmp/evolution.xml.h:35
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: po/tmp/evolution-event-editor.xml.h:65
+#: po/tmp/evolution-message-composer.xml.h:44
+#: po/tmp/evolution-task-editor-dialog.xml.h:77 po/tmp/evolution.xml.h:39
+msgid "_Help"
+msgstr "_Pomoč"
+
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-task-editor-dialog.xml.h:78
+msgid "_Item (FIXME)"
+msgstr "_Predmet (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:67
+#: po/tmp/evolution-task-editor-dialog.xml.h:79
+msgid "_Journal Entry (FIXME)"
+msgstr "_Dnevniški zapis (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:68
+#: po/tmp/evolution-task-editor-dialog.xml.h:80
+msgid "_Last Item in Folder (FIXME)"
+msgstr "_Zadnji predmet v mapi (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:69
+#: po/tmp/evolution-task-editor-dialog.xml.h:81
+msgid "_Mail Message (FIXME)"
+msgstr "_Pošlji sporočilo (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:70
+#: po/tmp/evolution-task-editor-dialog.xml.h:83
+msgid "_Move to Folder... (FIXME)"
+msgstr "_Prestavi v mapo... (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:72
+#: po/tmp/evolution-task-editor-dialog.xml.h:85
+msgid "_Note (FIXME)"
+msgstr "_Opomba (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:73
+#: po/tmp/evolution-task-editor-dialog.xml.h:86
+msgid "_Paste"
+msgstr "_Prilepi"
+
+#: po/tmp/evolution-event-editor.xml.h:74
+#: po/tmp/evolution-task-editor-dialog.xml.h:87
+#: po/tmp/evolution-tasks.xml.h:12
+msgid "_Print"
+msgstr "_Natisni"
+
+#: po/tmp/evolution-event-editor.xml.h:75
+#: po/tmp/evolution-task-editor-dialog.xml.h:88
+msgid "_Properties..."
+msgstr "_Lastnosti..."
+
+#: po/tmp/evolution-event-editor.xml.h:77
+#: po/tmp/evolution-task-editor-dialog.xml.h:91
+msgid "_Select All"
+msgstr "_Izberi vse"
+
+#: po/tmp/evolution-event-editor.xml.h:78
+#: po/tmp/evolution-task-editor-dialog.xml.h:92 po/tmp/evolution.xml.h:45
+msgid "_Task (FIXME)"
+msgstr "_Naloga (FIXME)"
+
+#: po/tmp/evolution-event-editor.xml.h:80
+#: po/tmp/evolution-task-editor-dialog.xml.h:94
+msgid "_Unread Item (FIXME)"
+msgstr "_Predmet neprebran(FIXME)"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-executive-summary.xml.h:6
+msgid "Add Service"
+msgstr "Dodaj storitev"
+
+#: po/tmp/evolution-executive-summary.xml.h:7
+msgid "Add a new service to the Executive Summary"
+msgstr "Dodaj novo storitev v povzetek"
+
+#: po/tmp/evolution-executive-summary.xml.h:8
+msgid "Create a new email"
+msgstr "Ustvari novo e-pošto"
+
+#: po/tmp/evolution-executive-summary.xml.h:9
+msgid "Executive Summary Settings..."
+msgstr "Nastaviteve povzetka..."
+
+#: po/tmp/evolution-executive-summary.xml.h:10
+msgid "New Mail"
+msgstr "Nova pošta"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -6953,131 +7047,131 @@ msgstr "Prestavi"
 msgid "Move message to a new folder"
 msgstr "Prestavi sporočilo v novo mapo"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Previews the message to be printed"
 msgstr "Predogled sporočika, ki bo natisnjeno"
 
-#: po/tmp/evolution-mail.xml.h:34
+#: po/tmp/evolution-mail.xml.h:32
 msgid "Print Preview of message..."
 msgstr "Predogled tiskanja sporočila..."
 
-#: po/tmp/evolution-mail.xml.h:35
+#: po/tmp/evolution-mail.xml.h:33
 msgid "Print message to the printer"
 msgstr "Natisni sporočilo na tiskalniku"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Print message..."
 msgstr "Natisni sporočilo..."
 
-#: po/tmp/evolution-mail.xml.h:40
+#: po/tmp/evolution-mail.xml.h:38
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: po/tmp/evolution-mail.xml.h:41
+#: po/tmp/evolution-mail.xml.h:39
 msgid "Reply to _Sender"
 msgstr "Odgovori pošiljatelju"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:42
 msgid "S_ource"
 msgstr "_Vir"
 
-#: po/tmp/evolution-mail.xml.h:45 po/tmp/evolution-subscribe.xml.h:12
+#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Izberi vse"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: po/tmp/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: po/tmp/evolution-mail.xml.h:45
 msgid "Show _All Messages"
 msgstr "Kaži vsa sporočila"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: po/tmp/evolution-mail.xml.h:47
 msgid "Threaded Message list"
 msgstr "_Niten seznam sporočil"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:48
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _Pošiljatelja"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: po/tmp/evolution-mail.xml.h:49
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na _Sprejemnike"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: po/tmp/evolution-mail.xml.h:50
 msgid "View Raw Message Source"
 msgstr "Glej izvorno obliko sporočila"
 
-#: po/tmp/evolution-mail.xml.h:53
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: po/tmp/evolution-mail.xml.h:54
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Configure Folder..."
 msgstr "_Nastavi mapo..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:53
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: po/tmp/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Edit Message"
 msgstr "_Uredi sporočilo"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Expunge"
 msgstr "_Uniči"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Filter on Subject"
 msgstr "Filtriraj glede na _Zadevo"
 
-#: po/tmp/evolution-mail.xml.h:60
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Forward"
 msgstr "Posreduj _naprej"
 
-#: po/tmp/evolution-mail.xml.h:61 po/tmp/evolution-subscribe.xml.h:17
+#: po/tmp/evolution-mail.xml.h:59 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: po/tmp/evolution-mail.xml.h:62
+#: po/tmp/evolution-mail.xml.h:60
 msgid "_Mail Configuration..."
 msgstr "Nastavitev _Pošte..."
 
-#: po/tmp/evolution-mail.xml.h:63
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Message"
 msgstr "_Sporočilo"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Move to Folder..."
 msgstr "_Prestavi v mapo..."
 
-#: po/tmp/evolution-mail.xml.h:65
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_Open in New Window"
 msgstr "_Odpri v novem oknu"
 
-#: po/tmp/evolution-mail.xml.h:66
+#: po/tmp/evolution-mail.xml.h:64
 msgid "_Print Message"
 msgstr "_Natisni sporočilo"
 
-#: po/tmp/evolution-mail.xml.h:67
+#: po/tmp/evolution-mail.xml.h:65
 msgid "_Save Message As..."
 msgstr "_Shrani sporočilo kot..."
 
-#: po/tmp/evolution-mail.xml.h:68
+#: po/tmp/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "_Niteno"
 
-#: po/tmp/evolution-mail.xml.h:69
+#: po/tmp/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr "_Odbriši"
 
-#: po/tmp/evolution-mail.xml.h:70
+#: po/tmp/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "vMapa glede na _Zadevo"
 
-#: po/tmp/evolution-mail.xml.h:71
+#: po/tmp/evolution-mail.xml.h:69
 msgid "_Virtual Folder Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
@@ -7089,10 +7183,19 @@ msgstr "Urejevalnik _virtualnih map..."
 msgid "Attach"
 msgstr "Priloži"
 
+#: po/tmp/evolution-message-composer.xml.h:9
+#: po/tmp/evolution-task-editor-dialog.xml.h:17
+msgid "Close the current file"
+msgstr "Zapri trenutno datoteko"
+
 #: po/tmp/evolution-message-composer.xml.h:10
 msgid "Encrypt this message with PGP"
 msgstr "Šifriraj sporočilo s PGP"
 
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "F_ormat"
+msgstr "O_blikuj izpis"
+
 #: po/tmp/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
@@ -7117,10 +7220,6 @@ msgstr "Šifriraj s PGP"
 msgid "PGP Sign"
 msgstr "Podpis s PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:20
-msgid "Save As"
-msgstr "Shrani kot"
-
 #: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Shrani osnutek"
@@ -7225,6 +7324,94 @@ msgstr "Naroči"
 msgid "Unsubscribe"
 msgstr "Prekini naročnino"
 
+#: po/tmp/evolution-task-editor-dialog.xml.h:10
+msgid "Assig_n Task (FIXME)"
+msgstr "Dodali _nalogo (FIXME)"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:29
+msgid "Find Again"
+msgstr "Poišči znova"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:34
+msgid "Meeting Re_quest (FIXME)"
+msgstr "Za_htevek po sestanku (FIXME)"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:48
+msgid "Redo"
+msgstr "Obnovi"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:49
+msgid "Redo the undone action"
+msgstr "Obnovi razveljavljeno dejanje"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:50
+msgid "Replace"
+msgstr "Zamenjaj"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:51
+msgid "Replace a string"
+msgstr "Zamenjaj niz"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:52
+msgid "Reply to A_ll (FIXME)"
+msgstr "Odgovori _vsem (FIXME)"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:53
+msgid "S_end Status Report (FIXME)"
+msgstr "Pošlji poročilo stanja (FIXME)"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:54
+msgid "S_kip Occurrence (FIXME)"
+msgstr "Preskoči ponovitev (FIXME)"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:59
+msgid "Save the task and close the dialog box"
+msgstr "Shrani posel in zapri dialog"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:60
+msgid "Search again for the same string"
+msgstr "Išči enak niz znova"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:61
+msgid "Search for a string"
+msgstr "Išči niz"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:66
+msgid "Undo"
+msgstr "Razveljavi"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:67
+msgid "Undo the last action"
+msgstr "Razveljavi zadnje dejanje"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:69 po/tmp/evolution.xml.h:32
+msgid "_Appointment (FIXME)"
+msgstr "_Zmenek (FIXME)"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:82
+msgid "_Mark Complete (FIXME)"
+msgstr "_Označi kot opravljeno (FIXME)"
+
+#: po/tmp/evolution-task-editor-dialog.xml.h:89
+msgid "_Reply (FIXME)"
+msgstr "_Odgovori (FIXME)"
+
+#: po/tmp/evolution-tasks.xml.h:7
+msgid "Create a new task"
+msgstr "Ustvari nov posel"
+
+#: po/tmp/evolution-tasks.xml.h:8
+msgid "New"
+msgstr "Nov"
+
+#: po/tmp/evolution-tasks.xml.h:10
+msgid "Save task as something else"
+msgstr "Shrani posel kot nekaj drugega"
+
+#: po/tmp/evolution-tasks.xml.h:11
+msgid "Tasks Preferences..."
+msgstr "Nastavitve poslov..."
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -7329,14 +7516,6 @@ msgstr "Uporaba _pošte"
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: po/tmp/evolution.xml.h:32
-msgid "_Appointment (FIXME)"
-msgstr "_Zmenek (FIXME)"
-
-#: po/tmp/evolution.xml.h:34
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (FIXME)"
-
 #: po/tmp/evolution.xml.h:37
 msgid "_Folder"
 msgstr "_Mapa"
@@ -7361,10 +7540,6 @@ msgstr "_Pošlji sporočilo"
 msgid "_Settings"
 msgstr "_Nastavitve"
 
-#: po/tmp/evolution.xml.h:45
-msgid "_Task (FIXME)"
-msgstr "_Naloga (FIXME)"
-
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
@@ -7372,10 +7547,6 @@ msgstr "_Naloga (FIXME)"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Poskusno"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:387
 msgid "Busy"
 msgstr "Zaseden"
@@ -7479,17 +7650,259 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: widgets/misc/e-search-bar.c:176
+#: widgets/misc/e-messagebox.c:141
+msgid "Information"
+msgstr "Podatki"
+
+#: widgets/misc/e-messagebox.c:148
+msgid "Warning"
+msgstr "Opozorilo"
+
+#: widgets/misc/e-messagebox.c:162
+msgid "Question"
+msgstr "Vprašanje"
+
+#: widgets/misc/e-messagebox.c:169
+msgid "Message"
+msgstr "Sporočilo"
+
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:213
+msgid "Don't show this message again."
+msgstr "Tega sporočila ne kaži več."
+
+#: widgets/misc/e-search-bar.c:135
 msgid "Sear_ch"
 msgstr "_Iskanje"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Skupina %i"
+#~ msgid "FIXME: Assig_n Task"
+#~ msgstr "FIXME: Dodali _nalogo"
+
+#~ msgid "FIXME: Ch_oose Form..."
+#~ msgstr "FIXME: Izberi izmed..."
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: Preve_ri imena"
+
+#~ msgid "FIXME: Cop_y to Folder..."
+#~ msgstr "FIXME: Kopiraj v mapo..."
+
+#~ msgid "FIXME: D_esign a Form..."
+#~ msgstr "FIXME: _Oblikuj obrazec..."
+
+#~ msgid "FIXME: Define Print _Styles"
+#~ msgstr "FIXME: Določi _sloge tiskanja"
+
+#~ msgid "FIXME: Desi_gn This Form"
+#~ msgstr "FIXME: Obli_kuj ta obrazec"
+
+#~ msgid "FIXME: For_ward"
+#~ msgstr "FIXME: _Posreduj naprej"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: Pomoč"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: Do_končana naloga"
+
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: Vstavi datoteko"
+
+#~ msgid "FIXME: It_em..."
+#~ msgstr "FIXME: Pr_edmet..."
+
+#~ msgid "FIXME: Paste _Special... "
+#~ msgstr "FIXME: Prilepi po_sebno..."
+
+#~ msgid "FIXME: Print Pre_view"
+#~ msgstr "FIXME: Predogled tiskanja"
+
+#~ msgid "FIXME: Pu_blish Form As..."
+#~ msgstr "FIXME: O_bjavi obrazec kot..."
+
+#~ msgid "FIXME: Publish _Form..."
+#~ msgstr "FIXME: Ob_javi obrazec..."
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: Ponovitve..."
+
+#~ msgid "FIXME: Reply to A_ll"
+#~ msgstr "FIXME: Odgovori v_sem"
+
+#~ msgid "FIXME: S_end"
+#~ msgstr "FIXME: Pošlji"
+
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "FIXME: Dodaj prilogo..."
+
+#~ msgid "FIXME: Script _Debugger"
+#~ msgstr "FIXME: Razhroščevalnik skript"
+
+#~ msgid "FIXME: Task _Request"
+#~ msgstr "FIXME: Zahteva po _nalogi"
+
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "FIXME: _Zmenek"
+
+#~ msgid "FIXME: _Contact"
+#~ msgstr "FIXME: _Stik"
+
+#~ msgid "FIXME: _Customize..."
+#~ msgstr "FIXME: _Prilagodi..."
+
+#~ msgid "FIXME: _File..."
+#~ msgstr "FIXME: _Datoteka..."
+
+#~ msgid "FIXME: _Font..."
+#~ msgstr "FIXME: _Pisava..."
+
+#~ msgid "FIXME: _Formatting"
+#~ msgstr "FIXME: _Oblikovanje"
 
-#~ msgid "Regular expression compilation failed: %s: %s"
-#~ msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
+#~ msgid "FIXME: _Item"
+#~ msgstr "FIXME: _Predmet"
+
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "FIXME: _Vpis v dnevniku"
+
+#~ msgid "FIXME: _Mail Message"
+#~ msgstr "FIXME: _Pošlji sporočilo"
+
+#~ msgid "FIXME: _Mark Complete"
+#~ msgstr "FIXME: _Označi kot dokončano"
+
+#~ msgid "FIXME: _Memo Style"
+#~ msgstr "FIXME: V slogu zabeležka"
+
+#~ msgid "FIXME: _Move to Folder..."
+#~ msgstr "FIXME: Prestavi v mapo..."
+
+#~ msgid "FIXME: _New Task"
+#~ msgstr "FIXME: _Nova naloga"
+
+#~ msgid "FIXME: _Object..."
+#~ msgstr "FIXME: _Zadeva..."
+
+#~ msgid "FIXME: _Paragraph..."
+#~ msgstr "FIXME: _Odstavek..."
+
+#~ msgid "FIXME: _Reply"
+#~ msgstr "FIXME: _Odgovori"
+
+#~ msgid "FIXME: _Spelling..."
+#~ msgstr "FIXME: _Črkovanje..."
+
+#~ msgid "FIXME: _Standard"
+#~ msgstr "FIXME: _Običajno"
+
+#~ msgid "FIXME: _Task"
+#~ msgstr "FIXME: _Naloga"
+
+#~ msgid "FIXME: _Unread Item"
+#~ msgstr "FIXME: _Neprebran predmet"
+
+#~ msgid "FIXME: _note"
+#~ msgstr "FIXME: _opomba"
+
+#~ msgid "Find _Again"
+#~ msgstr "Poišči znova"
+
+#~ msgid "_Find..."
+#~ msgstr "_Poišči..."
+
+#~ msgid "_Forms"
+#~ msgstr "_Obrazci"
+
+#~ msgid "_Insert"
+#~ msgstr "Vstavi"
+
+#~ msgid "_Object"
+#~ msgstr "_Predmet"
+
+#~ msgid "_Redo"
+#~ msgstr "Obnovi"
+
+#~ msgid "_Replace..."
+#~ msgstr "_Zamenjaj..."
+
+#~ msgid "_Toolbars"
+#~ msgstr "_Orodjarne"
+
+#~ msgid "_Undo"
+#~ msgstr "_Razveljavi"
+
+#~ msgid "C_lassification:"
+#~ msgstr "_Uvrstitev:"
+
+#~ msgid "S_ummary"
+#~ msgstr "_Povzetek"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "dialog-urejevalnik-dogodkov"
+
+#~ msgid "Open..."
+#~ msgstr "Odpri..."
+
+#~ msgid "Open the task"
+#~ msgstr "Odpri nalogo"
+
+#~ msgid "Days"
+#~ msgstr "Dni"
+
+#~ msgid "Hours"
+#~ msgstr "Ur"
+
+#~ msgid "Mail _to:"
+#~ msgstr "Pošlji pošto _za:"
+
+#~ msgid "Minutes"
+#~ msgstr "Minut"
+
+#~ msgid "Time"
+#~ msgstr "Čas"
+
+#~ msgid "_Audio"
+#~ msgstr "_Zvok"
+
+#~ msgid "_Contacts"
+#~ msgstr "_Stiki"
+
+#~ msgid "_Display"
+#~ msgstr "_Prikaz"
+
+#~ msgid "_Mail"
+#~ msgstr "_Pošlji pošto"
+
+#~ msgid "_Program"
+#~ msgstr "_Program"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "dialog-urejevalec-dogodkov"
+
+#~ msgid ""
+#~ "Could not open file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel odpreti datoteke: %s:\n"
+#~ "%s"
+
+#~ msgid "Ok"
+#~ msgstr "V redu"
+
+#~ msgid "Cancel"
+#~ msgstr "Prekliči"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Odpri koledar"
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "FIXME: _Nov zmenek"
+
+#~ msgid "FIXME: _Note"
+#~ msgstr "FIXME: _Opomba"
+
+#~ msgid "Group %i"
+#~ msgstr "Skupina %i"
 
 #~ msgid "Failed to perform regex search on message header: %s"
 #~ msgstr ""
@@ -7504,9 +7917,6 @@ msgstr "Skupina %i"
 #~ msgid "Fetch email from %s"
 #~ msgstr "Poberi pošto iz %s"
 
-#~ msgid "There is no new mail at %s."
-#~ msgstr "Ni nove pošte na %s."
-
 #~ msgid "Filtering email on demand"
 #~ msgstr "Filtriram pošto na zahtevo"
 
@@ -7564,9 +7974,6 @@ msgstr "Skupina %i"
 #~ msgid "Empty days:"
 #~ msgstr "Prazni dnevi:"
 
-#~ msgid "Appointments:"
-#~ msgstr "Zmenki:"
-
 #~ msgid "Highlighted day:"
 #~ msgstr "Osvetljen dan:"
 
@@ -7724,9 +8131,6 @@ msgstr "Skupina %i"
 #~ msgid "Reminder of your appointment at "
 #~ msgstr "Opomin na zmenek ob "
 
-#~ msgid "Could not create a calendar in `%s'"
-#~ msgstr "Nisem mogel ustvariti koledarja v `%s'"
-
 #~ msgid "Year:"
 #~ msgstr "Leto:"
 
@@ -7809,9 +8213,6 @@ msgstr "Skupina %i"
 #~ msgid "Audio alarms timeout after"
 #~ msgstr "Zvočni alarmi pretečejo po"
 
-#~ msgid " seconds"
-#~ msgstr " sekundah"
-
 #~ msgid "Enable snoozing for "
 #~ msgstr "Omogoči podaljšanje spanja za "
 
@@ -7880,9 +8281,6 @@ msgstr "Skupina %i"
 #~ msgid "Forward Message"
 #~ msgstr "Sporočilo posreduj naprej"
 
-#~ msgid "Move Message"
-#~ msgstr "Prestavi sporočilo"
-
 #~ msgid "Copy Message"
 #~ msgstr "Kopiraj sporočilo"
 
@@ -7910,9 +8308,6 @@ msgstr "Skupina %i"
 #~ msgid "Don't delete messages from server"
 #~ msgstr "Ne zbriši sporočil s strežnika"
 
-#~ msgid "Test Settings"
-#~ msgstr "Preveri nastavitve"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Tip izvora pošte:"
 
@@ -8175,9 +8570,6 @@ msgstr "Skupina %i"
 #~ msgid "FIXME: Next"
 #~ msgstr "FIXME: Naslednji"
 
-#~ msgid "* Click here to add a contact *"
-#~ msgstr "* Kliknite tu za dodajo stika *"
-
 #~ msgid "Gnome Calendar"
 #~ msgstr "Gnome Koledar"
 
@@ -8196,9 +8588,6 @@ msgstr "Skupina %i"
 #~ msgid "Create a new appointment for today"
 #~ msgstr "Ustvari nov zmenek za danes"
 
-#~ msgid "About Calendar"
-#~ msgstr "Uporaba _koledarja"
-
 #~ msgid "%s%s"
 #~ msgstr "%s%s"
 
@@ -8318,9 +8707,6 @@ msgstr "Skupina %i"
 #~ msgid "label24"
 #~ msgstr "label24"
 
-#~ msgid "label25"
-#~ msgstr "label25"
-
 #~ msgid ""
 #~ "1st\n"
 #~ "2nd\n"
@@ -8360,9 +8746,6 @@ msgstr "Skupina %i"
 #~ msgid "Add to-do item..."
 #~ msgstr "Dodaj predmet za-opravit..."
 
-#~ msgid "Edit this item..."
-#~ msgstr "Uredi ta predmet..."
-
 #~ msgid "Time Left"
 #~ msgstr "Preostalo časa"