Updated Slovenian translation

svn path=/trunk/; revision=7710

1 files changed, 4567 insertions, 3288 deletions

diff --git a/po/sl.po b/po/sl.po
index aba65ed74a..7339413b76 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Andraz Tori <andraz.tori1@guest.arnes.si> 2000
 #
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2000-11-13 19:14+0100\n"
+"POT-Creation-Date: 2001-01-21 05:55+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"
@@ -13,11 +14,834 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3044
+#.
+#. * 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:152
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
+
+#: camel/providers/vee/camel-vee-folder.c:604
+msgid "No such message: %s"
+msgstr "Ni takšnega sporočila: %s"
+
+#: executive-summary/component/e-summary-callbacks.c:267
+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 z 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 z privzetim GNOMEovim brskalnikom"
+
+#: executive-summary/component/e-summary-url.c:63
+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
+msgid "Close %s"
+msgstr "Zapri %s"
+
+#: executive-summary/component/e-summary-url.c:68
+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
+msgid "Move %s into the previous row"
+msgstr "Premakni %s v prešnjo vrstico"
+
+#: executive-summary/component/e-summary-url.c:71
+msgid "Move %s into the next row"
+msgstr "Premakni %s v naslednjo vrstico"
+
+#: executive-summary/component/e-summary-url.c:72
+msgid "Configure %s"
+msgstr "Nastavi %s"
+
+#: executive-summary/component/e-summary.c:919
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Nisem mogel odpreti HTML datoteke:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:933
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Napaka ob branju podatkov:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:951
+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:443
+#: executive-summary/test-service/rdf-summary.c:479
+#: executive-summary/test-service/rdf-summary.c:524
+msgid "Error"
+msgstr "Napaka"
+
+#: mail/mail-config.c:799
+msgid "Connecting to server"
+msgstr "Povezujem se 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 "Č_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
+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:673 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: _Po meri..."
+
+#: 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:32 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:34
+#: 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_tavi tiskanje..."
+
+#: 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
+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:58
+#: 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:32
+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:33
+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:36
+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:43
+#: 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:661 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:35 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
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +849,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3047
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +857,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +865,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +873,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +881,7 @@ msgstr ""
 "\n"
 "  Družinsko:     "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +889,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3065
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +897,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3076
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +905,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +913,7 @@ msgstr ""
 "\n"
 "  Poštni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3079
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +921,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +929,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +937,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +945,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +953,7 @@ msgstr ""
 "\n"
 "  Poštna številka: "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +961,7 @@ msgstr ""
 "\n"
 "  Država:      "
 
-#: addressbook/backend/ebook/e-card.c:3097
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +969,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3109
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +977,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3112
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +985,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3136
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +993,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3139
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +1001,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3158
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +1009,7 @@ msgstr ""
 "\n"
 "Poštni program: "
 
-#: addressbook/backend/ebook/e-card.c:3164
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +1017,7 @@ msgstr ""
 "\n"
 "Časovna cona: "
 
-#: addressbook/backend/ebook/e-card.c:3172
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +1025,7 @@ msgstr ""
 "\n"
 "Geografski položaj: "
 
-#: addressbook/backend/ebook/e-card.c:3176
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +1033,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3188
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +1041,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3189
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +1049,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +1057,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +1065,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +1073,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +1081,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +1089,7 @@ msgstr ""
 "\n"
 "Categorije: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +1107,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +1115,7 @@ msgstr ""
 "\n"
 "Enoličen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -303,9 +1127,9 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:910
+#: addressbook/conduit/address-conduit.c:1087
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1091
+#: calendar/conduits/calendar/calendar-conduit.c:1177
 #: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
@@ -429,155 +1253,36 @@ msgstr ""
 "Ob prenašanju seznama pilotov s gnome-pilot\n"
 "daemona se je zgodila napaka"
 
-#: addressbook/conduit/address-conduit.c:193
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Kazalec se ni mogel naložiti\n"
 
-#: addressbook/conduit/address-conduit.c:206
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "EKnjiga ni naložena\n"
 
-#: addressbook/conduit/address-conduit.c:490
-#: calendar/conduits/calendar/calendar-conduit.c:651
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:650
+#: calendar/conduits/calendar/calendar-conduit.c:756
+#: calendar/conduits/todo/todo-conduit.c:544
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati strežnika wombat"
 
-#: addressbook/conduit/address-conduit.c:491
-#: calendar/conduits/calendar/calendar-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:525
+#: addressbook/conduit/address-conduit.c:651
+#: calendar/conduits/calendar/calendar-conduit.c:757
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
-#: addressbook/conduit/address-conduit.c:517
-#: addressbook/conduit/address-conduit.c:520
+#: addressbook/conduit/address-conduit.c:683
+#: addressbook/conduit/address-conduit.c:686
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/categories-strings.h:7
-msgid "categories"
-msgstr "kategorije"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Predmet(i) pripada(jo) tem kategorijam:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Dostopne kategorije:"
-
-#: addressbook/contact-editor/e-contact-editor.c:1218
-msgid "Assistant"
-msgstr "Pomočnik"
-
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
-msgid "Business"
-msgstr "Služba"
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-msgid "Business 2"
-msgstr "Služba"
-
-#: addressbook/contact-editor/e-contact-editor.c:1221
-msgid "Business Fax"
-msgstr "Službeni faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1222
-msgid "Callback"
-msgstr "Povratni klic"
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-msgid "Car"
-msgstr "Avto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-msgid "Company"
-msgstr "Podjetje"
-
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
-msgid "Home"
-msgstr "Doma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "Home 2"
-msgstr "Doma 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1227
-msgid "Home Fax"
-msgstr "Domači faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1228
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1229
-msgid "Mobile"
-msgstr "Prenosni telefon"
-
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr "Drugo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1231
-msgid "Other Fax"
-msgstr "Drugi faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1232
-msgid "Pager"
-msgstr "Pozivnik"
-
-#: addressbook/contact-editor/e-contact-editor.c:1233
-msgid "Primary"
-msgstr "Prvi"
-
-#: addressbook/contact-editor/e-contact-editor.c:1234
-msgid "Radio"
-msgstr "Radijo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1235
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1236
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Primary Email"
-msgstr "prvi e-naslov"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Email 2"
-msgstr "E-naslov 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Email 3"
-msgstr "E-naslov 3"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ste prepričani, da \n"
-"želite izbrisati ta stik?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Zbriši stik?"
 
@@ -590,11 +1295,6 @@ msgstr "Zbriši stik?"
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.h:72 ui/evolution-mail.h:48
-msgid "_Delete"
-msgstr "_Zbriši"
-
 #: addressbook/contact-editor/e-contact-editor-strings.h:9
 msgid "Phone Types"
 msgstr "Tipi telefonov"
@@ -604,11 +1304,13 @@ msgstr "Tipi telefonov"
 msgid "New phone type"
 msgstr "Nov tip telefona"
 
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:71 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
+#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:10
 msgid "Add"
 msgstr "Dodaj"
 
@@ -648,6 +1350,11 @@ msgstr "Službeni _faks"
 msgid "_Mobile"
 msgstr "_Prenosni telefon"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1336
+msgid "Primary Email"
+msgstr "prvi e-naslov"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "V sl_užbi"
@@ -661,7 +1368,7 @@ msgid "C_ontacts..."
 msgstr "_Stiki..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
@@ -678,7 +1385,7 @@ msgid "_Address..."
 msgstr "_Naslov..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config.glade.h:31
 msgid "General"
 msgstr "Splošno"
 
@@ -723,59 +1430,160 @@ msgid "No_tes:"
 msgstr "Opom_be:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Podrobnosti"
 
+#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
+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
+msgid "Business"
+msgstr "Služba"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+msgid "Business 2"
+msgstr "Služba"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
+msgid "Business Fax"
+msgstr "Službeni faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1278
+msgid "Callback"
+msgstr "Povratni klic"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
+msgid "Car"
+msgstr "Avto"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Company"
+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
+msgid "Home"
+msgstr "Doma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
+msgid "Home 2"
+msgstr "Doma 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+msgid "Home Fax"
+msgstr "Domači faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
+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
+msgid "Other"
+msgstr "Drugo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1287
+msgid "Other Fax"
+msgstr "Drugi faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
+msgid "Pager"
+msgstr "Pozivnik"
+
+#: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
+msgid "Primary"
+msgstr "Prvi"
+
+#: addressbook/contact-editor/e-contact-editor.c:1290
+msgid "Radio"
+msgstr "Radijo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1291
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1292
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
+msgid "Email 2"
+msgstr "E-naslov 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
+msgid "Email 3"
+msgstr "E-naslov 3"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "Naslov _2:"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "Kanada"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Preveri naslov"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "Drža_va:"
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "Finska"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "ZDA"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Naslov:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Mesto:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Poštni predal:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
-msgstr "Naslov _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Država/Provinca:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "ZDA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Finska"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Poštna številka:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
-msgstr "Drža_va:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -790,14 +1598,18 @@ msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
 "G.\n"
-"G.\n"
+"Ga.\n"
+"Ga.\n"
+"Gdč.\n"
 "Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -815,46 +1627,48 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "_Ime:"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "_Drugo ime:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "_Priimek:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "P_ripona:"
 
-#: addressbook/gui/component/addressbook.c:265
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Kot _minivizitke"
 
 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:271 ui/evolution-addressbook.h:9
+#: addressbook/gui/component/addressbook.c:237
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Kot tabelo"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+msgid "Enter password for %s"
+msgstr "Vpišite geslo za %s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:407
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -863,199 +1677,368 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 "Adresarja ni bilo mogoče odpreti. To lahko pomeni ali\n"
 "da ste vnesli napačen URI, ali pa poskušali dostopati \n"
 "do LDAP strežnika brez prevedene LDAP podpore. Če ste \n"
 "vnesli URI, preverite njegovo pravilnost in ga znova \n"
 "vnesite. Če ne, ste verjetno poskušali dostopati do LDAP \n"
-"strežnika. Če želite dostopati do LDAP morate naložiti in \n"
-"namestiti OpenLDAP in ponovno prevesti in namestiti evolution. \n"
+"strežnika. Če želite uporabljalti LDAP morate naložiti in \n"
+"namestiti OpenLDAP in ponovno prevesti in namestiti Evolucijo. \n"
+
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+msgid "Show All"
+msgstr "Kaži vse"
+
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+msgid "Advanced..."
+msgstr "Napredno..."
+
+#: addressbook/gui/component/addressbook.c:562
+msgid "Any field contains"
+msgstr "Katerokoli polje vsebuje"
+
+#: addressbook/gui/component/addressbook.c:563
+msgid "Name contains"
+msgstr "Ime vsebuje"
 
-#: addressbook/gui/component/addressbook.c:574
+#: addressbook/gui/component/addressbook.c:564
+msgid "Email contains"
+msgstr "E-naslov vsebuje"
+
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Zunanji imeniki"
+#: addressbook/gui/component/addressbook-storage.c:95
+msgid "Other Contacts"
+msgstr "Drugo stiki"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "Description:"
-msgstr "Opis:"
+#: addressbook/gui/component/addressbook-config.c:139
+msgid "LDAP Server"
+msgstr "LDAP strežnik"
+
+#: addressbook/gui/component/addressbook-config.c:141
+msgid "File"
+msgstr "Datoteka"
+
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Unknown addressbook type"
+msgstr "Neznan tip adresarja"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
+msgstr "Brez (anonimni način)"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
-msgid "LDAP Server:"
-msgstr "LDAP strežnik:"
+#: addressbook/gui/component/addressbook-config.c:155
+#: camel/providers/imap/camel-imap-store.c:249
+#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/pop3/camel-pop3-store.c:146
+msgid "Password"
+msgstr "Geslo"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr "SASL"
+
+#: addressbook/gui/component/addressbook-config.c:160
+msgid "Unknown auth type"
+msgstr "Neznan način avtentifikacije"
+
+#: addressbook/gui/component/addressbook-config.c:169
+msgid "Base"
+msgstr "Osnovno"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr "Ena"
+
+#: addressbook/gui/component/addressbook-config.c:173
+msgid "Subtree"
+msgstr "Poddrevo"
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "Unknown scope type"
+msgstr "Neznan tip dosega"
+
+#: addressbook/gui/component/addressbook-config.c:309
+msgid "Bind DN:"
+msgstr "Povezan z domeno:"
+
+#: addressbook/gui/component/addressbook-config.c:311
+msgid "Remember this password"
+msgstr "Zapomni si geslo"
+
+#: addressbook/gui/component/addressbook-config.c:360
+#: po/tmp/mail-config.glade.h:32
+msgid "Host:"
+msgstr "Gostitelj:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Številka vrat:"
+#: addressbook/gui/component/addressbook-config.c:361
+msgid "Port:"
+msgstr "Vrata:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
-msgstr "Korenski DN:"
+msgstr "Kornsko ime domene:"
+
+#: addressbook/gui/component/addressbook-config.c:384
+msgid "Search Scope:"
+msgstr "Doseg iskanja:"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: po/tmp/mail-config.glade.h:14
+msgid "Authentication:"
+msgstr "Avtentifikacija:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: po/tmp/mail-config.glade.h:51
+msgid "Path:"
+msgstr "Pot:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+msgid "Create path if it doesn't exist."
+msgstr "Če pot ne obstaja jo ustvari."
+
+#: addressbook/gui/component/addressbook-config.c:593
+msgid "Edit Addressbook"
+msgstr "Uredi adresar"
+
+#: addressbook/gui/component/addressbook-config.c:595
+msgid "Add Addressbook"
+msgstr "Dodaj adresar"
+
+#: addressbook/gui/component/addressbook-config.c:611
+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/ldap-server-dialog.glade.h:11
+#: addressbook/gui/component/addressbook-config.c:616
+#: po/tmp/mail-config.glade.h:44
 msgid "Name:"
 msgstr "Ime:"
 
+#: addressbook/gui/component/addressbook-config.c:617
+#: po/tmp/e-msg-composer-attachment.glade.h:8
+msgid "Description:"
+msgstr "Opis:"
+
+#: po/tmp/addressbook-config.glade.h:7
+msgid "Addressbook Sources"
+msgstr "Viri adresarja"
+
+#: mail/folder-browser.c:659 po/tmp/addressbook-config.glade.h:9
+#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:27
+msgid "Edit"
+msgstr "Uredi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+#: po/tmp/addressbook-config.glade.h:10
+msgid "Name"
+msgstr "Ime"
+
+#: po/tmp/addressbook-config.glade.h:11
+msgid "URI"
+msgstr "URI"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Izberi imena"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Poišči..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr "Izberi ime s seznama:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:10
+#: po/tmp/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Prejemniki sporočila"
 
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr "Izberi imena"
+
+#: po/tmp/select-names.glade.h:9
+msgid "Select name from:"
+msgstr "Izberi ime iz:"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Išči"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr "okno2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:469
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Shrani kot vVizitko"
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+msgid "Email"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organizacija"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr "Spletna stran"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+msgid "Department"
+msgstr "Oddelek"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+msgid "Office"
+msgstr "Pisarna"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+msgid "Title"
+msgstr "Naziv"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+msgid "Profession"
+msgstr "Poklic"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+msgid "Manager"
+msgstr "Upravljalec"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+msgid "Nickname"
+msgstr "Vzdevek"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+msgid "Spouse"
+msgstr "Partner(ka):"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+msgid "Note"
+msgstr "Notica"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr "URL zasedenosti"
+
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1069,199 +2052,177 @@ msgstr ""
 "\n"
 "Če želite ustvariti nov stik, dvojno kliknite tu.."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:643 mail/mail-search-dialogue.c:101
-msgid "Search"
-msgstr "Išči"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "Nastavitev strani:"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "Ime stila:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "Predogled:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
+msgstr "10 pik Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "Možnosti"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 pik Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr "Vključi:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr "Prazni obrazci na koncu:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
-msgstr "Sekcije:"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "Telo"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr "Si sledijo takoj"
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "Spodaj:"
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
-msgstr "Uhlji črk ob strani"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "Mere:"
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr "Zaglavja za vsako črko"
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "Pisava..."
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr "Začni na novi strani"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "Pisave"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "Število stolpcev:"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr "Noga:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr "Prazni obrazci na koncu:"
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "Oblika izpisa"
 
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "Pisave"
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "Glava"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "Pisava..."
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr "Glava/noga"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Zaglavja"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr "10 pik Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr "Zaglavja za vsako črko"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "Telo"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "Višina:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
-msgstr "8 pik Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr "Si sledijo takoj"
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
-msgstr "Senčenje"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr "Vključi:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
-msgstr "Tiskaj z uporabo sivinskega senčenja"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "Ležeče"
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "Oblika izpisa"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Levo:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "Papir"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr "Uhlji črk ob strani"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Tip:"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "Robovi"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "label26"
-msgstr "označba26"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "Število stolpcev:"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "Mere:"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "Možnosti"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "Širina:"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "Usmerjenost"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "Višina:"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "Stran"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "Nastavitev strani:"
+
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "Papir"
+
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
-msgstr "Izvor papirja:"
+msgstr "Vir papirja:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "Robovi"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "Pokončno"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "Zgoraj:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "Predogled:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "Spodaj:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "Tiskaj z uporabo sivinskega senčenja"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "Levo:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "Obratno na sodih straneh"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Desno:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Stran"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "Sekcije:"
+
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "Senčenje"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Velikost:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "Usmerjenost"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "Pokončno"
-
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "Ležeče"
-
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "Glava"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "Začni na novi strani"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr "Noga:"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "Ime stila:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr "Obratno na sodih straneh"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "Zgoraj:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr "Glava/noga"
+#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:72
+msgid "Type:"
+msgstr "Tip:"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
-msgid "am"
-msgstr "dop"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "Širina:"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pop"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "označba26"
 
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
@@ -1271,13 +2232,13 @@ msgstr "Evolucijin koledarski veznik"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Nastavitveno orodje za Evolucijin koledarski veznik.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:607
-#: calendar/conduits/todo/todo-conduit.c:480
+#: calendar/conduits/calendar/calendar-conduit.c:712
+#: calendar/conduits/todo/todo-conduit.c:500
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s koledarskim strežnikom"
 
-#: calendar/conduits/calendar/calendar-conduit.c:706
-#: calendar/conduits/calendar/calendar-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:811
+#: calendar/conduits/calendar/calendar-conduit.c:814
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
@@ -1289,126 +2250,90 @@ msgstr "Evolucijin veznik za-opravit"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Nastavitveno orodje za Evolucijin za-opravit veznik.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:579
-#: calendar/conduits/todo/todo-conduit.c:582
+#: calendar/conduits/todo/todo-conduit.c:599
+#: calendar/conduits/todo/todo-conduit.c:602
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama za-opravit"
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "Obroba:"
-
-#: calendar/gui/calendar-commands.c:61
-msgid "Headings:"
-msgstr "Zaglavja:"
-
-#: calendar/gui/calendar-commands.c:62
-msgid "Empty days:"
-msgstr "Prazni dnevi:"
-
-#: calendar/gui/calendar-commands.c:63
-msgid "Appointments:"
-msgstr "Zmenki:"
-
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "Osvetljen dan:"
-
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "Številke dni:"
-
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "Številka trenutnega dne:"
-
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
-msgstr "Predmet za-opravit, ki še ni na vrsti:"
-
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
-msgstr "Predmet za-opravit, ki je na vrsti danes:"
-
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
-msgstr "Predmet za-opravit, ki je že pretekel:"
-
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:245
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
 
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:269
 msgid "Open calendar"
 msgstr "Odpri koledar"
 
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:311
 msgid "Save calendar"
 msgstr "Shrani koledar"
 
+#: calendar/gui/calendar-commands.c:448
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Nisem mogel ustvariti pogleda koledarja. Prosim preverite nastavitve ORBit-a in OAF-a"
+
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:282
+#: calendar/gui/calendar-model.c:332
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
 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:290 calendar/gui/calendar-model.c:729
+#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:374 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Javno"
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:377 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Osebno"
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:380 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Zaupno"
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Unknown"
 msgstr "Neznano"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:471
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:471
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:473
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:473
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:545
 msgid "Transparent"
 msgstr "Prozorno"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:548
 msgid "Opaque"
 msgstr "Prosojno"
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:774
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1420,36 +2345,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
-#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 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:853
+#: calendar/gui/calendar-model.c:893
 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:856
+#: calendar/gui/calendar-model.c:896
 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:860
+#: calendar/gui/calendar-model.c:900
 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:863
+#: calendar/gui/calendar-model.c:903
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:1023
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1459,1393 +2383,1150 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1063
 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:1063
+#: calendar/gui/calendar-model.c:1103
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteta mora biti med vključno 1 in 9"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/calendar-summary.c:97
+msgid "%A, %e %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+msgid "%I:%M%p"
+msgstr "%I:%M%p"
+
+#: calendar/gui/calendar-summary.c:302
+msgid "<b>Error loading calendar</b>"
+msgstr "<b>Napaka ob nalaganju koledarja</b>"
+
+#: calendar/gui/calendar-summary.c:314
+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
+msgid "Display"
+msgstr "Prikaz"
+
+#: calendar/gui/calendar-summary.c:489
+msgid "Show appointments"
+msgstr "Kaži zmenke"
+
+#: calendar/gui/calendar-summary.c:497
+msgid "Show tasks"
+msgstr "Kaži posle"
+
+#: calendar/gui/calendar-summary.c:583
+msgid "Loading Calendar"
+msgstr "Nalagam koledar"
+
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+#: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm na %A %d %b %Y ob %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+#: calendar/gui/dialogs/alarm-notify-dialog.c:191
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Obvestilo o vašem zmenku na %A %d %b %Y ob %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#: calendar/gui/dialogs/alarm-notify-dialog.c:202
 msgid "No summary available."
 msgstr "Povzetek ni na voljo."
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-event-editor.h:19
-#: ui/evolution-subscribe.h:10
-msgid "Close"
-msgstr "Zapri"
+#: po/tmp/alarm-notify.glade.h:7
+msgid "Edit appointment"
+msgstr "Uredi zmenek"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
+#: po/tmp/alarm-notify.glade.h:8
 msgid "Snooze"
 msgstr "Podaljšek spanja"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Edit appointment"
-msgstr "Uredi zmenek"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Čas podaljška spanja (minut)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
+msgstr "05 minut"
+
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 minut"
+
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 urna (dop./pop.)"
+
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 minut"
+
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 urna"
+
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 minut"
+
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 minut"
+
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr "Alarmi pretečejo po"
+
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
+msgstr "Zvočni alarmi"
+
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr "Pozvoni, ko se pokažejo okna alarmov"
+
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "Koledar"
+
+#: po/tmp/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Nastavitve koledarja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
-msgstr "Delavni teden"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Barve"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "pon"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr "Skrči vikende"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "tor"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr "Možnosti navigatorja datumov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "sre"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr "Privzeto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "čet"
+#: po/tmp/cal-prefs-dialog.glade.h:22
+msgid "Display options"
+msgstr "Pokaži možnosti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "pet"
+#: calendar/gui/e-calendar-table.c:159 po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr "Do datuma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "sob"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
+msgstr "Omogoči podaljšanje spanja za"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "ned"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "Konec dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: po/tmp/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Prvi dan tedna:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:45 calendar/gui/prop.c:354
+#: po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "pet"
+
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "petek"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
+msgstr "Osvetlji:"
+
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
+msgstr "Predmeti z današnjim rokom"
+
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr "Predmeti z rokom danes:"
+
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr "Predmeti z rokom v prihodnosti"
+
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
+msgstr "Predmeti z rokom v prihodnosti:"
+
+#: po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "pon"
+
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:35
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Tuesday"
-msgstr "torek"
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
+msgstr "Predmeti s prekoračenim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "Wednesday"
-msgstr "sreda"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
+msgstr "Predmeti s prekoračenim rokom:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:48
-msgid "Thursday"
-msgstr "četrtek"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr "Izberi barvo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "Friday"
-msgstr "petek"
+#: calendar/gui/e-calendar-table.c:162 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
+msgstr "Prioriteta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:50
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr "Opomni me na vse zmenke"
+
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr "Opozorila"
+
+#: po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "sob"
+
+#: calendar/gui/event-editor.c:440 po/tmp/cal-prefs-dialog.glade.h:43
 msgid "Saturday"
 msgstr "sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:51 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "nedeljo"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr "Kaži"
+
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
+msgstr "Kaži čase koncev zmenkov"
+
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
+msgstr "Kaži številke tednov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: po/tmp/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Začetek dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Konec dneva:"
+#: po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "ned"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Display options"
-msgstr "Pokaži možnosti"
+#: calendar/gui/event-editor.c:441 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "nedeljo"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
+msgid "TaskPad"
+msgstr "Naloge"
+
+#: po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "čet"
+
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "četrtek"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
+msgstr "Čas do preteka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: po/tmp/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Časovne delitve"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: po/tmp/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Oblika izpisa časa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
-msgstr "Kaži čase koncev zmenkov"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Compress weekends"
-msgstr "Skrči vikende"
+#: po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr "tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
-msgstr "12 urna (dop./pop.)"
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "torek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
-msgstr "24 urna"
+#: po/tmp/cal-prefs-dialog.glade.h:58
+msgid "Visual Alarms"
+msgstr "Vidni alarmi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "sre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 minut"
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "sreda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr "Delavni teden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr "minut preden se zgodijo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
+msgstr "sekundah."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Date navigator options"
-msgstr "Možnosti navigatorja datumov"
+#: calendar/gui/dialogs/delete-comp.c:63
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr "Ste prepričani, da želite zbrisati ta zmenek `%s'?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show week numbers"
-msgstr "Kaži številke tednov"
+#: calendar/gui/dialogs/delete-comp.c:66
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr "Ste prepričani, želite zbrisati ta neimenovan zmenek?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
-msgstr "Koledar"
+#: calendar/gui/dialogs/delete-comp.c:72
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
-msgstr "Kaži"
+#: calendar/gui/dialogs/delete-comp.c:75
+msgid "Are you sure you want to delete this untitled task?"
+msgstr "Ste prepričani, da želite zbrisati ta neimenovan posel?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Do datuma"
+#: calendar/gui/dialogs/delete-comp.c:81
+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/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
-msgid "Time Until Due"
-msgstr "Čas do preteka"
+#: calendar/gui/dialogs/delete-comp.c:84
+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/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
-msgid "Priority"
-msgstr "Prioriteta"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/task-editor-dialog.glade.h:6
+msgid "% Comp_lete:"
+msgstr "% konča_no:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Highlight"
-msgstr "Osvetlji:"
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "_Uvrstitev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
-msgstr "Predmeti s prekoračenim rokom"
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "Preklicano"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Items Due Today"
-msgstr "Predmeti z današnjim rokom"
+#: po/tmp/task-editor-dialog.glade.h:10
+msgid "Completed"
+msgstr "Končano"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Items Not Yet Due"
-msgstr "Predmeti z rokom v prihodnosti"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr "Končano dne:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Barve"
+#: po/tmp/task-editor-dialog.glade.h:14
+msgid "High"
+msgstr "Visoka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
-msgstr "Izberi barvo"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "V teku"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Items Not Yet Due:"
-msgstr "Predmeti z rokom v prihodnosti:"
+#: po/tmp/task-editor-dialog.glade.h:16
+msgid "Low"
+msgstr "Nizka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
-msgstr "Predmeti z rokom danes:"
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
+#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:844 po/tmp/mail-config.glade.h:46
+#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1133
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Brez"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Overdue Items:"
-msgstr "Predmeti s prekoračenim rokom:"
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "Običajna"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "TaskPad"
-msgstr "Naloge"
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "Ni pričeto"
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "Privzeto"
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr "_Povzetek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Remind me of all appointments"
-msgstr "Opomni me na vse zmenke"
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr "Datum _pričetka:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "minutes before they occur."
-msgstr "minut preden se zgodijo"
+#: po/tmp/task-editor-dialog.glade.h:24
+msgid "Task"
+msgstr "Naloga"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-msgid "Visual Alarms"
-msgstr "Vidni alarmi"
+#: po/tmp/task-editor-dialog.glade.h:25
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
-msgstr "Pozvoni, ko se pokažejo okna alarmov"
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "Undefined"
+msgstr "Ni definiran"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
-msgstr "Zvočni alarmi"
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Contacts..."
+msgstr "_Stiki..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
-msgstr "Alarmi pretečejo po"
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Due Date:"
+msgstr "_Do datuma:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-msgid "seconds."
-msgstr "sekundah."
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Priority:"
+msgstr "_Prioriteta:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "Enable snoozing for"
-msgstr "Omogoči podaljšanje spanja za"
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "_Status:"
+msgstr "_Stanje:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
-msgstr "Opozorila"
+#: po/tmp/task-editor-dialog.glade.h:31
+msgid "task-editor-dialog"
+msgstr "dialog-urejevalnik-dogodkov"
 
-#: calendar/gui/dialogs/task-editor.c:655
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "Uredi nalogo"
 
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:303
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:309
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zmenek - %s"
 
-#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:312
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:315
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr "dialog-urejevalnik-dogodkov"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "S_ummary"
-msgstr "_Povzetek"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
-msgstr "Datum _pričetka:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
-msgstr "_Do datuma:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "% Comp_lete:"
-msgstr "% konča_no:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
-msgstr "_Stanje:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Ni pričeto"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "V teku"
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3268
+msgid "Do you want to save changes?"
+msgstr "Želite shraniti spremembe"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Completed"
-msgstr "Končano"
+#: calendar/gui/e-calendar-table.c:154
+msgid "Categories"
+msgstr "kategorije"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "Preklicano"
+#: calendar/gui/e-calendar-table.c:155 po/tmp/event-editor-dialog.glade.h:10
+msgid "Classification"
+msgstr "Uvrstitev"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "_Priority:"
-msgstr "_Prioriteta:"
+#: calendar/gui/e-calendar-table.c:156
+msgid "Completion Date"
+msgstr "Datum zaključka"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "High"
-msgstr "Visoka"
+#: calendar/gui/e-calendar-table.c:157
+msgid "End Date"
+msgstr "Datum konca"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Običajna"
+#: calendar/gui/e-calendar-table.c:158
+msgid "Start Date"
+msgstr "Datum pričetka"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Low"
-msgstr "Nizka"
+#: calendar/gui/e-calendar-table.c:160
+msgid "Geographical Position"
+msgstr "Zemljepisna lega"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
-msgstr "_Uvrstitev"
+#: calendar/gui/e-calendar-table.c:161
+msgid "Precent complete"
+msgstr "Procentov opravljeno"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: shell/e-shell-view.c:1017 widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
-msgid "None"
-msgstr "Brez"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Stiki..."
+#: calendar/gui/e-calendar-table.c:163
+msgid "Summary"
+msgstr "Povzetek"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "Task"
-msgstr "Naloga"
+#: calendar/gui/e-calendar-table.c:164
+msgid "Transparency"
+msgstr "Prosojnost"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
-msgstr "Končano dne:"
+#: calendar/gui/e-calendar-table.c:165
+msgid "URL"
+msgstr "URL"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "URL:"
-msgstr "URL:"
+#: calendar/gui/e-calendar-table.c:166
+msgid "Alarms"
+msgstr "Alarmi"
 
-#: calendar/gui/e-calendar-table.c:294
+#: calendar/gui/e-calendar-table.c:397
 msgid "Open..."
 msgstr "Odpri..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:398
 msgid "Open the task"
 msgstr "Odpri nalogo"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:401
 msgid "Mark the task complete"
 msgstr "Označi nalogo kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:73 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/libfilter-i18n.h:8
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:165
-#: ui/evolution-addressbook.h:11 ui/evolution-contact-editor.h:12
-#: ui/evolution-contact-editor.h:19 ui/evolution-event-editor.h:13
-#: ui/evolution-mail.h:13
-msgid "Delete"
-msgstr "Zbriši"
-
-#: calendar/gui/e-calendar-table.c:301
+#: calendar/gui/e-calendar-table.c:404
 msgid "Delete the task"
 msgstr "Zbriši nalogo"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:517
 #, 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:261 calendar/gui/e-day-view.c:1172
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: 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:265 calendar/gui/e-day-view.c:1186
-#: calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: 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:269 calendar/gui/e-day-view.c:1199
-#: calendar/gui/e-week-view-main-item.c:348
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#. 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
+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
+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
 msgid "New appointment..."
 msgstr "Nov zmenek..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: 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
 msgid "Edit this appointment..."
 msgstr "Uredi ta zmenek..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
-#: ui/evolution-event-editor.h:14
+#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Zbriši ta zmenek"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
 msgid "Make this appointment movable"
 msgstr "Naredi zmenek prestavljiv"
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
 msgid "Delete this occurrence"
 msgstr "Zbriši to pojavitev"
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
 msgid "Delete all occurrences"
 msgstr "Zbriši vse pojavitve"
 
+#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
+#: calendar/gui/e-tasks.c:492
+msgid "All"
+msgstr "Vse"
+
+#: calendar/gui/e-tasks.c:146
+msgid "Category:"
+msgstr "Categorija:"
+
+#: calendar/gui/e-tasks.c:285
+msgid "Could not load the tasks in `%s'"
+msgstr "Nisem mogel naložiti poslov v `%s'"
+
+#: calendar/gui/e-tasks.c:297
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Postopek potreben za naložitev `%s' ni podprt"
+
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:338
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:297
-msgid "Edit Appointment"
-msgstr "Uredi zmenek"
-
-#: calendar/gui/event-editor.c:342
-msgid "on"
-msgstr "na"
-
-#: calendar/gui/event-editor.c:470
-msgid "ocurrences"
-msgstr "pojavitve"
-
-#: calendar/gui/event-editor.c:2399 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#. todo
 #.
-#. get the apply button to work right
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
-msgstr "dialog-urejevalec-dogodkov"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:56
-msgid "Su_mmary:"
-msgstr "_Povzetek:"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-msgstr "Čas"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "_Start time:"
-msgstr "_Čas pričetka:"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "_End time:"
-msgstr "_Čas konca"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
+#: po/tmp/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "_Celodnevni dogodek"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "Uvrstitev"
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr "Osnove zmenkov"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
-msgstr "_Javno"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Custom recurrence"
+msgstr "Ponovitev po meri"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "Pri_vatno"
+#: po/tmp/event-editor-dialog.glade.h:12
+msgid "Days"
+msgstr "Dni"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
-msgstr "_Zaupno"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Every"
+msgstr "Vsak"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minut"
+#: po/tmp/event-editor-dialog.glade.h:15
+msgid "Exceptions"
+msgstr "Izjeme"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: po/tmp/event-editor-dialog.glade.h:17
 msgid "Hours"
 msgstr "Ur"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Days"
-msgstr "Dni"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Mail _to:"
+msgstr "Pošlji pošto _za:"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Display"
-msgstr "_Prikaz"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Minutes"
+msgstr "Minut"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Program"
-msgstr "_Program"
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "Modify"
+msgstr "Spremeni"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Mail"
-msgstr "_Pošlji pošto"
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "No recurrence"
+msgstr "Ni ponovitev"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "Mail _to:"
-msgstr "Pošlji pošto _za:"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Preview"
+msgstr "Predogled"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Run program:"
-msgstr "_Poženi program:"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pri_vate"
+msgstr "Pri_vatno"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "_Zvok"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Pu_blic"
+msgstr "_Javno"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence"
+msgstr "Ponovitev"
+
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Recurrence Rule"
+msgstr "Pravilo ponovitev"
+
+#: po/tmp/event-editor-dialog.glade.h:27
 msgid "Reminder"
 msgstr "Opozorilo"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Recur on the"
-msgstr "Ponovitev na"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Simple recurrence"
+msgstr "Enostavna ponovitev"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "th day of the month"
-msgstr "dan v mesecu"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Su_mmary:"
+msgstr "_Povzetek:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 calendar/gui/print.c:288
-msgid "1st"
-msgstr "1."
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "Time"
+msgstr "Čas"
 
-#: calendar/gui/event-editor-dialog.glade.h:41 calendar/gui/print.c:288
-msgid "2nd"
-msgstr "2."
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Audio"
+msgstr "_Zvok"
 
-#: calendar/gui/event-editor-dialog.glade.h:42 calendar/gui/print.c:288
-msgid "3rd"
-msgstr "3."
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Confidential"
+msgstr "_Zaupno"
 
-#: calendar/gui/event-editor-dialog.glade.h:43 calendar/gui/print.c:288
-msgid "4th"
-msgstr "4."
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_Contacts"
+msgstr "_Stiki"
 
-#: calendar/gui/event-editor-dialog.glade.h:44 calendar/gui/print.c:288
-msgid "5th"
-msgstr "5."
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Display"
+msgstr "_Prikaz"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Every"
-msgstr "Vsak"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_End time:"
+msgstr "_Čas konca"
 
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid "month(s)"
-msgstr "mesec"
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Mail"
+msgstr "_Pošlji pošto"
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Recurrence"
-msgstr "Ponovitev"
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Program"
+msgstr "_Program"
 
-#: calendar/gui/event-editor-dialog.glade.h:55
-msgid "Appointment Basics"
-msgstr "Osnove zmenkov"
+#: po/tmp/event-editor-dialog.glade.h:38
+msgid "_Run program:"
+msgstr "_Poženi program:"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "_Start time:"
+msgstr "_Čas pričetka:"
+
+#: po/tmp/event-editor-dialog.glade.h:40
 msgid "_Starting date:"
 msgstr "Datum _pričetka:"
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-msgid "Recurrence Rule"
-msgstr "Pravilo ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:59
-msgid "No recurrence"
-msgstr "Ni ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:60
-msgid "Simple recurrence"
-msgstr "Enostavna ponovitev"
-
-#: calendar/gui/event-editor-dialog.glade.h:61
-msgid "Custom recurrence"
-msgstr "Ponovitev po meri"
-
-#: calendar/gui/event-editor-dialog.glade.h:63
+#: po/tmp/event-editor-dialog.glade.h:41
 msgid "day(s)"
 msgstr "dni"
 
-#: calendar/gui/event-editor-dialog.glade.h:64
-msgid "week(s)"
-msgstr "tednov"
-
-#: calendar/gui/event-editor-dialog.glade.h:66
-msgid "year(s)"
-msgstr "let"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "event-editor-dialog"
+msgstr "dialog-urejevalec-dogodkov"
 
-#: calendar/gui/event-editor-dialog.glade.h:67
+#: po/tmp/event-editor-dialog.glade.h:43
 msgid "for"
 msgstr "za"
 
-#: calendar/gui/event-editor-dialog.glade.h:68
-msgid "until"
-msgstr "do"
-
-#: calendar/gui/event-editor-dialog.glade.h:69
+#: po/tmp/event-editor-dialog.glade.h:44
 msgid "forever"
 msgstr "vseskozi"
 
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid "Exceptions"
-msgstr "Izjeme"
-
-#: calendar/gui/event-editor-dialog.glade.h:72
-msgid "Modify"
-msgstr "Spremeni"
-
-#: calendar/gui/event-editor-dialog.glade.h:74
+#: po/tmp/event-editor-dialog.glade.h:45
 msgid "label21"
 msgstr "označba21"
 
-#: calendar/gui/event-editor-dialog.glade.h:75
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution.\n"
-"\n"
-"However, the appointment will recur at the appropriate time and will be "
-"displayed properly in the calendar views."
-msgstr ""
-"Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana znotraj "
-"Evolucije.\n"
-"\n"
-"Vendar se bo zmenek ponovil pravočasno in bo  pravilno prikazan v pogledu "
-"koledarja."
-
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "januar"
-
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "februar"
-
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "marec"
-
-#: calendar/gui/getdate.y:394
-msgid "april"
-msgstr "april"
-
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "maj"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "junij"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "julij"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
-msgstr "avgust"
-
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "september"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "sept"
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "oktober"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "november"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
-msgstr "december"
-
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "nedelja"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "ponedeljek"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "torek"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "tor"
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "sreda"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "sre"
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "četrtek"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "čet"
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "čet"
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "petek"
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "month(s)"
+msgstr "mesec"
 
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "sobota"
+#: po/tmp/event-editor-dialog.glade.h:47
+msgid "until"
+msgstr "do"
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "leto"
+#: po/tmp/event-editor-dialog.glade.h:48
+msgid "week(s)"
+msgstr "tednov"
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "mesec"
+#: po/tmp/event-editor-dialog.glade.h:49
+msgid "year(s)"
+msgstr "let"
 
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "štirinajst dni"
+#: calendar/gui/event-editor.c:331
+msgid "Edit Appointment"
+msgstr "Uredi zmenek"
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "teden"
+#: calendar/gui/event-editor.c:409
+msgid "on"
+msgstr "na"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "ura"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuta"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "min"
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekunda"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "sek"
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "jutri"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "včeraj"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "danes"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "sedaj"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr "zadnji"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr "ta"
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr "naslednji"
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "prvi"
+#: calendar/gui/event-editor.c:561
+msgid "on the"
+msgstr "na"
 
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "tretji"
+#: calendar/gui/event-editor.c:568
+msgid "th"
+msgstr "4."
 
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "četrti"
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr "pojavitve"
 
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "peti"
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Ta zmenek vsebuje pojavitve, ki jih Evolucija ne zna urejati."
 
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "šesti"
+#: calendar/gui/event-editor.c:3091 calendar/gui/print.c:1090
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
 
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "sedmi"
+#: calendar/gui/gnome-cal.c:696
+msgid "Could not open the folder in `%s'"
+msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "osmi"
+#: calendar/gui/gnome-cal.c:707
+msgid "The method required to open `%s' is not supported"
+msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "deveti"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/goto-dialog.glade.h:6
+msgid "April"
+msgstr "april"
 
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "deseti"
+#: po/tmp/goto-dialog.glade.h:7
+msgid "August"
+msgstr "avgust"
 
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "enajsti"
+#: po/tmp/goto-dialog.glade.h:8
+msgid "December"
+msgstr "december"
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "dvanajsti"
+#: po/tmp/goto-dialog.glade.h:9
+msgid "February"
+msgstr "februar"
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr "nazaj"
+#: po/tmp/goto-dialog.glade.h:10
+msgid "Go To Date"
+msgstr "Pojdi na datum"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr "Ustvari predmet za-opravit"
+#: po/tmp/goto-dialog.glade.h:11
+msgid "Go To Today"
+msgstr "Pojdi na danes"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr "Uredi predemet za-opravit"
+#: po/tmp/goto-dialog.glade.h:12
+msgid "January"
+msgstr "januar"
 
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "Povzetek:"
+#: po/tmp/goto-dialog.glade.h:13
+msgid "July"
+msgstr "julij"
 
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "Do datuma:"
+#: po/tmp/goto-dialog.glade.h:14
+msgid "June"
+msgstr "junij"
 
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "Prioriteta:"
+#: po/tmp/goto-dialog.glade.h:15
+msgid "March"
+msgstr "marec"
 
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr "Komentarji predmeta:"
+#: po/tmp/goto-dialog.glade.h:16
+msgid "May"
+msgstr "maj"
 
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
-msgid "Reminder of your appointment at "
-msgstr "Opomin na zmenek ob "
+#: po/tmp/goto-dialog.glade.h:17
+msgid "November"
+msgstr "november"
 
-#: calendar/gui/gnome-cal.c:1144
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Nisem mogel naložiti koledarja v `%s'"
+#: po/tmp/goto-dialog.glade.h:18
+msgid "October"
+msgstr "oktober"
 
-#: calendar/gui/gnome-cal.c:1155
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Nisem mogel ustvariti koledarja v `%s'"
+#: po/tmp/goto-dialog.glade.h:19
+msgid "September"
+msgstr "september"
 
-#: calendar/gui/gnome-cal.c:1166
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoda potrebna za naložitev `%s' ni podprta"
+#: calendar/gui/main.c:50
+msgid "Could not initialize GNOME"
+msgstr "Nisem mogel inicializirati GNOMEa"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
-#: mail/mail-search-dialogue.c:101
-msgid "Ok"
-msgstr "V redu"
+#: calendar/gui/print.c:293
+msgid "1st"
+msgstr "1."
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Leto:"
+#: calendar/gui/print.c:293
+msgid "2nd"
+msgstr "2."
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "Pojdi na datum"
+#: calendar/gui/print.c:293
+msgid "3rd"
+msgstr "3."
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Prosim izberite datum na katerega hočete iti.\n"
-"Ko klikente na dan boste samodejno šli\n"
-"na ta datum."
+#: calendar/gui/print.c:293
+msgid "4th"
+msgstr "4."
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "Pojdi na danes"
+#: calendar/gui/print.c:293
+msgid "5th"
+msgstr "5."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "če"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "so"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Naloge"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "Trenuten dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Trenutni teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Trenutni mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Trenutno leto (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Natisni _koledar"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:834
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1092
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "Prikaz časa"
+#: calendar/gui/tasks-control.c:105
+msgid "The URI of the tasks folder to display"
+msgstr "URI mape poslov, ki naj se kaže"
 
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "Oblika izpisa časa"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12 urna (dop./pop.)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24 urna"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "Tedni se začnejo v"
+#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+msgid "SMTWTFS"
+msgstr "PTSČPSN"
 
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "Razpon dni"
+#. 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
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Nisem mogel ustvariti ključavnične datoteke za %s: %s"
 
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
-"Prosim izberite ure začetka in konca dneva, ki naj\n"
-"bodo prikazane v dnevnem in tedenskem pogledu.\n"
-"Časi izven tega razpona ne bodo samodejno prikazani"
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr "Začetek dneva:"
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr "Konec dneva:"
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "Barve za prikaz"
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr "Pokaži v seznamu za-opravit:"
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr "Slog seznama za-opravit:"
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr "Osvetli pretečene predmete"
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr "Osvetli še nepretečene predmete"
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr "Osvetli predmete z današnjim rokom"
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr "Lastnosti seznama Za-opravit"
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr "Seznam Za-opravit"
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Nastavitve"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarmi"
-
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "Lastnosti alarma"
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr "Piskaj ob zaslonskih alarmih"
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "Zvočni alarmi pretečejo po"
-
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " sekundah"
-
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr "Omogoči podaljšanje spanja za "
+"Časovna omejitev je pretekla ob pridobivanju ključavnice na %s. Poskusi "
+"znova kasneje."
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:326 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "PTSČPSN"
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
 
-#: calendar/gui/weekday-picker.c:328 calendar/gui/weekday-picker.c:418
-msgid "SMTWTFS"
-msgstr "PTSČPSN"
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
 
-#: camel/camel-movemail.c:96
+#: camel/camel-movemail.c:99
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nisem mogel preverti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Nisem mogel ustvariti ključavnične datoteke za %s: %s"
-
-#: camel/camel-movemail.c:143
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisem mogel odpreti poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nisem mogel odpreti začasne poštne datoteke %s: %s"
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:197
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "Nisem mogel preveriti ključavnične datoteke %s: %s"
 
-#: camel/camel-movemail.c:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Časovna omejitev je pretekla ob pridobivanju ključavnice na %s. Poskusi "
-"znova kasneje."
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Napaka ob branju poštne datoteke: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
-msgstr "Napak ob pisanju v začasno poštno datoteko: %s"
+msgstr "Napaka ob pisanju v začasno poštno datoteko: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
@@ -2859,56 +3540,67 @@ 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:182
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "strežnik %s %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "storitev %s za %s na %s"
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:318
+msgid "Connection cancelled"
+msgstr "Povezava prekinjena"
+
+#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
+#: 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:228
+#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
 msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
-#: camel/camel-service.c:120
+#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
+#: camel/camel-remote-store.c:556
+#: camel/providers/imap/camel-imap-command.c:289
+msgid "Operation cancelled"
+msgstr "Operacija razveljavljena"
+
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabniškega imena"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr "Ni takšnega gostitelja %s."
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Trenutno ne morem poizvedeti po gostitelju %s."
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:299
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:359
+#: camel/camel-session.c:390
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2917,51 +3609,66 @@ msgstr ""
 "Ne morem ustvariti imenika %s:\n"
 "%s"
 
-#: camel/camel-url.c:77
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL niz '%s' ne vsebuje protokola"
 
-#: camel/camel-url.c:92
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL niz '%s' vsebuje neveljaven protokol"
 
-#: camel/camel-url.c:153
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Številka vrat v URL '%s' ni numerična"
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-auth.c:133
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr "Nisem mogel dobiti Kerberos vstopniice:\n%s"
+
+#: camel/providers/imap/camel-imap-auth.c:205
+msgid "Bad authentication response from server."
+msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
+
+#: camel/providers/imap/camel-imap-command.c:234
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:242
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:297
+msgid "Server response ended too soon."
+msgstr "Odgovor strežnika se je prehitro končal."
+
+#: camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "odgovor IMAP strežnika ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:469
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nepričakovan OK odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:198
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel naložiti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:697
+#: camel/providers/imap/camel-imap-folder.c:859
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporočila v FETCH odgovoru."
 
@@ -2973,32 +3680,26 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za branje in hranjenje pošte na IMAP strežnikih."
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "Geslo"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:251
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Ta možnost se bo povezala z IMAP strežnikom z nešifriranim geslom."
+msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:260
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:262
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
-"Ta možnost se bo povezala z IMAP strežnikom s Kerberos 4 avtentifikacijo."
+"Ta možnost narekuje povezavo s strežnikom IMAP s Kerberos 4 avtentifikacijo."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:361
 #, 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:359
+#: camel/providers/imap/camel-imap-store.c:389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3009,55 +3710,187 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:645
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "Nisem mogel ustvariti povzetka"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "MH-format mail directories"
+msgstr "Poštni imeniki tipa MH"
 
-#: camel/providers/mbox/camel-mbox-folder.c:389
-#: camel/providers/mbox/camel-mbox-folder.c:392
-#, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Ne morem pripeti sporočila mbox datoteki: %s"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "Za shranjevanje krajevne pošte v imenikih tipa MH"
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "Standard Unix mailbox file"
+msgstr "Običajna Unix datoteka poštnega predala"
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr "Za shranjevanje krajevne pošte v datoteki tipa mbox"
 
-#: camel/providers/mbox/camel-mbox-folder.c:496
+#: camel/providers/local/camel-local-provider.c:58
+msgid "Qmail maildir-format mail files"
+msgstr "Poštne datoteke tipa Qmail"
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr "Za shranjevanje krajevne pošte v imenikih tipa qmail"
+
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Ne morem dobiti sporočila: %s"
+msgid "Store root %s is not an absolute path"
+msgstr "Korenski imenik shrambe %s ni absolutna pot"
+
+#: camel/providers/local/camel-local-store.c:129
+msgid "Store root %s is not a regular directory"
+msgstr "Korenski imenik shrambe %s ni običajnen imenik."
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX mbox-oblikovane poštne datoteke"
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+msgid "Cannot get folder: %s: %s"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr "Krajevno hranjenje nima korenske mape"
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr "Krajevno hranjenje nima privzete mape"
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr "Krajevnih map ni mogoče gnezditi."
+
+#: camel/providers/local/camel-local-store.c:200
+msgid "Local mail file %s"
+msgstr "Krajevna datoteka s pošto %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:256
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Nisem mogel preimenovati mape %s v %s: %s"
+
+#: camel/providers/local/camel-local-store.c:297
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
+
+#: camel/providers/local/camel-local-store.c:306
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "Ne morem dodati sporočila v mapo tipa maildir: %s: %s"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
+#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
-"Za branje pošte dostavljene na krajevni sistem in za shranjevanje pošte na "
-"krajevni disk."
+"Ne morem dobiti sporočila: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:317
+#: camel/providers/local/camel-mh-folder.c:183
+msgid "No such message"
+msgstr "Ni takšnega sporočila"
+
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
+msgid "Invalid message contents"
+msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Ne morem odpreti datoteke '%s':\n"
+"Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/mbox/camel-mbox-store.c:134
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Nisem mogel ustvariti mape `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' ni imenik tipa maildir."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Nisem mogel zbrisati mape `%s': %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr "ni imenik tipa maildir"
+
+#: camel/providers/local/camel-mbox-folder.c:201
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:257
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "Ne morem pripeti sporočila k datoteki tipa mbox: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Ne morem dobiti sporočila: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:366
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "Zdi se, da je mapa poškodovana in je ni mogoče popraviti."
+
+#: camel/providers/local/camel-mbox-folder.c:379
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Ne morem odpreti datoteke '%s':\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3066,14 +3899,14 @@ msgstr ""
 "Nisem mogel ustvariti datoteke `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ni običajna datoteka."
 
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3082,151 +3915,81 @@ msgstr ""
 "Nisem mogel zbrisati mape `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "Nisem mogel preimenovati mape %s v %s: cilj že obstaja"
+#: camel/providers/local/camel-mbox-summary.c:234
+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/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Mbox map ni mogoče gnezditi."
-
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Local mail file %s"
-msgstr "Krajevna datoteka s pošto %s"
+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/mbox/camel-mbox-summary.c:667
-#, c-format
-msgid "Could not open summary %s"
-msgstr "Nisem mogel odpreti povzetka %s"
+#: camel/providers/local/camel-mbox-summary.c:343
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Ne morem narediti povzetka mape %s: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Nisem mogel odpreti mape za izdelavo povzetka %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:688
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
-msgstr "Povzetek se ne ujema, prekinjam sinhronizacijo"
-
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "Povzetek se ne ujema, X-Evolution glava manjka"
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Povzetek se ne ujema z mapo, celo po uskladitvi"
 
-#: camel/providers/mbox/camel-mbox-summary.c:776
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Napaka ob pisanju v začasni poštni predal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
-#, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Ne morem kopirati podatkov v izhodno datoteko: %s"
+#: camel/providers/local/camel-mbox-summary.c:582
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:832
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:841
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti začasne mape: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:849
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:861
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "Nisem mogel naložiti ali ustvariti povzetka"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
-msgstr "Ne morem dodati sporočila v mh mapo: %s"
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "Ne morem dodati sporočila v mapo tipa mh: %s: %s"
 
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Ne morem dobiti sporočila: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "UNIX MH-oblika poštnih imenikov"
-
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Za shranjevanje krajevne pošte v poštnih imenikih enakih MH-jevim"
-
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti imenika `%s':\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:127
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel ustvariti mape `%s':\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:136
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ni imenik."
 
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Nisem mogel zbrisati mape `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Nisem mogel preimenovati mape `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Nisem mogel preimenovati mape `%s': %s že obstaja"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "MH mape ne morejo biti gnezdene"
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Krajevni poštni imenik %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3244,7 +4007,7 @@ msgstr "Nisem uspel poslati uporabniškega imena strežniku"
 msgid "Server rejected username/password"
 msgstr "Strežnik je zavrnil uporabniško ime/geslo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Sporočilo %s ni bilo najdeno."
@@ -3289,22 +4052,22 @@ msgid ""
 msgstr ""
 "Ta možnost se bo avtentificirala pri strežniku NNTP z nešifriranim geslom."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 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:177
+#: camel/providers/pop3/camel-pop3-folder.c:180
 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:271
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporočila z uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nisem uspel prenesti sporočila z POP strežnika %s: %s"
@@ -3322,32 +4085,32 @@ msgstr ""
 "prenašanje pošte iz nekaterih spletnih nuditeljev pošte in zaprtih sistemov "
 "e-pošte"
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"Ta možnost se bo povezala s strežnikom POP z nešifriranim geslom. To je v "
+"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:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 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 "
 "claim to support it."
 msgstr ""
-"Ta možnost se bo povezala s strežnikom POP z uporabo šifriranega gesla preko "
+"Ta možnost narekuje povezavo s strežnikom POP z uporabo šifriranega gesla 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:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 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:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nisem se mogel avtentificirati do strežnika KPOP: %s"
@@ -3357,12 +4120,12 @@ msgstr "Nisem se mogel avtentificirati do strežnika KPOP: %s"
 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:389
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, 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:408
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3371,12 +4134,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:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(Neznana)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:424
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3384,7 +4147,7 @@ msgstr ""
 "Ne morem se povezati s strežnikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3393,12 +4156,13 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, 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:61
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -3448,11 +4212,208 @@ 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:57
+msgid "SMTP"
+msgstr "SMTP"
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
+"SMTP.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:141
+msgid "Syntax error, command unrecognized"
+msgstr "Sintaktična napaka, ukaz ni prepoznan"
+
+#: camel/providers/smtp/camel-smtp-transport.c:143
+msgid "Syntax error in parameters or arguments"
+msgstr "Sintaktična napaka v parametrih ali argumentih"
+
+#: camel/providers/smtp/camel-smtp-transport.c:145
+msgid "Command not implemented"
+msgstr "Ukaz ni implementiran"
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
+msgid "Command parameter not implemented"
+msgstr "Parameter ukaza ni implementiran"
+
+#: camel/providers/smtp/camel-smtp-transport.c:149
+msgid "System status, or system help reply"
+msgstr "Stanje sistema ali odgvor na pomoč"
+
+#: camel/providers/smtp/camel-smtp-transport.c:151
+msgid "Help message"
+msgstr "Sporčilo pomoči"
+
+#: camel/providers/smtp/camel-smtp-transport.c:153
+msgid "Service ready"
+msgstr "Storitev pripravljena"
+
+#: camel/providers/smtp/camel-smtp-transport.c:155
+msgid "Service closing transmission channel"
+msgstr "Storitev zapira kanal za prenos"
+
+#: camel/providers/smtp/camel-smtp-transport.c:157
+msgid "Service not available, closing transmission channel"
+msgstr "Storitev ni na voljo, zapiram kanal za prenos"
+
+#: camel/providers/smtp/camel-smtp-transport.c:159
+msgid "Requested mail action okay, completed"
+msgstr "Zahtevano dejanje v redu, opravljeno"
+
+#: camel/providers/smtp/camel-smtp-transport.c:161
+msgid "User not local; will forward to <forward-path>"
+msgstr "Uporabnik ni krajeven; bom posredoval na <forward-path>"
+
+#: camel/providers/smtp/camel-smtp-transport.c:163
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr "Zahtevano poštno dejanje ni bilo izvedeno: poštni predal ni na voljo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:165
+msgid "Requested action not taken: mailbox unavailable"
+msgstr "Zahtevano dejanje ni bilo izvedeno: poštni predal ni na voljo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "Requested action aborted: error in processing"
+msgstr "Zahtevano dejanje preklicano: napaka ob obdelavi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "User not local; please try <forward-path>"
+msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "Requested action not taken: insufficient system storage"
+msgstr "Zahtevano dejanje ni bilo izvedeno: premalo prostora na disku"
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr "Zahtevano dejanje preklicano: prekoračena obremenitev diska"
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr "Zahtevano dejanje ni bilo izvedeno: ime poštnega predala ni dovoljeno"
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr "Začni z vpisom pošte; končaj z <ENTER>.<ENTER>"
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Transaction failed"
+msgstr "Transakcija ni uspela"
+
+#: camel/providers/smtp/camel-smtp-transport.c:243
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr "Napaka pri pozdravu: %s: morda ni usodna"
+
+#: camel/providers/smtp/camel-smtp-transport.c:337
+msgid "No authentication required"
+msgstr "Avtentifikacija ni potrebna"
+
+#: camel/providers/smtp/camel-smtp-transport.c:339
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
 msgstr ""
-"Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
-"SMTP"
+"Ta možnost narekuje povezavo s strežnikom SMTP brez uporabe avtentifikacije. "
+"To bi moralo biti v redu za povezavo z večino strežniki SMTP"
+
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:353
+#: po/tmp/mail-config.glade.h:15
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/providers/smtp/camel-smtp-transport.c:350
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+"Ta možnost narekuje povezavo s strežnikom SMTP z CRAM-MD5 avtentifikacijo."
+
+#: camel/providers/smtp/camel-smtp-transport.c:378
+msgid "SMTP server %s"
+msgstr "Strežnik SMTP %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "SMTP mail delivery via %s"
+msgstr "Dostava pošte z SMTP preko %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:405
+msgid "Cannot send message: sender address not defined."
+msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni naveden."
+
+#: camel/providers/smtp/camel-smtp-transport.c:412
+msgid "Cannot send message: sender address not valid."
+msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni veljaven."
+
+#: camel/providers/smtp/camel-smtp-transport.c:426
+msgid "Cannot send message: no recipients defined."
+msgstr "Ne morem pripeti sporočila mbox datoteki: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:520
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr "Zahtevek HELO je prekoračil časovno omejitev: %s: ni usodno"
+
+#: camel/providers/smtp/camel-smtp-transport.c:539
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr "Napaka v odgovoru na HELO: %s: ni usodno"
+
+#: camel/providers/smtp/camel-smtp-transport.c:578
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr "Zahtevek MAIL FROM je prekoračil časovno omejitev: %s: pošta ni bila poslana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:597
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr "Napaka v ogovoru na MAIL FROM: %s: pošta ni bila poslana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:622
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr "Zahtevek RCPT TO je prekoračil časovno omejitev: %s: pošta ni bila poslana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:641
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "Napaka v ogovoru na RCPT TO: %s: pošta ni bila poslana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:672
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "Zahtevek DATA je prekoračil časovno omejitev: %s: pošta ni bila poslana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:691
+msgid "DATA response error: %s: mail not sent"
+msgstr "Napaka v ogovoru na DATA: %s: pošta ni bila poslana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:724
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr "Zahtevek DATA je prekoračil časovno omejitev: konec sporočila: %s: pošta ni bila poslana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:743
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr "Napaka v ogovoru na DATA: konec sporočila: %s: pošta ni bila poslana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:767
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:786
+msgid "RSET response error: %s"
+msgstr "Napaka v odgovoru na RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:809
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr "Zahtevek QUIT je prekoračil časovno omejitev: %s: ni usodno"
+
+#: camel/providers/smtp/camel-smtp-transport.c:828
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
+msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
 
 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
@@ -3462,108 +4423,119 @@ msgstr "Nuditelj virutalne mape e-pošte"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za branje pošte kot poizvedbe po drugem sklopu map"
 
-#: composer/e-msg-composer-attachment-bar.c:86
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:88
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtov"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:300 mail/mail-display.c:116
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:396
+#: composer/e-msg-composer-attachment-bar.c:413
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Priloži datoteko"
 
-#: composer/e-msg-composer-attachment-bar.c:443 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Odstrani"
 
-#: composer/e-msg-composer-attachment-bar.c:444
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: mail/message-list.c:1109 po/tmp/e-msg-composer-attachment.glade.h:6
+msgid "Attachment"
+msgstr "Priloga"
+
+#: po/tmp/e-msg-composer-attachment.glade.h:7
 msgid "Attachment properties"
 msgstr "Lastnosti priloge"
 
-#: composer/e-msg-composer-attachment.glade.h:8
+#: po/tmp/e-msg-composer-attachment.glade.h:9
+msgid "File name:"
+msgstr "Ime datoteke:"
+
+#: po/tmp/e-msg-composer-attachment.glade.h:10
+msgid "Inline attachment"
+msgstr "Priloga kot del sporočila"
+
+#: po/tmp/e-msg-composer-attachment.glade.h:11
 msgid "MIME type:"
 msgstr "MIME tip:"
 
-#: composer/e-msg-composer-attachment.glade.h:10
-msgid "File name:"
-msgstr "Ime datoteke:"
+#: po/tmp/e-msg-composer-attachment.glade.h:12
+msgid "Send as:"
+msgstr "Pošlji kot:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
-#: mail/mail-format.c:589
+#: composer/e-msg-composer-hdrs.c:148 composer/e-msg-composer-hdrs.c:353
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "Od:"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:297
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:354
 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:300 mail/mail-format.c:602
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:628
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:359
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: composer/e-msg-composer-hdrs.c:305 mail/mail-format.c:609
+#: composer/e-msg-composer-hdrs.c:363 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:364
 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:311
+#: composer/e-msg-composer-hdrs.c:369
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:370
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3571,15 +4543,15 @@ 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:318 mail/mail-format.c:614
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the subject of the mail"
 msgstr "Vnesite zadevo spročila"
 
-#: composer/e-msg-composer.c:302
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3588,38 +4560,38 @@ msgstr ""
 "Nisem mogel odpreti datoteke s podpisom %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:458
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:469
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
-msgstr "Napak ob shranjevanju datoteke: %s"
+msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:489
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:511
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "Shranjujem spremembe sporočila..."
 
-#: composer/e-msg-composer.c:513
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "Shranjujem spremembe sporočila..."
 
-#: composer/e-msg-composer.c:554
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Napaka ob shranjevanju kompozicije v 'Osnutki': %s"
 
-#: composer/e-msg-composer.c:598 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
 msgid "Evolution"
-msgstr "Evolution"
+msgstr "Evolucija"
 
-#: composer/e-msg-composer.c:604
+#: composer/e-msg-composer.c:758
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3629,27 +4601,27 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:783
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:752
+#: composer/e-msg-composer.c:909
 msgid "That file does not exist."
 msgstr "Datoteka ne obstaja."
 
-#: composer/e-msg-composer.c:762
+#: composer/e-msg-composer.c:919
 msgid "That is not a regular file."
 msgstr "To ni običajna datoteka."
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:929
 msgid "That file exists but is not readable."
 msgstr "Ta datoteka obstaja a ni berljiva."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:939
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Datoteka se je zdela dostopna a open(2) ni uspel."
 
-#: composer/e-msg-composer.c:804
+#: composer/e-msg-composer.c:961
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3657,31 +4629,43 @@ msgstr ""
 "Datoteka je zelo velika (čez 100K).\n"
 "Ste prepričani,da jo želite vstaviti?"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:982
 msgid "An error occurred while reading the file."
 msgstr "Ob branju datoteke se je zgodila napaka."
 
-#: composer/e-msg-composer.c:1197
+#: composer/e-msg-composer.c:1158 composer/e-msg-composer.c:1379
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1458
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:346
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne morem inicializirati Evolucijinega skladatelja."
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "leto"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "let"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "mesec"
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "mesecev"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "teden"
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "tedenov"
 
@@ -3690,14 +4674,26 @@ msgid "days"
 msgstr "dni"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "ura"
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "ur"
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "minuta"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minut"
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr "sekunda"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr " sekund"
 
@@ -3755,12 +4751,16 @@ msgstr "čas, relatievn trenutnemu"
 msgid "Compare against"
 msgstr "Primerjaj z"
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "sedaj"
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:338
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
@@ -3768,25 +4768,29 @@ msgstr "Filtru dodaj pravilo"
 msgid "Edit Filter Rule"
 msgstr "Uredi pravilo filtra"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:456 filter/filter.glade.h:7
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr "dohodna"
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr "odhodna"
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Uredi filtre"
 
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:403
 msgid "Then"
 msgstr "Potem"
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:416
 msgid "Add action"
 msgstr "Dodaj dejanje"
 
-#: filter/filter-filter.c:420
+#: filter/filter-filter.c:422
 msgid "Remove action"
 msgstr "Odstrani dejanje"
 
@@ -3798,19 +4802,19 @@ msgstr ""
 "Opa, pozabili ste izbrati mapo.\n"
 "Prosim pojdite nazaj in navedite veljavno mapo kamor naj se pošta dostavi."
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Vnesite URI mape"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3819,250 +4823,252 @@ msgstr ""
 "Napaka v regularnem izrazu '%s':\n"
 "%s"
 
-#: filter/filter-part.c:458
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr "Nisem uspel izvesti iskanja z regularnimi izrazi v glavah sporočil: %s"
+
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Preizkus"
 
-#: filter/filter-rule.c:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "Ime pravila: "
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Če"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "Izvrši dejanja"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "če je zadoščeno vsem pogojem"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "če je zaddoščeno kateremukoli pogoju"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "Odstrani pogoj"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-"Prihodna\n"
-"Odhodna\n"
+#: filter/filter-system-flag.c:63
+msgid "Replied to"
+msgstr "Odgovorjeno na"
 
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Pravila filtriranja"
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr "Pomembno"
 
-#: filter/filter.glade.h:13 filter/filter.glade.h:18
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Uredi"
+#: filter/filter-system-flag.c:67
+msgid "Read"
+msgstr "Beri"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Uredi vMape"
 
-#: filter/filter.glade.h:16
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr "Pravila filtriranja"
+
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr "Dohodna"
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr "Odhodna"
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Virtualne mape"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Viri vMap"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:511
-msgid "Answered"
-msgstr "Odgovorjeno"
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Pripiši barvo"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Pripiši točke"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "Zbrisano"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr "Osnutek"
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "Izraz"
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr "Označeno"
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr "Posreduj na naslove"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "Jedro sporočila"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
+msgid "Message Header"
+msgstr "Glava sporočila"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Sporočilo je bilo sprejeto"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Sporočilo je bilo poslano"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:15
 msgid "Recipients"
 msgstr "Prejemniki"
 
-#: filter/libfilter-i18n.h:20 mail/message-list.c:508
-msgid "Seen"
-msgstr "Videno"
+#: filter/libfilter-i18n.h:16
+msgid "Regex Match"
+msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1109
+msgid "Score"
+msgstr "Točke"
+
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:22
-msgid "Set Flag"
-msgstr "Postavi označbo"
+#: filter/libfilter-i18n.h:19
+msgid "Set Status"
+msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Vir"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+msgid "Status"
+msgstr "Stanje"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "po"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "pred"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "vsebuje"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "ne vsebuje"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "se ne konča z"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:33
-msgid "does not match regex"
-msgstr "ne ustreza z regularnemu izrazu"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "ne zveni kot"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "se ne začne z"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "se konča z"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "je večje"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "je manjše"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:42
-msgid "matches regex"
-msgstr "ustreza regularnemu izrazu"
-
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "na ali po"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "na ali pred"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "se začne z"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "je bilo po"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "je bilo pred"
 
@@ -4074,10 +5080,6 @@ msgstr "Dodaj pravilo"
 msgid "Edit Score Rule"
 msgstr "Uredi pravilo točk"
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "Točke"
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr "Dodaj pravilo vMape"
@@ -4086,145 +5088,189 @@ msgstr "Dodaj pravilo vMape"
 msgid "Edit VFolder Rule"
 msgstr "Uredi pravilo vMape"
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:284
 msgid "Cannot initialize Evolution's mail component."
-msgstr "Ne morem inicializirati Evolution komponente za pošto."
+msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Ne morem inicializirati Evolution komponente za povzemanje pošte."
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Ne morem inicializirati Evolution komponente za razpršeno shrambo."
-
-#: mail/component-factory.c:279
+#: mail/component-factory.c:320
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser.c:143
+#: mail/folder-browser.c:225
+msgid "Store search as vFolder"
+msgstr "Shrani iskanje kot vMapo"
+
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Telo ali zadeva vsebuje"
 
-#: mail/folder-browser.c:144
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Telo vsebuje"
 
-#: mail/folder-browser.c:145
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "Zadeva vsebuje"
 
-#: mail/folder-browser.c:146
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Telo ne vsebuje"
 
-#: mail/folder-browser.c:147
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
-#: mail/folder-browser.c:148
-msgid "Custom search"
-msgstr "Iskanje po meri"
+#: mail/folder-browser.c:645
+msgid "VFolder on Subject"
+msgstr "vMapa glede na Zadevo"
 
-#: mail/folder-browser.c:320
-msgid "Custom"
-msgstr "Po meri"
+#: mail/folder-browser.c:646
+msgid "VFolder on Sender"
+msgstr "vMapa glede na Pošiljatelja"
+
+#: mail/folder-browser.c:647
+msgid "VFolder on Recipients"
+msgstr "vMapa glede na Prejemnika"
 
-#: mail/folder-browser.c:478
-msgid "Open in New Window"
-msgstr "Odpri v novem oknu"
+#: mail/folder-browser.c:649
+msgid "Filter on Subject"
+msgstr "Filter glede na Zadevo"
 
-#: mail/folder-browser.c:479
-msgid "Edit Message"
-msgstr "Uredi sporočilo"
+#: mail/folder-browser.c:650
+msgid "Filter on Sender"
+msgstr "Filter glede na Pošiljatelja"
 
-#: mail/folder-browser.c:480 mail/mail-callbacks.c:794
-msgid "Print Message"
-msgstr "Natisni sporočilo"
+#: mail/folder-browser.c:651
+msgid "Filter on Recipients"
+msgstr "Filter glede na Prejemnike"
+
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
+msgid "Filter on Mailing List"
+msgstr "Filter glede na Poštni seznam"
+
+#: mail/folder-browser.c:658 po/tmp/evolution-message-composer.xml.h:15
+msgid "Open"
+msgstr "Odpri"
 
-#: mail/folder-browser.c:482
+#: mail/folder-browser.c:660
+msgid "Save As..."
+msgstr "Shrani kot..."
+
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:483 mail/mail-view.c:156 ui/evolution-mail.h:35
+#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: mail/folder-browser.c:484
-msgid "Forward Message"
-msgstr "Sporočilo posreduj naprej"
+#: mail/folder-browser.c:665 mail/mail-view.c:144
+#: po/tmp/evolution-mail.xml.h:18
+msgid "Forward"
+msgstr "Posreduj naprej"
+
+#: mail/folder-browser.c:666 po/tmp/evolution-mail.xml.h:19
+msgid "Forward inline"
+msgstr "Posreduj naprej kot del sporočila"
 
-#: mail/folder-browser.c:486
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "Označi kot prebrano"
 
-#: mail/folder-browser.c:487
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Označi kot neprebrano"
 
-#: mail/folder-browser.c:488
-msgid "Delete Message"
-msgstr "Zbriši sporčilo"
+#: mail/folder-browser.c:671
+msgid "Move to Folder..."
+msgstr "Prestavi v mapo..."
 
-#: mail/folder-browser.c:489
-msgid "Move Message"
-msgstr "Prestavi sporočilo"
+#: mail/folder-browser.c:672
+msgid "Copy to Folder..."
+msgstr "Kopiraj v mapo..."
 
-#: mail/folder-browser.c:490
-msgid "Copy Message"
-msgstr "Kopiraj sporočilo"
+#: mail/folder-browser.c:674
+msgid "Undelete"
+msgstr "Odbriši"
 
-#: mail/folder-browser.c:491
+#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
+#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:493
-msgid "VFolder on Subject"
-msgstr "vMapa glede na Zadevo"
+#: mail/folder-browser.c:680
+msgid "Create Rule From Message"
+msgstr "Iz sporočila ustvari pravilo"
 
-#: mail/folder-browser.c:494
-msgid "VFolder on Sender"
-msgstr "vMapa glede na Pošiljatelja"
+#: mail/folder-browser.c:768
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr "Filter glede na Poštni seznam (%s)"
 
-#: mail/folder-browser.c:495
-msgid "VFolder on Recipients"
-msgstr "vMapa glede na Prejemnika"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/local-config.glade.h:6
+msgid "Current store format:"
+msgstr "Trenutna oblika hranjenja:"
 
-#: mail/folder-browser.c:497
-msgid "Filter on Subject"
-msgstr "Filter glede na Zadevo"
+#: po/tmp/local-config.glade.h:7
+msgid "Mailbox Format"
+msgstr "Tip poštnega predala"
 
-#: mail/folder-browser.c:498
-msgid "Filter on Sender"
-msgstr "Filter glede na Pošiljatelja"
+#: po/tmp/local-config.glade.h:8
+msgid "New store format:"
+msgstr "Nova oblika hranjenja:"
 
-#: mail/folder-browser.c:499
-msgid "Filter on Recipients"
-msgstr "Filter glede na Prejemnike"
+#: po/tmp/local-config.glade.h:9
+msgid "Note: When converting between mailbox formats, a failure\n"
+msgstr "Opozorilo: Med pretvarjanjem med različnimi oblikami poštnih predalov\n"
 
-#: mail/folder-browser.c:500 mail/folder-browser.c:523
-msgid "Filter on Mailing List"
-msgstr "Filter glede na Poštni seznam"
+#: po/tmp/local-config.glade.h:10
+msgid "(such as lack of disk space) may not be automatically\n"
+msgstr "napaka (kot pomanjkanje diska) ni nujno samodejno\n"
 
-#: mail/folder-browser.c:525
-#, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filter glede na Poštni seznam (%s)"
+#: po/tmp/local-config.glade.h:11
+msgid "recoverable.  Please use this feature with care."
+msgstr "odpravljiva. Prosimo pazljivo uporabljajte to možnost."
 
-#: mail/folder-browser.c:641
-msgid "Full Search"
-msgstr "Polno iskanje"
+#: po/tmp/local-config.glade.h:12
+msgid "maildir"
+msgstr "maildir"
 
-#.
-#. *  This file is autogenerated from evolution-event-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: mail/folder-browser.c:646 ui/evolution-event-editor.h:9
-msgid "Save"
-msgstr "Shrani"
+#: po/tmp/local-config.glade.h:13
+msgid "mbox"
+msgstr "mbox"
+
+#: po/tmp/local-config.glade.h:14
+msgid "mh"
+msgstr "mh"
+
+#: mail/mail-accounts.c:115
+msgid " (default)"
+msgstr " (privzeto)"
+
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:347
+msgid "Evolution Account Manager"
+msgstr "Upravljalnik Evolucijinih računov"
+
+#: mail/mail-account-editor.c:274
+msgid ""
+"One or more of your servers are not configured correctly.\n"
+"Do you wish to save anyway?"
+msgstr ""
+"Eden ali več strežnikov ni pravilno nastavljenih.\n"
+"Vseeno shrani?"
+
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:634
+msgid "Evolution Account Editor"
+msgstr "Urejevalnik Evolucijinih računov"
 
 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4232,20 +5278,21 @@ msgid "Mail to %s"
 msgstr "Pošta za %s"
 
 #: mail/mail-autofilter.c:214
+#, c-format
 msgid "Subject is %s"
 msgstr "Zadeva je %s"
 
-#: mail/mail-autofilter.c:232
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:334
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "%s poštnih seznamov"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4257,7 +5304,7 @@ msgstr ""
 "ali skladate pošto.\n"
 "Bi ga želeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:136
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4265,7 +5312,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:148
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4273,19 +5320,15 @@ msgstr ""
 "Nastaviti morate način prenosa pošte\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
-msgid "You have no mail sources configured"
-msgstr "Nimate nastavljenih izvorov pošte"
-
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:223
 msgid "You have not set a mail transport method"
-msgstr "Niste nastavili metode prenašanja pošte"
+msgstr "Niste nastavili postopka prenašanja pošte"
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:232
 msgid "You have no Outbox configured"
 msgstr "Nimate nastavljenega Izhodnega poštnega predala"
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:279
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4293,19 +5336,27 @@ msgstr ""
 "To poročilo nima 'zadeve'.\n"
 "Resnično pošlji?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:345
+msgid "You must configure an account before you can send this email."
+msgstr "Nastaviti morate račun preden lahko pošljete to e-pošto"
+
+#: mail/mail-callbacks.c:365
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:533
+#: mail/mail-callbacks.c:594
+msgid "Forwarded message:\n"
+msgstr "Posredovano sporočilo:\n"
+
+#: mail/mail-callbacks.c:675
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:677
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:650
+#: mail/mail-callbacks.c:812
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4313,293 +5364,304 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:749
+#: mail/mail-callbacks.c:845 mail/mail-display.c:79
+msgid "Overwrite file?"
+msgstr "Prepiši datoteko?"
+
+#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Mapa z enakim imenom že obstaja.\n"
+"Naj jo prepišem?"
+
+#: mail/mail-callbacks.c:893
+msgid "Save Message As..."
+msgstr "Shrani sporočilo kot..."
+
+#: mail/mail-callbacks.c:895
+msgid "Save Messages As..."
+msgstr "Shrani sporočila kot..."
+
+#: mail/mail-callbacks.c:1003
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
-" %s"
+"%s"
+
+#: mail/mail-callbacks.c:1052
+msgid "Print Message"
+msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:841
+#: mail/mail-callbacks.c:1099
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-config-gui.c:432
-msgid ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organization, and the name of a file to "
-"read your signature from."
-msgstr ""
-"Vnesite svoje ime in e-poštni naslov, ki naj se uporablja v izhodni pošti Po "
-"želji lahko vnesete tudi ime vaše organizacije in ime datoteke iz katere naj "
-"se prebere vaš podpis."
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/mail-config.glade.h:6
+msgid "Account"
+msgstr "Račun"
 
-#: mail/mail-config-gui.c:445
-msgid "Full name:"
-msgstr "Polno ime:"
+#: po/tmp/mail-config.glade.h:7
+msgid "Account Information"
+msgstr "Podatki o računu"
 
-#: mail/mail-config-gui.c:469
-msgid "Email address:"
-msgstr "E-poštni naslov:"
+#: po/tmp/mail-config.glade.h:8
+msgid "Account Management"
+msgstr "Upravljanje z računom"
 
-#: mail/mail-config-gui.c:484
-msgid "Organization:"
-msgstr "Organizacija:"
+#: po/tmp/mail-config.glade.h:9
+msgid "Account Properties"
+msgstr "Lastnosti računa"
 
-#: mail/mail-config-gui.c:495
-msgid "Signature file:"
-msgstr "Datoteka s podpisom:"
+#: po/tmp/mail-config.glade.h:11
+msgid "Advanced"
+msgstr "Napredno"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
-msgid "Signature File"
-msgstr "Datoteka s podpisom"
+#: po/tmp/mail-config.glade.h:12
+msgid "Authentication"
+msgstr "Avtentifikacija"
 
-#: mail/mail-config-gui.c:906
-msgid "Server:"
-msgstr "Strežnik:"
+#: po/tmp/mail-config.glade.h:13
+msgid "Authentication Type:"
+msgstr "Način avtentifikacije:"
 
-#: mail/mail-config-gui.c:912
-msgid "Username:"
-msgstr "Uporabniško ime:"
+#: po/tmp/mail-config.glade.h:16
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr "Čestitamo, vaša nastavitev pošte je opravljena.\n"
 
-#: mail/mail-config-gui.c:918
-msgid "Path:"
-msgstr "Pot:"
+#: po/tmp/mail-config.glade.h:17 po/tmp/mail-config.glade.h:20
+#: po/tmp/mail-config.glade.h:76
+msgid "\n"
+msgstr "\n"
 
-#: mail/mail-config-gui.c:927
-msgid "Authentication:"
-msgstr "Avtentikacija:"
+#: po/tmp/mail-config.glade.h:18
+msgid "You are now ready to send and receive email \n"
+msgstr "Sedaj ste pripravljeni za sprejemanje e-pošte \n"
 
-#: mail/mail-config-gui.c:940
-msgid "Detect supported types..."
-msgstr "Ugotovi podprte tipe..."
+#: po/tmp/mail-config.glade.h:19
+msgid "using Evolution. \n"
+msgstr "z Evolucijo. \n"
 
-#: mail/mail-config-gui.c:967
-msgid "Don't delete messages from server"
-msgstr "Ne zbriši sporočil s strežnika"
+#: po/tmp/mail-config.glade.h:21
+msgid "Click \"Finish\" to save your settings."
+msgstr "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config-gui.c:979
-msgid "Test Settings"
-msgstr "Preveri nastavitve"
+#: po/tmp/mail-config.glade.h:22
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
 
-#: mail/mail-config-gui.c:1106
-msgid "Mail source type:"
-msgstr "Tip izvora pošte:"
+#: po/tmp/mail-config.glade.h:23
+msgid "Default"
+msgstr "Privzeto"
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-"Izberite vrsto poštnega strežnika, ki ga uporabljate, in nastavite zanj  "
-"potrebne podatke.\n"
-"\n"
-"Če strežnik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
-"podprte tipe...\" potem, ko boste vnesli ostale podatke."
+#: po/tmp/mail-config.glade.h:25
+msgid "Done"
+msgstr "Opravljeno"
 
-#: mail/mail-config-gui.c:1130
-msgid "News source type:"
-msgstr "Tip izvora novičk:"
+#: po/tmp/mail-config.glade.h:26
+msgid "E-Mail Address:"
+msgstr "E-poštni naslov:"
 
-#: mail/mail-config-gui.c:1135
-msgid ""
-"Select the kind of news server you have, and enter the relevant information "
-"about it.\n"
-"\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
-msgstr ""
-"Izberite vrsto poštnega strežnika, ki ga uporabljate, in nastavite zanj  "
-"potrebne podatke.\n"
-"\n"
-"Če strežnik potrebuje avtentikacijo, lako kliknete na gumb \"Ugotovi podprte "
-"tipe...\", po tem ko boste vnesli ostale podatke."
+#: po/tmp/mail-config.glade.h:28
+msgid "Email Address:"
+msgstr "E-poštni naslov:"
 
-#: mail/mail-config-gui.c:1154
-msgid "Mail transport type:"
-msgstr "Tip prenosa pošte:"
+#: po/tmp/mail-config.glade.h:29
+msgid "Evolution Mail Configuration"
+msgstr "Nastavitev Evolucijine pošte"
 
-#: mail/mail-config-gui.c:1209
-msgid "Add Identity"
-msgstr "Dodaj identiteto"
+#: po/tmp/mail-config.glade.h:30
+msgid "Full Name:"
+msgstr "Polno ime:"
 
-#: mail/mail-config-gui.c:1211
-msgid "Edit Identity"
-msgstr "Uredi identiteto"
+#: po/tmp/mail-config.glade.h:33
+msgid "Hostname:"
+msgstr "Ime gostitelja:"
 
-#: mail/mail-config-gui.c:1309
-msgid "Add Source"
-msgstr "Dodaj izvor"
+#: po/tmp/mail-config.glade.h:34
+msgid "Identity"
+msgstr "Identiteta"
 
-#: mail/mail-config-gui.c:1311
-msgid "Edit Source"
-msgstr "Uredi izbor"
+#: po/tmp/mail-config.glade.h:35
+msgid "Incoming Mail Server"
+msgstr "Strežnik dohodne pošte"
 
-#: mail/mail-config-gui.c:1406
-msgid "Add News Server"
-msgstr "Dodaj novičarski strežnik"
+#: po/tmp/mail-config.glade.h:36
+msgid "Keep mail on server"
+msgstr "Ohrani pošto na strežniku"
 
-#: mail/mail-config-gui.c:1408
-msgid "Edit News Server"
-msgstr "Uredi novičarski strežnik"
+#: po/tmp/mail-config.glade.h:37
+msgid "Kerberos"
+msgstr "Kerberos"
 
-#: mail/mail-config-gui.c:2232
-#, c-format
-msgid "Testing \"%s\""
-msgstr "Preizkušam \"%s\""
+#: po/tmp/mail-config.glade.h:38
+msgid "Mail"
+msgstr "Pošta"
 
-#: mail/mail-config-gui.c:2234
-#, c-format
-msgid "Test connection to \"%s\""
-msgstr "Preizkusi povezavo z \"%s\""
+#: po/tmp/mail-config.glade.h:39
+msgid "Mail Account"
+msgstr "Poštni račun"
 
-#: mail/mail-config-gui.c:2275
-msgid "The connection was successful!"
-msgstr "Povezava je bila uspešna!"
+#: po/tmp/mail-config.glade.h:40
+msgid "Mail Configuration"
+msgstr "Nastavitev pošte"
 
-#: mail/mail-config-gui.c:2325
-#, c-format
-msgid "Querying authorization capabilities of \"%s\""
-msgstr "Poizvedujem o možnostih avtentifikacije pri \"%s\""
+#: po/tmp/mail-config.glade.h:41
+msgid "Mail Configuration Druid"
+msgstr "Druid za nastavitev pošte"
 
-#: mail/mail-config-gui.c:2327
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr "Poizvedi o možnostih avtentifikacije pri \"%s\""
+#: po/tmp/mail-config.glade.h:42
+msgid "Make this my default account"
+msgstr "Naj bo to moj privzet račun"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "Nastavitev _pošte"
+#: po/tmp/mail-config.glade.h:43
+msgid "Miscellaneous"
+msgstr "Razno"
 
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"Dobrodošli v nastavitvenem čarovniku pošte!\n"
-"Z vpisom nekaterih podatkov o vaših nastavitvah e-pošte\n"
-"lahko takoj pričnete pošiljati in sprejemati pošto\n"
-"Kliknite naprej za nadaljevanje."
+#: po/tmp/mail-config.glade.h:45
+msgid "News"
+msgstr "Novice"
 
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "Identiteta"
+#: po/tmp/mail-config.glade.h:47
+msgid "Optional"
+msgstr "Dodatno"
 
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "Izvor pošte"
+#: po/tmp/mail-config.glade.h:48
+msgid "Organization:"
+msgstr "Organizacija:"
 
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "Prenos Pošte"
+#: po/tmp/mail-config.glade.h:49
+msgid "Outgoing Mail Server"
+msgstr "Strežnik odhodne pošte"
 
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-"Nastavljanje vaše e-pošte je sedaj gotovo.\n"
-"Kliknite \"Končaj\" za shranitev nastavitev"
+#: po/tmp/mail-config.glade.h:50
+msgid "Password:"
+msgstr "Geslo:"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
-msgstr "Identitete"
+#: po/tmp/mail-config.glade.h:52
+msgid "Plain Text"
+msgstr "Nešifrirano"
 
-#: mail/mail-config.glade.h:8
-msgid "Address"
-msgstr "Naslov"
+#: po/tmp/mail-config.glade.h:53
+msgid "Receiving Email"
+msgstr "Sprejemanje e-pošte"
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Organizacija"
+#: po/tmp/mail-config.glade.h:54
+msgid "Remember my password"
+msgstr "Zapomni si geslo"
 
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Viri"
+#: mail/mail-format.c:626 po/tmp/mail-config.glade.h:55
+msgid "Reply-To:"
+msgstr "Odgovori-na:"
 
-#: mail/mail-config.glade.h:19
-msgid "Mail Sources"
-msgstr "Izvori pošte"
+#: po/tmp/mail-config.glade.h:56
+msgid "Required"
+msgstr "Potrebno"
 
-#: mail/mail-config.glade.h:21
-msgid "News Servers"
-msgstr "Novičarski strežniki"
+#: po/tmp/mail-config.glade.h:58
+msgid "Save password"
+msgstr "Shrani geslo"
 
-#: mail/mail-config.glade.h:25
-msgid "News Sources"
-msgstr "Viri novic"
+#: po/tmp/mail-config.glade.h:59
+msgid "Select signature file"
+msgstr "Izberi datoteko z podpisom"
 
-#: mail/mail-config.glade.h:26
-msgid "Send messages in HTML format"
-msgstr "Pošiljaj sporočila v HTML obliki"
+#: po/tmp/mail-config.glade.h:60
+msgid "Sending Email"
+msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:27
-msgid "Mark message as seen [ms]: "
-msgstr "Označi sporočilo kot viden [ms]:"
+#: po/tmp/mail-config.glade.h:62
+msgid "Server Configuration"
+msgstr "Nastavitev strežnika"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Nisem mogel ustvariti cevi do %s: %s"
+#: po/tmp/mail-config.glade.h:63
+msgid "Server Type: "
+msgstr "Vrsta strežnika:"
 
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Nisem mogel izvršiti %s: %s\n"
+#: po/tmp/mail-config.glade.h:64
+msgid "Server requires authentication"
+msgstr "Strežnik zahteva avtentifikacijo"
 
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Ne morem razvejiti %s: %s"
+#: po/tmp/mail-config.glade.h:65
+msgid "Servers"
+msgstr "Strežniki"
 
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Prosim vpišite svojo PGP/GPG geslo za dostop do ključa"
+#: po/tmp/mail-config.glade.h:66
+msgid "Signature file:"
+msgstr "Datoteka s podpisom:"
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
-msgid "No password provided."
-msgstr "Geslo ni bilo dano."
+#: po/tmp/mail-config.glade.h:67
+msgid "Signature:"
+msgstr "Podpis:"
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
+#: po/tmp/mail-config.glade.h:68
+msgid "Sources"
+msgstr "Viri"
 
-#: mail/mail-crypto.c:599
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP program ni na voljo."
+#: po/tmp/mail-config.glade.h:69
+msgid "This server requires a secure connection (SSL)"
+msgstr "Ta strežnik zahteva varno povezavo (SSL)"
 
-#: mail/mail-display.c:66
-msgid "Overwrite file?"
-msgstr "Prepiši datoteko?"
+#: po/tmp/mail-config.glade.h:70
+msgid "Type"
+msgstr "Vrsta"
 
-#: mail/mail-display.c:70
+#: po/tmp/mail-config.glade.h:71
 msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+"Type the name by which you would like to refer to these servers. For "
+"example: \"Work\" or \"Home\"."
 msgstr ""
-"Mapa z enakim imenom že obstaja.\n"
-"Naj jo prepišem?"
+"Vpišite ime s katerimi želite nazivati te strežnike. Naprimer:"
+"\"službeni\" ali \"domači\"."
+
+#: po/tmp/mail-config.glade.h:73
+msgid "User Information"
+msgstr "Podatki o uporabniku"
+
+#: po/tmp/mail-config.glade.h:74
+msgid "Username:"
+msgstr "Uporabniško ime:"
+
+#: po/tmp/mail-config.glade.h:75
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "Dobrodošli v Evolucijinemu Druid za nastavitev pošte\n"
+
+#: po/tmp/mail-config.glade.h:77
+msgid "Click \"Next\" to begin. "
+msgstr "Kliknite \"Naprej\" za začetek. "
+
+#: mail/mail-config-druid.c:363
+#, c-format
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
+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:629
+#, c-format
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
+msgstr ""
+"Nisem uspel preveriti nastavitve odhodne pošte.\n"
+"Morda boste naleteli na probleme ob pošiljanju pošte preko %s"
+
+#. set window title
+#: mail/mail-config-druid.c:949
+msgid "Evolution Account Wizard"
+msgstr "Evolucijin čarovnik za račune"
 
-#: mail/mail-display.c:84
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4608,122 +5670,123 @@ msgstr ""
 "Nisem mogel odpreti datoteke: %s:\n"
 "%s"
 
-#: mail/mail-display.c:96
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "Zunanji pregledovalec"
 
-#: mail/mail-display.c:325
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:329
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-format.c:478
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:595
-msgid "Reply-To:"
-msgstr "Odgovori-na:"
-
-#: mail/mail-format.c:835
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr "V tej različici Evolucije GPG/PGP podpora ni prisotna."
-
-#: mail/mail-format.c:847
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Šifrirano sporočilo ni prikazano"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "Šifrirano sporočilo"
 
-#: mail/mail-format.c:854
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "Kliknite ikono za dešifriranje."
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:1468
+#: mail/mail-format.c:1450
 #, 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:1472
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:1506
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:1511
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:1664
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr "Na %s, je %s zapisal:\n"
+
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:251
+msgid "Reconfiguring folder"
+msgstr "Prenastavljam mapo"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "Zapiram trenutno mapo"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "Preimenujem in odpiram staro mapo"
 
-#: mail/mail-local.c:380
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/mail-local.c:395
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "Kopiram sporočilo"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:348
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4732,7 +5795,7 @@ msgstr ""
 "Nisem mogel shraniti meta podatkov mape; verjetno ne boste več mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:443
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4740,52 +5803,71 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr " (XXX neprebran)"
+#: mail/mail-local.c:787
+msgid "Registering local folder"
+msgstr "Registriam krajevno mapo"
+
+#: mail/mail-local.c:789
+msgid "Register local folder"
+msgstr "Registriaj krajevno mapo"
+
+#: mail/mail-local.c:893
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "Nisem mogel registriati mape '%s':\n%s"
+
+#: mail/mail-mt.c:87
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Napaka ob '%s':\n%s"
+
+
+#: mail/mail-mt.c:89
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Napaka ob opravljanju dejanja:\n"
+"%s"
+
+#: mail/mail-mt.c:372 mail/mail-mt.c:401
+msgid "Working"
+msgstr "Delam"
 
-#: mail/mail-ops.c:69
+#: mail/mail-ops.c:107
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Pobiram pošto iz %s"
 
-#: mail/mail-ops.c:71
+#: mail/mail-ops.c:109
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Poberi pošto iz %s"
 
-#: mail/mail-ops.c:311
+#: mail/mail-ops.c:359
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ni nove pošte na %s."
 
-#: mail/mail-ops.c:366
+#: mail/mail-ops.c:430
 msgid "Filtering email on demand"
 msgstr "Filtriram pošto na zahtevo"
 
-#: mail/mail-ops.c:368
+#: mail/mail-ops.c:432
 msgid "Filter email on demand"
 msgstr "Fitriraj pošto na zahtevo"
 
-#: mail/mail-ops.c:500
+#: mail/mail-ops.c:563
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:505
-msgid "Sending a message without a subject"
-msgstr "Pošiljam sporočilo brez navedene zadeve"
-
-#: mail/mail-ops.c:508
-#, c-format
-msgid "Send \"%s\""
-msgstr "Pošlji \"%s\""
-
-#: mail/mail-ops.c:511
-msgid "Send a message without a subject"
-msgstr "Pošlji sporočilo brez navedene zadeve"
+#: mail/mail-ops.c:565
+msgid "Sending message"
+msgstr "Pošiljam sporočilo"
 
 #: mail/mail-ops.c:682
 msgid "Sending queue"
@@ -4795,227 +5877,127 @@ msgstr "Pošiljam vrsto"
 msgid "Send queue"
 msgstr "Pošlji vrsto"
 
-#: mail/mail-ops.c:820 mail/mail-ops.c:827
+#: mail/mail-ops.c:822 mail/mail-ops.c:829
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Dodajam \"%s\""
 
-#: mail/mail-ops.c:824 mail/mail-ops.c:830
+#: mail/mail-ops.c:826 mail/mail-ops.c:832
 msgid "Appending a message without a subject"
 msgstr "Dodajam sporočilo brez navedene zadeve"
 
-#: mail/mail-ops.c:902
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "Uničujem \"%s\""
-
-#: mail/mail-ops.c:904
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "Uniči \"%s\""
-
-#: mail/mail-ops.c:963
+#: mail/mail-ops.c:915
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Prestavljam sporočila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiram sporočila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:920
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Prestavi sporočilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:970
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiraj sporočilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:953
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:1004
+#: mail/mail-ops.c:956
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:1024
+#: mail/mail-ops.c:976
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s sporočilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1103
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Izbiram sporočila v mapi \"%s\""
-
-#: mail/mail-ops.c:1106
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Izberi sporočila v mapi \"%s\""
-
-#: mail/mail-ops.c:1137
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Izbiram sporočilo %d od %d"
-
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1051
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osvežujem mape v \"%s\""
 
-#: mail/mail-ops.c:1262
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Osveži mape v \"%s\""
-
-#: mail/mail-ops.c:1331 mail/subscribe-dialog.c:324
+#: mail/mail-ops.c:1117 mail/subscribe-dialog.c:356
 msgid "(No description)"
 msgstr "(ni opisa)"
 
-#: mail/mail-ops.c:1392
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Prilagam sporočilo iz mape \"%s\""
+#: mail/mail-ops.c:1182
+msgid "Forwarded messages"
+msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1395
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Priloži sporočilo iz mape \"%s\""
+#: mail/mail-ops.c:1223 mail/mail-ops.c:1292
+msgid "Opening folder %s"
+msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1498
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Posredujem sporočilo \"%s\""
+#: mail/mail-ops.c:1354
+msgid "Synchronising folder"
+msgstr "Uskljajujem mapo %s"
 
-#: mail/mail-ops.c:1503
-msgid "Forwarding a message without a subject"
-msgstr "Posredujem sporočilo brez navedene zadeve"
+#: mail/mail-ops.c:1404
+msgid "Expunging folder"
+msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1506
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Posreduj sporočilo \"%s\""
+#: mail/mail-ops.c:1453
+msgid "Retrieving message %s"
+msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1511
-msgid "Forward a message without a subject"
-msgstr "Posreduj sporočilo brez navedene zadeve"
+#: mail/mail-ops.c:1520
+msgid "Retrieving messages"
+msgstr "Prenašam sporočilo"
 
-#: mail/mail-ops.c:1548
+#: mail/mail-ops.c:1530
 #, 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:1565
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"Nisem uspel generirati mime dela iz sporočila med generiranjem posredovanega "
-"sporočila."
-
-#: mail/mail-ops.c:1651
-#, c-format
-msgid "Loading \"%s\""
-msgstr "Nalagam \"%s\""
-
-#: mail/mail-ops.c:1653
-#, c-format
-msgid "Load \"%s\""
-msgstr "Naloži \"%s\""
-
-#: mail/mail-ops.c:1755
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Ustvarjam \"%s\""
-
-#: mail/mail-ops.c:1757
-#, c-format
-msgid "Create \"%s\""
-msgstr "Ustvari \"%s\""
-
-#: mail/mail-ops.c:1805
-msgid "Exception while reporting result to shell component listener."
-msgstr "Izjema med sporočanjem rezultatov lupini"
-
-#: mail/mail-ops.c:1851
-#, c-format
-msgid "Synchronizing \"%s\""
-msgstr "Uskljajujem \"%s\""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "Uskladi \"%s\""
-
-#: mail/mail-ops.c:1917
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "Prikazujem sporočilo z UID \"%s\""
-
-#: mail/mail-ops.c:1920
-msgid "Clearing message display"
-msgstr "Čistim prikazano sporočilo"
-
-#: mail/mail-ops.c:1923
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr "Prikaži sporočilo z UID \"%s\""
-
-#: mail/mail-ops.c:1926
-msgid "Clear message display"
-msgstr "Čisti prikaz sporočila"
-
-#: mail/mail-ops.c:2039
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "Odpiram sporočila iz  mape \"%s\""
+#: mail/mail-ops.c:1678
+msgid "Loading %s Folder for %s"
+msgstr "Nalagam mapo %s za %s"
 
-#: mail/mail-ops.c:2042
-#, c-format
-msgid "Open messages from \"%s\""
-msgstr "Odpri sporočilo iz \"%s\""
+#: mail/mail-ops.c:1680
+msgid "Load %s Folder for %s"
+msgstr "Naloži mapo %s za %s"
 
-#: mail/mail-ops.c:2146
-#, c-format
-msgid "Loading %s Folder"
-msgstr "Nalagam mapo %s "
+#: mail/mail-ops.c:1846
+msgid "Saving messages"
+msgstr "Shranjujem sporočila"
 
-#: mail/mail-ops.c:2148
-#, c-format
-msgid "Load %s Folder"
-msgstr "Naloži mapo %s"
+#: mail/mail-ops.c:1925
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Nisem mogel ustvariti izhodne datoteke: %s\n %s"
 
-#: mail/mail-ops.c:2215
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Gledam sporočilo iz mape \"%s\""
+#: mail/mail-ops.c:1938
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Shranjujem sporočilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2218
-#, c-format
-msgid "View messages from \"%s\""
-msgstr "Glej sporočilo iz \"%s\""
+#: mail/mail-ops.c:1952
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Napaka ob shranjevanju sporočil v: %s:\n %s"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Prenašam sporočilo %d od %d (uid \"%s\")"
+#: mail/mail-search-dialogue.c:104
+msgid "Ok"
+msgstr "V redu"
 
-#: mail/mail-search-dialogue.c:101
+#: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: mail/mail-summary.c:97 mail/mail-threads.c:703
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "V cev je bilo zapisano nepopolno sporočilo!"
 
-#: mail/mail-summary.c:370
-msgid "Mailbox summary"
-msgstr "Povzetek poštnega predala"
-
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -5024,7 +6006,7 @@ msgstr ""
 "Napaka ob pripravljanju na %s:\n"
 "%s"
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5033,34 +6015,34 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr "Napaka ob branju ukazov iz razpošiljalne niti."
 
-#: mail/mail-threads.c:772
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr "Prispelo pokvarjeno sporočilo iz razpošiljalne niti?"
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "Nisem mogel ustvariti dialoga."
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "Uporabnik je preklical poizvedbo."
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nisem mogel ustvariti začasnega poštnega predala `%s': %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:264
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "Preučujem %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5068,47 +6050,41 @@ msgstr ""
 "Nisem mogel prebrati UID medpomnilne datoteke \"%s\". Morda boste "
 "dobilipodvojeno sporočilo."
 
-#. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Prenašam sporočilo %d od %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:328
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Pišem sporočilo %d od %d"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Shranjujem spremembe pri %s"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (posredovano sporočilo)"
 
-#: mail/mail-tools.c:400
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Posreduj: (ni zadeve)"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporočilo %s"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Posredovano sporočilo (brez navedene zadeve)"
 
-#: mail/mail-tools.c:510
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr "Ne poznam protokola za odpiranje URIja `%s'"
-
-#: mail/mail-tools.c:539
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5117,104 +6093,192 @@ msgstr ""
 "Nisem mogel odpreti URIja `%s':\n"
 "%s"
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:298
 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:153 ui/evolution-mail.h:34
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:40
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/mail-view.c:153 ui/evolution-mail.h:39
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:45
 msgid "Reply to the sender of this message"
 msgstr "Odgovori pošiljatelju tega sporočila"
 
-#: mail/mail-view.c:156 ui/evolution-mail.h:38
+#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:44
 msgid "Reply to all recipients of this message"
 msgstr "Odgovori vsem prejemnikom tega sporočila"
 
-#: mail/mail-view.c:159 ui/evolution-mail.h:19
-msgid "Forward"
-msgstr "Posreduj naprej"
-
-#: mail/mail-view.c:159 ui/evolution-mail.h:20
+#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:20
 msgid "Forward this message"
 msgstr "Sporočilo posreduj naprej"
 
-#: mail/mail-view.c:163 ui/evolution-addressbook.h:16
-#: ui/evolution-calendar.h:26 ui/evolution-mail.h:29
-msgid "Print"
-msgstr "Natisni"
-
-#: mail/mail-view.c:163 ui/evolution-mail.h:33
+#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:39
 msgid "Print the selected message"
 msgstr "Natisni izbrano sporočilo"
 
-#: mail/mail-view.c:165 ui/evolution-mail.h:14
+#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Zbriši to sporčilo"
 
-#: mail/message-list.c:505
+#: mail/message-list.c:599
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:2043
-msgid "Rebuilding message view"
-msgstr "Obnavljam pogled sporočil"
+#: mail/message-list.c:602
+msgid "Seen"
+msgstr "Videno"
+
+#: mail/message-list.c:605
+msgid "Answered"
+msgstr "Odgovorjeno"
+
+#: mail/message-list.c:890
+#, 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
+#, c-format
+msgid "%s, et al."
+msgstr "%s, et al."
+
+#: mail/message-list.c:905 mail/message-list.c:921
+msgid "<unknown>"
+msgstr "<neznan>"
+
+#: mail/message-list.c:973
+msgid "?"
+msgstr "?"
+
+#: mail/message-list.c:980
+msgid "Today %l:%M %p"
+msgstr "Danes %l:%M %p"
+
+#: mail/message-list.c:989
+msgid "Yesterday %l:%M %p"
+msgstr "Včeraj %l:%M %p"
+
+#: mail/message-list.c:1001
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#: mail/message-list.c:1009
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: mail/message-list.c:1011
+msgid "%b %d %Y"
+msgstr "%d %b %Y"
+
+#: mail/message-list.c:1109
+msgid "Flagged"
+msgstr "Označeno"
 
-#: mail/message-list.c:2045
-msgid "Rebuild message view"
-msgstr "Obnovi pogled sporočil"
+#: mail/message-list.c:1110
+msgid "From"
+msgstr "Od"
 
-#: mail/message-thread.c:582
-msgid "Threading message list"
-msgstr "Nitim seznam sporočil"
+#: mail/message-list.c:1110
+msgid "Date"
+msgstr "Datum"
 
-#: mail/message-thread.c:584
-msgid "Thread message list"
-msgstr "Niten seznam sporočil"
+#: mail/message-list.c:1110
+msgid "Received"
+msgstr "Sprejeto"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1111
+msgid "To"
+msgstr "Za"
+
+#: mail/message-list.c:1111
+msgid "Size"
+msgstr "Velikost"
+
+#: mail/openpgp-utils.c:78
+msgid "Please enter your %s passphrase for %s"
+msgstr "Prosim vpišite svoje %s geslo za %s"
+
+#: mail/openpgp-utils.c:81
+msgid "Please enter your %s passphrase"
+msgstr "Prosim vpišite svoje %s geslo"
+
+#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
+#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+msgid "No GPG/PGP program available."
+msgstr "GPG/PGP program ni na voljo."
+
+#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
+#: mail/openpgp-utils.c:898
+msgid "No password provided."
+msgstr "Geslo ni bilo dano."
+
+#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
+#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
+
+#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+msgid "No recipients specified"
+msgstr "Prejemniki niso navedeni"
+
+#: mail/openpgp-utils.c:1065
+msgid "Couldn't create temp file: %s"
+msgstr "Nisem mogel ustvariti začasne datoteke: %s"
+
+#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+msgid "Folder"
+msgstr "Mapa"
+
+#: mail/subscribe-dialog.c:63
+msgid "Store"
+msgstr "Shramba"
+
+#: mail/subscribe-dialog.c:145
 msgid "Display folders starting with:"
 msgstr "Prikaži mape, ki se začnejo z:"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:178
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Dobivam shrambo za \"%s\""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:181
 #, c-format
 msgid "Get store for \"%s\""
 msgstr "Dobi shrambo za \"%s\""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:289
+#, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Naročam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:293
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Preklicujem naročnino na mapo \"%s\""
+
+#: mail/subscribe-dialog.c:297
+#, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Naroči se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:387
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Preklicujem naročnino na mapo \"%s\""
+#: mail/subscribe-dialog.c:300
+msgid "Unsubscribe from folder \"%s\""
+msgstr "Prekliči naročnino na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:390
-msgid "Unsubscribe to folder \"%s\""
-msgstr "Prekliči naročnono na mapo \"%s\""
-
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -5222,30 +6286,30 @@ msgstr ""
 "Ta različica Evolucije mora namestiti dodatne datoteke\n"
 "v vaš osebni imenik Evolucije"
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev datotek ali \"Prekliči\" za izhod"
 
-#: shell/e-setup.c:152
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno prenoviti datotek"
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Evolucijine datoteke so se uspešno namestile."
 
-#: shell/e-setup.c:179
+#: 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."
 
-#: shell/e-setup.c:180
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabniških datotek "
 "pod"
 
-#: shell/e-setup.c:197
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5256,7 +6320,7 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5265,7 +6329,7 @@ msgstr ""
 "Ne morem kopirati datotek v\n"
 "`%s'."
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5276,7 +6340,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5302,7 +6366,7 @@ msgstr "Izbrano ime mape ni veljavno."
 
 #: shell/e-shell-folder-creation-dialog.c:225
 msgid "Evolution - Create new folder"
-msgstr "Evolution - Ustvar novo mapo"
+msgstr "Evolucija - Ustvar novo mapo"
 
 #: shell/e-shell-folder-selection-dialog.c:96
 msgid ""
@@ -5312,31 +6376,27 @@ msgstr ""
 "Tip izbrane mape ni veljaven za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
 #: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Program 'Bug buddy' ni bil najden v vaši poti ($PATH)."
 
-#. same as above
 #: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
-msgstr "Avtorske pravice pridržane 1999,2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Avtorske pravice pridržane 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5346,46 +6406,48 @@ msgstr ""
 "GNOME za delo v skupinah, za pošto, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:143
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:471
 msgid "Folders"
 msgstr "Mape"
 
-#: shell/e-shell-view.c:1021
-#, c-format
-msgid "Evolution - %s"
-msgstr "Evolution - %s"
+#: shell/e-shell-view.c:1138
+msgid "%s - Evolution %s"
+msgstr "%s - Evolucija %s"
+
+#: shell/e-shell-view.c:1140
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolucija %s [%s]"
 
-#: shell/e-shell-view.c:1167
+#: shell/e-shell.c:372
 #, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
+
+#: shell/e-shell.c:1229
 msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"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."
 
-#: shell/e-shell.c:336
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
-
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5394,122 +6456,125 @@ msgstr ""
 "Zares želite odstraniti skupino\n"
 "`%s' iz vrstice bližnjic?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Kaži bližnjice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Kaži bližnjice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+msgid "_Hide the Shortcut Bar"
+msgstr "_Skrij vrstico z bližnjicami"
+
+#: shell/e-shortcuts-view.c:290
+msgid "Hide the shortcut bar"
+msgstr "Skrij vrstico z bližnjicami"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Aktiviraj"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Aktiviraj to bližnjico"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:375
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bližnjic."
 
-#: shell/e-storage.c:128
+#: shell/e-storage-set-view.c:338
+msgid "View the selected folder"
+msgstr "Poglej izbrane mape"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Generična napaka"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom že obstaja"
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Izbran tip mape ni veljaven"
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.h:91
-#: ui/evolution.h:39
-msgid "_View"
-msgstr "_Pogled"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "Poglej izbrane mape"
-
-#: shell/main.c:68
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5525,1016 +6590,754 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 "Zdravo.  Hvala, ker ste si vzeli čas za prenos te predizdaje\n"
-"programja za delovne skupine Evolution.\n"
+"programja za delovne skupine Evolucija.\n"
 "\n"
-"Skozi prejšnji mesec in pol smo se trudili Evolution narediti \n"
-"uporabnega. Veliko razvijalcev Evolutiona ga že exkluzivno \n"
-"uporablja za branje svoje pošte. Tudi vi ga lahko. (Le ne pozabite\n"
-"na varnostne kopije.)\n"
+"Zadnje čase smo se trudili Evolucijo narediti uporabno. Veliko \n"
+"razvijalcev Evolutiona ga že exkluzivno uporablja za branje svoje \n"
+"pošte. Tudi vi ga lahko. (le ne pozabite na varnostne kopije.)\n"
 "\n"
 "Kljub temu, da smo popravili veliko hroščev, ki vplivajo na stabilnost \n"
-"in varnost vseeno opozarjamo:  Evolution se bo: sesul, izgubil vašo \n"
-"pošto, ko tega ne boste hoteli, zavrnil brisanje vaše pošte, boste to \n"
-"želeli, pustil teči mrtve procese, uporabil 100% procesorja, se zaklenil, \n"
-"poslal HTML na naključne dopisne sezname in vas osramotil pred prijatelji \n"
+"in varnost vseeno opozarjamo:  Evolucija se bo: sesula, izgubila vašo \n"
+"pošto, ko tega ne boste hoteli, zavrnila brisanje vaše pošte, ko boste to \n"
+"želeli, pustila teči mrtve procese, porabila 100% procesorja, se zaklenila, \n"
+"poslala HTML na naključne dopisne sezname in vas osramotila pred prijatelji \n"
 "in sodelavci. \n"
-"Uporabljajte ga le tako kot je predvideno.\n"
+"Uporabljajte jo le tako kot je predvideno.\n"
 "\n"
 "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
 "pričakujemo vaše prispevke!\n"
 
-#: shell/main.c:95
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 "Hvala!\n"
-"Skupina Evolution\n"
+"Skupina Evolucije\n"
 
-#: shell/main.c:123
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
-msgstr "Ne morem inicializirati lupine Evolution."
+msgstr "Ne morem inicializirati lupine Evolucije."
+
+#: shell/main.c:178
+msgid "Disable."
+msgstr "Izključeno."
 
-#: shell/main.c:162
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
-#.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-addressbook-ldap.h:9
-msgid "N_ew Directory Server"
-msgstr "N_ov strežnik imenikov"
-
-#: ui/evolution-addressbook-ldap.h:10
-msgid "_Actions"
-msgstr "_Dejanja"
-
-#: ui/evolution-addressbook.h:10
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Ustvari nov stik"
 
-#: ui/evolution-addressbook.h:12
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Zbriši stik"
 
-#: ui/evolution-addressbook.h:13 ui/evolution-event-editor.h:33
-msgid "Find"
-msgstr "Poišči"
-
-#: ui/evolution-addressbook.h:14
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Poišči stik"
 
-#: ui/evolution-addressbook.h:15 ui/evolution-calendar.h:21
-msgid "New"
-msgstr "Nov"
-
-#: ui/evolution-addressbook.h:17
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Natisni stike"
 
-#: ui/evolution-addressbook.h:18
+#: po/tmp/evolution-addressbook.xml.h:15 po/tmp/evolution-mail.xml.h:50
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ui/evolution-addressbook.h:19
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: ui/evolution-addressbook.h:20
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Glej vse"
 
-#: ui/evolution-addressbook.h:21
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Glej vse stike"
 
-#: ui/evolution-addressbook.h:22
-msgid "_New Contact"
-msgstr "_Nov stik"
+#: po/tmp/evolution-addressbook.xml.h:19
+msgid "_Addressbook Configuration..."
+msgstr "Nastavitev _adresarja..."
 
-#: ui/evolution-addressbook.h:23
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "_Natisni stike..."
 
-#: ui/evolution-addressbook.h:24
+#: po/tmp/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_Išči po kontaktih"
 
-#: ui/evolution-addressbook.h:25 ui/evolution-event-editor.h:113
-msgid "_Tools"
-msgstr "_Orodja"
-
 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.h:9
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 dni"
 
-#: ui/evolution-calendar.h:10
-msgid "Alter preferences"
-msgstr "Alternativne nastavitve"
+#: po/tmp/evolution-calendar.xml.h:8
+msgid "Ca_lendar"
+msgstr "Ko_ledar"
 
-#: ui/evolution-calendar.h:11
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Nastavitve koledarja..."
 
-#: ui/evolution-calendar.h:12
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Ustvari nov zmenek"
 
-#: ui/evolution-calendar.h:13
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: ui/evolution-calendar.h:14
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.h:15
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Pojdi po času nazaj"
 
-#: ui/evolution-calendar.h:16
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Pojdi po času naprej"
 
-#: ui/evolution-calendar.h:17
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.h:18
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Pojdi na določen datum"
 
-#: ui/evolution-calendar.h:19
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Pojdi na sedanjost"
 
-#: ui/evolution-calendar.h:20
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.h:22
-msgid "New Ca_lendar"
-msgstr "Nov Ko_ledar"
-
-#: ui/evolution-calendar.h:23 ui/evolution-event-editor.h:45
-msgid "Next"
-msgstr "Naprej"
-
-#: ui/evolution-calendar.h:24
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Odpri koledar"
 
-#: ui/evolution-calendar.h:25
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Nazaj"
 
-#: ui/evolution-calendar.h:27
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.h:28
-msgid "Save calendar As something else"
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
 msgstr "Shrani koledar kot nekaj drugega"
 
-#: ui/evolution-calendar.h:29
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Kaži en dan"
 
-#: ui/evolution-calendar.h:30
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Kaži en mesec"
 
-#: ui/evolution-calendar.h:31
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Kaži en teden"
 
-#: ui/evolution-calendar.h:32
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Pokaži delavni teden"
 
-#: ui/evolution-calendar.h:33 widgets/misc/e-dateedit.c:365
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Danes"
 
-#: ui/evolution-calendar.h:34
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Teden"
 
-#: ui/evolution-calendar.h:35 ui/evolution.h:35
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:40
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution-calendar.h:36
-msgid "_New appointment..."
-msgstr "_Nov zmenek..."
-
-#: ui/evolution-calendar.h:37
-msgid "_Open"
-msgstr "_Odpri"
-
-#: ui/evolution-calendar.h:38
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "Odpri ko_ledar"
 
-#: ui/evolution-calendar.h:39
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Natisni ta koledar"
 
-#: ui/evolution-calendar.h:40
-msgid "_Save Calendar As"
-msgstr "_Shrani koledar kot"
-
-#.
-#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-contact-editor.h:9 ui/evolution-event-editor.h:55
-#: ui/evolution-subscribe.h:19 ui/evolution.h:29
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ui/evolution-contact-editor.h:10 ui/evolution-event-editor.h:69
-msgid "_Save"
-msgstr "_Shrani"
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "Zbriši ta predmet"
 
-#: ui/evolution-contact-editor.h:11
-msgid "Save _As"
-msgstr "Shrani _kot"
+#: po/tmp/evolution-contact-editor.xml.h:8
+msgid "Delete..."
+msgstr "Zbriši..."
 
-#: ui/evolution-contact-editor.h:13 ui/evolution-event-editor.h:66
-msgid "_Print"
-msgstr "_Natisni"
+#: po/tmp/evolution-contact-editor.xml.h:9
+msgid "Help"
+msgstr "Pomoč"
 
-#: ui/evolution-contact-editor.h:15 ui/evolution-event-editor.h:11
-msgid "Save and Close"
-msgstr "Shrani in zapri"
+#: po/tmp/evolution-contact-editor.xml.h:10
+msgid "Print En_velope..."
+msgstr "Tiskaj kuverto..."
 
-#: ui/evolution-contact-editor.h:16
+#: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Shrani stik in zapri dialog"
 
-#: ui/evolution-contact-editor.h:17 ui/evolution-event-editor.h:15
-msgid "Print..."
-msgstr "Natisni..."
-
-#: ui/evolution-contact-editor.h:18 ui/evolution-event-editor.h:16
-msgid "Print this item"
-msgstr "Natisni ta predmet"
+#: po/tmp/evolution-contact-editor.xml.h:16
+msgid "Se_nd contact to other..."
+msgstr "Pošlji stik drugim..."
 
-#: ui/evolution-contact-editor.h:20
-msgid "Delete this item"
-msgstr "Zbriši ta predmet"
+#: po/tmp/evolution-contact-editor.xml.h:18
+msgid "Send _message to contact..."
+msgstr "Pošlji _sporočilo stiku..."
 
-#: ui/evolution-event-editor.h:10
-msgid "Save the current file"
-msgstr "Shrani trenutno datoteko"
+#: po/tmp/evolution-contact-editor.xml.h:20
+msgid "_Print..."
+msgstr "_Tiskaj..."
 
-#: ui/evolution-event-editor.h:12
-msgid "Save the appointment and close the dialog box"
-msgstr "Shrani zmenek in zapri dialog"
-
-#: ui/evolution-event-editor.h:17
-msgid "Print Setup"
-msgstr "Nastavitev tiskanja"
-
-#: ui/evolution-event-editor.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
-
-#: ui/evolution-event-editor.h:20
+#: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Zapri ta zmenek"
 
-#: ui/evolution-event-editor.h:21
-msgid "Cut"
-msgstr "Izreži"
-
-#: ui/evolution-event-editor.h:22
-msgid "Cut the selection"
-msgstr "Izreži izbrano"
-
-#: ui/evolution-event-editor.h:23 ui/evolution-mail.h:11
-msgid "Copy"
-msgstr "Kopiraj"
-
-#: ui/evolution-event-editor.h:24
-msgid "Copy the selection"
-msgstr "Kopiraj izbrano"
-
-#: ui/evolution-event-editor.h:25
-msgid "Paste"
-msgstr "Prilepi"
-
-#: ui/evolution-event-editor.h:26
-msgid "Paste the clipboard"
-msgstr "Prilepi odložišče"
-
-#: ui/evolution-event-editor.h:27
-msgid "Clear"
-msgstr "Počisti"
-
-#: ui/evolution-event-editor.h:28
-msgid "Clear the selection"
-msgstr "Počisti izbiro"
-
-#: ui/evolution-event-editor.h:29
-msgid "Undo"
-msgstr "Razveljavi"
-
-#: ui/evolution-event-editor.h:30
-msgid "Undo the last action"
-msgstr "Razveljavi zadnje dejanje"
-
-#: ui/evolution-event-editor.h:31
-msgid "Redo"
-msgstr "Obnovi"
-
-#: ui/evolution-event-editor.h:32
-msgid "Redo the undone action"
-msgstr "Obnovi razveljavljeno dejanje"
-
-#: ui/evolution-event-editor.h:34
-msgid "Search for a string"
-msgstr "Išči niz"
-
-#: ui/evolution-event-editor.h:35
-msgid "Find Again"
-msgstr "Poišči znova"
-
-#: ui/evolution-event-editor.h:36
-msgid "Search again for the same string"
-msgstr "Išči enak niz znova"
-
-#: ui/evolution-event-editor.h:37
-msgid "Replace"
-msgstr "Zamenjaj"
-
-#: ui/evolution-event-editor.h:38
-msgid "Replace a string"
-msgstr "Zamenjaj niz"
-
-#: ui/evolution-event-editor.h:39
-msgid "Select All"
-msgstr "Izberi vse"
-
-#: ui/evolution-event-editor.h:40
-msgid "Select everything"
-msgstr "Izberi vse"
-
-#: ui/evolution-event-editor.h:41
-msgid "Properties"
-msgstr "Lastnosti"
-
-#: ui/evolution-event-editor.h:42
-msgid "Modify the file's properties"
-msgstr "Spremeni lastnosti datoteke"
-
-#: ui/evolution-event-editor.h:43
-msgid "Previous"
-msgstr "Prejšnji"
-
-#: ui/evolution-event-editor.h:44
-msgid "Go to the previous item"
-msgstr "Pojdi na prejšnji predmet"
-
-#: ui/evolution-event-editor.h:46
-msgid "Go to the next item"
-msgstr "Pojdi na naslednji predmet"
-
-#: ui/evolution-event-editor.h:47
-msgid "FIXME: Schedule Meeting"
-msgstr "FIXME: Načrtuj sestanek"
-
-#: ui/evolution-event-editor.h:48
-msgid "Schedule some sort of a meeting"
-msgstr "Načrtuj nek tip sestanka"
-
-#: ui/evolution-event-editor.h:49
-msgid "About..."
-msgstr "O..."
-
-#: ui/evolution-event-editor.h:50
-msgid "About this application"
-msgstr "O tem programu"
-
-#: ui/evolution-event-editor.h:51
-msgid "FIXME: Help"
-msgstr "FIXME: Pomoč"
-
-#: ui/evolution-event-editor.h:52
-msgid "See online help"
-msgstr "Glej pomoč na liniji"
-
-#: ui/evolution-event-editor.h:53
-msgid "Dump XML"
-msgstr "Shrani kot XML"
-
-#: ui/evolution-event-editor.h:54
-msgid "Dump the UI Xml description"
-msgstr "Shranio Xml opis uporabniškega vmesnika"
-
-#: ui/evolution-event-editor.h:56
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Pošlji sporočilo"
-
-#: ui/evolution-event-editor.h:57
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Stik"
-
-#: ui/evolution-event-editor.h:58
-msgid "FIXME: _Task"
-msgstr "FIXME: _Naloga"
-
-#: ui/evolution-event-editor.h:59
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Zahteva po _nalogi"
-
-#: ui/evolution-event-editor.h:60
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _Vpis v dnevniku"
-
-#: ui/evolution-event-editor.h:61
-msgid "FIXME: _Note"
-msgstr "FIXME: _Opomba"
-
-#: ui/evolution-event-editor.h:62 ui/evolution-event-editor.h:118
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Izberi izmed..."
-
-#: ui/evolution-event-editor.h:63
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: V slogu zabeležka"
-
-#: ui/evolution-event-editor.h:64
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Določi _sloge tiskanja"
-
-#: ui/evolution-event-editor.h:65
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Predogled tiskanja"
-
-#: ui/evolution-event-editor.h:67
-msgid "Print S_etup..."
-msgstr "Nas_tavi tiskanje..."
-
-#: ui/evolution-event-editor.h:68
-msgid "FIXME: S_end"
-msgstr "FIXME: Pošlji"
-
-#: ui/evolution-event-editor.h:70
-msgid "Save _As..."
-msgstr "Shrani _kot..."
-
-#: ui/evolution-event-editor.h:71
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Dodaj prilogo..."
-
-#: ui/evolution-event-editor.h:73
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: Prestavi v mapo..."
-
-#: ui/evolution-event-editor.h:74
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Kopiraj v mapo..."
-
-#: ui/evolution-event-editor.h:75
-msgid "_Properties..."
-msgstr "_Lastnosti..."
-
-#: ui/evolution-event-editor.h:76
-msgid "_Close"
-msgstr "_Zapri"
-
-#: ui/evolution-event-editor.h:77 ui/evolution-subscribe.h:18
-#: ui/evolution.h:28
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ui/evolution-event-editor.h:78
-msgid "_Undo"
-msgstr "_Razveljavi"
-
-#: ui/evolution-event-editor.h:79
-msgid "_Redo"
-msgstr "Obnovi"
-
-#: ui/evolution-event-editor.h:80
-msgid "C_ut"
-msgstr "_Izreži"
-
-#: ui/evolution-event-editor.h:81
-msgid "_Copy"
-msgstr "_Kopiraj"
-
-#: ui/evolution-event-editor.h:82
-msgid "_Paste"
-msgstr "_Prilepi"
-
-#: ui/evolution-event-editor.h:83
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Prilepi po_sebno..."
-
-#: ui/evolution-event-editor.h:84 ui/evolution-event-editor.h:85
-msgid "C_lear"
-msgstr "Č_isti"
-
-#: ui/evolution-event-editor.h:86
-msgid "_Find..."
-msgstr "_Poišči"
-
-#: ui/evolution-event-editor.h:87
-msgid "Find _Again"
-msgstr "Poišči znova"
-
-#: ui/evolution-event-editor.h:88
-msgid "_Replace..."
-msgstr "_Zamenjaj..."
-
-#: ui/evolution-event-editor.h:89
-msgid "_Object"
-msgstr "_Predmet"
-
-#: ui/evolution-event-editor.h:90
-msgid "FIXME: what goes here?"
-msgstr "FIXME: kaj pride sem?"
-
-#: ui/evolution-event-editor.h:92
-msgid "Pre_vious"
-msgstr "P_rejšnji"
-
-#: ui/evolution-event-editor.h:93 ui/evolution-event-editor.h:98
-msgid "FIXME: _Item"
-msgstr "FIXME: _Predmet"
-
-#: ui/evolution-event-editor.h:94 ui/evolution-event-editor.h:99
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: _Neprebran predmet"
-
-#: ui/evolution-event-editor.h:95 ui/evolution-event-editor.h:100
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Do_končana naloga"
-
-#: ui/evolution-event-editor.h:96
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: P_rvi predmet v mapi"
-
-#: ui/evolution-event-editor.h:97
-msgid "N_ext"
-msgstr "Napr_ej"
-
-#: ui/evolution-event-editor.h:101
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Zadnji predmet v mapi"
-
-#: ui/evolution-event-editor.h:102
-msgid "_Toolbars"
-msgstr "_Orodjarne"
-
-#: ui/evolution-event-editor.h:103
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Običajno"
-
-#: ui/evolution-event-editor.h:104
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _Oblikovanje"
-
-#: ui/evolution-event-editor.h:105
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Po meri..."
-
-#: ui/evolution-event-editor.h:106
-msgid "_Insert"
-msgstr "Vstavi"
-
-#: ui/evolution-event-editor.h:107
-msgid "FIXME: _File..."
-msgstr "FIXME: _Datoteka..."
-
-#: ui/evolution-event-editor.h:108
-msgid "FIXME: It_em..."
-msgstr "FIXME: Pr_edmet..."
-
-#: ui/evolution-event-editor.h:109
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Zadeva..."
-
-#: ui/evolution-event-editor.h:110
-msgid "F_ormat"
-msgstr "O_blikuj izpis"
-
-#: ui/evolution-event-editor.h:111
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Pisava..."
-
-#: ui/evolution-event-editor.h:112
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Odstavek..."
-
-#: ui/evolution-event-editor.h:114
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Črkovanje..."
-
-#: ui/evolution-event-editor.h:115
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Preve_ri imena"
-
-#: ui/evolution-event-editor.h:116
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: A_dresar..."
-
-#: ui/evolution-event-editor.h:117
-msgid "_Forms"
-msgstr "_Obrazci"
-
-#: ui/evolution-event-editor.h:119
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Obli_kuj ta obrazec"
-
-#: ui/evolution-event-editor.h:120
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Oblikuj obrazec..."
-
-#: ui/evolution-event-editor.h:121
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Ob_javi obrazec..."
-
-#: ui/evolution-event-editor.h:122
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: O_bjavi obrazec kot..."
-
-#: ui/evolution-event-editor.h:123
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Razhroščevalnik skript"
-
-#: ui/evolution-event-editor.h:124
-msgid "Actio_ns"
-msgstr "_Dejanja"
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
+msgstr "FIXME: Posreduj naprej kot v_Koledar"
 
-#: ui/evolution-event-editor.h:125
+#: po/tmp/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nov zmenek"
 
-#: ui/evolution-event-editor.h:126
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: Ponovitve..."
-
-#: ui/evolution-event-editor.h:127
-msgid "FIXME: Schedule _Meeting"
-msgstr "FIXME: _Načrtuj sestanek"
-
-#: ui/evolution-event-editor.h:128
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Posreduj naprej kot v_Koledar"
-
-#: ui/evolution-event-editor.h:129
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Posreduj naprej"
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr "FIXME: _Opomba"
 
-#: ui/evolution-event-editor.h:130 ui/evolution.h:32
-msgid "_Help"
-msgstr "_Pomoč"
+#: po/tmp/evolution-event-editor.xml.h:91
+msgid "Save the appointment and close the dialog box"
+msgstr "Shrani zmenek in zapri dialog"
 
-#: ui/evolution-event-editor.h:131
-msgid "_About..."
-msgstr "_O..."
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr "Načrtuj sestanek"
 
-#: ui/evolution-event-editor.h:132
-msgid "_Debug"
-msgstr "_Razhroščuj"
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr "_Načrtuj sestanek"
 
-#: ui/evolution-event-editor.h:133
-msgid "FIXME: Insert File"
-msgstr "FIXME: Vstavi datoteko"
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr "Načrtuj nek tip sestanka"
 
 #.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.h:9
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Sestavi"
 
-#: ui/evolution-mail.h:10
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Sestavi novo sporočilo"
 
-#: ui/evolution-mail.h:12
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Prestavi sporočilo v novo mapo"
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:11
+#: po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule"
+msgstr "Ustvari pravilo"
+
+#: po/tmp/evolution-mail.xml.h:13
+msgid "Experimental/new code to get/receive mail"
+msgstr "Eksperimentalna/nova koda za sprejem/pošiljanje pošte"
+
+#: po/tmp/evolution-mail.xml.h:14 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "_Mapa"
 
-#: ui/evolution-mail.h:16
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Fi_lter on Sender"
 msgstr "Filtriraj glede na Pošiljatelja"
 
-#: ui/evolution-mail.h:17
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Filter on Rec_ipients"
 msgstr "Filtriraj glede na Prejemnike"
 
-#: ui/evolution-mail.h:18
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail.h:21
+#: po/tmp/evolution-mail.xml.h:21
 msgid "Get Mail"
 msgstr "Poberi pošto"
 
-#: ui/evolution-mail.h:22
+#: po/tmp/evolution-mail.xml.h:22
+msgid "Get Mail (new)"
+msgstr "Dobi pošto (novo)"
+
+#: po/tmp/evolution-mail.xml.h:23
+msgid "Hide S_elected Messages"
+msgstr "Skrij _izbrana sporočila"
+
+#: po/tmp/evolution-mail.xml.h:24
+msgid "Hide _Deleted Messages"
+msgstr "Skrij _zbrisana sporočila"
+
+#: po/tmp/evolution-mail.xml.h:25
+msgid "Hide _Read messages"
+msgstr "Skrij _prebrana sporočila"
+
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Mail _Filters..."
 msgstr "Pošlji _filtre ..."
 
-#: ui/evolution-mail.h:23
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Manage Subscriptions..."
 msgstr "Uredi naročnine..."
 
-#: ui/evolution-mail.h:24
+#: po/tmp/evolution-mail.xml.h:28
 msgid "Mar_k As Read"
 msgstr "Označi _kot prebrano"
 
-#: ui/evolution-mail.h:25
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Mark As U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: ui/evolution-mail.h:26
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail.h:27
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Move message to a new folder"
 msgstr "Prestavi sporočilo v novo mapo"
 
-#: ui/evolution-mail.h:28
+#: po/tmp/evolution-mail.xml.h:33
 msgid "Previews the message to be printed"
 msgstr "Predogled sporočika, ki bo natisnjeno"
 
-#: ui/evolution-mail.h:30
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Print Preview of message..."
 msgstr "Predogled tiskanja sporočila"
 
-#: ui/evolution-mail.h:31
+#: po/tmp/evolution-mail.xml.h:37
 msgid "Print message to the printer"
 msgstr "Natisni sporočilo na tiskalniku"
 
-#: ui/evolution-mail.h:32
+#: po/tmp/evolution-mail.xml.h:38
 msgid "Print message..."
 msgstr "Natisni sporočilo..."
 
-#: ui/evolution-mail.h:36
+#: po/tmp/evolution-mail.xml.h:42
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: ui/evolution-mail.h:37
+#: po/tmp/evolution-mail.xml.h:43
 msgid "Reply to _Sender"
 msgstr "Odgovori pošiljatelju"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:15
+#: po/tmp/evolution-mail.xml.h:46
+msgid "S_ource"
+msgstr "_Vir"
+
+#: po/tmp/evolution-mail.xml.h:47 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Izberi vse"
 
-#: ui/evolution-mail.h:41
+#: po/tmp/evolution-mail.xml.h:48
 msgid "Send queued mail and retrieve new mail"
 msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
 
-#: ui/evolution-mail.h:42
+#: po/tmp/evolution-mail.xml.h:49
+msgid "Show _All Messages"
+msgstr "Kaži vsa sporočila"
+
+#: po/tmp/evolution-mail.xml.h:51
 msgid "Threaded Message list"
 msgstr "_Niten seznam sporočil"
 
-#: ui/evolution-mail.h:43
+#: po/tmp/evolution-mail.xml.h:52
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _Pošiljatelja"
 
-#: ui/evolution-mail.h:44
+#: po/tmp/evolution-mail.xml.h:53
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na _Sprejemnike"
 
-#: ui/evolution-mail.h:45
+#: po/tmp/evolution-mail.xml.h:54
+msgid "View Raw Message Source"
+msgstr "Glej izvorno obliko sporočila"
+
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail.h:46
-msgid "_Configure Folder"
-msgstr "_Nastavi mapo"
+#: po/tmp/evolution-mail.xml.h:56
+msgid "_Configure Folder..."
+msgstr "_Nastavi mapo..."
 
-#: ui/evolution-mail.h:47
-msgid "_Copy to Folder"
-msgstr "_Kopiraj v mapo"
+#: po/tmp/evolution-mail.xml.h:57
+msgid "_Copy to Folder..."
+msgstr "_Kopiraj v mapo..."
 
-#: ui/evolution-mail.h:49
+#: po/tmp/evolution-mail.xml.h:59
 msgid "_Edit Message"
 msgstr "_Uredi sporočilo"
 
-#: ui/evolution-mail.h:50
+#: po/tmp/evolution-mail.xml.h:60
 msgid "_Expunge"
 msgstr "_Uniči"
 
-#: ui/evolution-mail.h:51
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Filter on Subject"
 msgstr "Filtriraj glede na _Zadevo"
 
-#: ui/evolution-mail.h:52
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Forward"
 msgstr "Posreduj _naprej"
 
-#: ui/evolution-mail.h:53 ui/evolution-subscribe.h:20
+#: po/tmp/evolution-mail.xml.h:63 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: ui/evolution-mail.h:54
+#: po/tmp/evolution-mail.xml.h:64
 msgid "_Mail Configuration..."
 msgstr "Nastavitev _Pošte..."
 
-#: ui/evolution-mail.h:55
+#: po/tmp/evolution-mail.xml.h:65
 msgid "_Message"
 msgstr "_Sporočilo"
 
-#: ui/evolution-mail.h:56
-msgid "_Move to Folder"
-msgstr "_Prestavi v mapo"
+#: po/tmp/evolution-mail.xml.h:66
+msgid "_Move to Folder..."
+msgstr "_Prestavi v mapo..."
 
-#: ui/evolution-mail.h:57
+#: po/tmp/evolution-mail.xml.h:67
 msgid "_Open in New Window"
 msgstr "_Odpri v novem oknu"
 
-#: ui/evolution-mail.h:58
+#: po/tmp/evolution-mail.xml.h:68
 msgid "_Print Message"
 msgstr "_Natisni sporočilo"
 
-#: ui/evolution-mail.h:59
+#: po/tmp/evolution-mail.xml.h:69
+msgid "_Save Message As..."
+msgstr "_Shrani sporočilo kot..."
+
+#: po/tmp/evolution-mail.xml.h:70
 msgid "_Threaded"
 msgstr "_Niteno"
 
-#: ui/evolution-mail.h:60
+#: po/tmp/evolution-mail.xml.h:71
+msgid "_Undelete"
+msgstr "_Odbriši"
+
+#: po/tmp/evolution-mail.xml.h:72
 msgid "_VFolder on Subject"
 msgstr "vMapa glede na _Zadevo"
 
-#: ui/evolution-mail.h:61
+#: po/tmp/evolution-mail.xml.h:73
 msgid "_Virtual Folder Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
 #.
-#. *  This file is autogenerated from evolution-subscribe.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.h:9
+#: po/tmp/evolution-message-composer.xml.h:6
+msgid "Attach"
+msgstr "Priloži"
+
+#: po/tmp/evolution-message-composer.xml.h:10
+msgid "Encrypt this message with PGP"
+msgstr "Šifriraj sporočilo z PGP"
+
+#: po/tmp/evolution-message-composer.xml.h:12
+msgid "HTML"
+msgstr "HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert a file as text into the message"
+msgstr "Vstavi datoteko v sporočilo kot besedilo"
+
+#: po/tmp/evolution-message-composer.xml.h:14
+msgid "Insert text file..."
+msgstr "Vstavi datoteko z besedilom..."
+
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Open a file"
+msgstr "Odpri datoteko"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr "Šifriraj s PGP"
+
+#: po/tmp/evolution-message-composer.xml.h:18
+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"
+
+#: po/tmp/evolution-message-composer.xml.h:23
+msgid "Save in _folder... (FIXME)"
+msgstr "Shrani v _mapo..."
+
+#: po/tmp/evolution-message-composer.xml.h:24
+msgid "Save in folder..."
+msgstr "Shrani v mapo..."
+
+#: po/tmp/evolution-message-composer.xml.h:26
+msgid "Save the current file with a different name"
+msgstr "Shrani trenutno datoteko pod drugim imenom"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+msgid "Save the message in a specified folder"
+msgstr "Shrani sporočilo v izbrano mapo"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+msgid "Send"
+msgstr "Pošlji"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+msgid "Send _Later"
+msgstr "Pošilji _kaseneje"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+msgid "Send _later"
+msgstr "Pošlji _kasneje"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+msgid "Send the mail in HTML format"
+msgstr "Pošlji pošto v HTML obliki"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+msgid "Send the message later"
+msgstr "Pošlji sporočilo kasneje"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+msgid "Send the message now"
+msgstr "Takoj pošlji sporočilo"
+
+#: po/tmp/evolution-message-composer.xml.h:34
+msgid "Send this message now"
+msgstr "Takoj pošlji to sporočilo"
+
+#: po/tmp/evolution-message-composer.xml.h:35
+msgid "Show / hide attachments"
+msgstr "Kaži / skrij priloge"
+
+#: po/tmp/evolution-message-composer.xml.h:36
+msgid "Show _attachments"
+msgstr "Kaži priloge"
+
+#: po/tmp/evolution-message-composer.xml.h:37
+msgid "Show attachments"
+msgstr "Kaži priloge"
+
+#: po/tmp/evolution-message-composer.xml.h:38
+msgid "Sign this message with your PGP key"
+msgstr "Podpiši to sporočilo s svojim PGP ključem"
+
+#: po/tmp/evolution-message-composer.xml.h:45
+msgid "_Insert text file... (FIXME)"
+msgstr "_Vstavi datoteko z besedilom... (FIXME)"
+
+#: po/tmp/evolution-message-composer.xml.h:46
+msgid "_Open..."
+msgstr "_Odpri..."
+
+#: po/tmp/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr "_Varnost"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaj mapo na seznam naročenih map"
 
-#: ui/evolution-subscribe.h:12
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Osveži seznam"
 
-#: ui/evolution-subscribe.h:13
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Osveži seznam map"
 
-#: ui/evolution-subscribe.h:14
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Odstrani mapo iz seznama naročenih map"
 
-#: ui/evolution-subscribe.h:16
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Naroči"
 
-#: ui/evolution-subscribe.h:17
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Prekini naročnino"
 
 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.h:9
-msgid "Create a new folder"
-msgstr "Ustvari novo mapo"
+#: po/tmp/evolution.xml.h:6
+msgid "About Evolution..."
+msgstr "_O Evoluciji..."
+
+#: po/tmp/evolution.xml.h:7
+msgid "Customi_ze..."
+msgstr "_Po meri..."
+
+#: po/tmp/evolution.xml.h:8
+msgid "Customize"
+msgstr "Po meri"
+
+#: po/tmp/evolution.xml.h:9
+msgid "Customize toolbars"
+msgstr "Orodne vrstice po meri"
 
-#: ui/evolution.h:10
+#: po/tmp/evolution.xml.h:10
 msgid "Display a different folder"
 msgstr "Pokaži drugo mapo"
 
-#: ui/evolution.h:11
+#: po/tmp/evolution.xml.h:11
 msgid "E_xit"
 msgstr "_Izhod"
 
-#: ui/evolution.h:12
+#: po/tmp/evolution.xml.h:12
 msgid "Evolution bar _shortcut"
-msgstr "Evolution vrstica z bližnjicami"
+msgstr "Evolucijina vrstica z bližnjicami"
+
+#: po/tmp/evolution.xml.h:13
+msgid "Exit"
+msgstr "Izhod"
 
-#: ui/evolution.h:13
+#: po/tmp/evolution.xml.h:14
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.h:14
+#: po/tmp/evolution.xml.h:15
 msgid "Getting _Started"
 msgstr "Kako _začeti"
 
-#: ui/evolution.h:15
+#: po/tmp/evolution.xml.h:16
+msgid "Import an external file format"
+msgstr "Uvozi datoteko zunanje oblike"
+
+#: po/tmp/evolution.xml.h:17
+msgid "Main toolbar"
+msgstr "Glavna orodna vrstica"
+
+#: po/tmp/evolution.xml.h:18
 msgid "Show information about Evolution"
 msgstr "Kaži podatke o Evoluciji"
 
-#: ui/evolution.h:16
+#: po/tmp/evolution.xml.h:19
 msgid "Show the _Folder Bar"
 msgstr "Kaži vrstico z _mapami"
 
-#: ui/evolution.h:17
+#: po/tmp/evolution.xml.h:20
 msgid "Show the _Shortcut Bar"
 msgstr "Kaži vrstico z bližnjicami"
 
-#: ui/evolution.h:18
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:21
+msgid "Submit Bug Report"
+msgstr "Pošlji poročilo o hrošču"
+
+#: po/tmp/evolution.xml.h:22
+msgid "Submit _Bug Report"
+msgstr "_Pošlji poročilo o hrošču"
+
+#: po/tmp/evolution.xml.h:23
+msgid "Submit bug report using Bug Buddy."
 msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy"
 
-#: ui/evolution.h:19
+#: po/tmp/evolution.xml.h:24
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.h:20
+#: po/tmp/evolution.xml.h:25
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bližnjicami"
 
-#: ui/evolution.h:21
+#: po/tmp/evolution.xml.h:26
 msgid "Using the C_ontact Manager"
 msgstr "Uporaba upravljalnika _stikov"
 
-#: ui/evolution.h:22
+#: po/tmp/evolution.xml.h:27
 msgid "Using the _Calendar"
 msgstr "Uporaba _koledarja"
 
-#: ui/evolution.h:23
+#: po/tmp/evolution.xml.h:28
 msgid "Using the _Mailer"
 msgstr "Uporaba _pošte"
 
-#: ui/evolution.h:24
+#: po/tmp/evolution.xml.h:29
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: ui/evolution.h:25
+#: po/tmp/evolution.xml.h:30
 msgid "_Appointment (FIXME)"
 msgstr "_Zmenek (FIXME)"
 
-#: ui/evolution.h:26
+#: po/tmp/evolution.xml.h:31
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: ui/evolution.h:27
-msgid "_Create New Folder..."
-msgstr "_Ustvari novo mapo..."
-
-#: ui/evolution.h:30
+#: po/tmp/evolution.xml.h:34
 msgid "_Folder"
 msgstr "_Mapa"
 
-#: ui/evolution.h:31
+#: po/tmp/evolution.xml.h:35
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.h:33
+#: po/tmp/evolution.xml.h:37
+msgid "_Import file..."
+msgstr "_Uvozi datoteko..."
+
+#: po/tmp/evolution.xml.h:38
 msgid "_Index"
 msgstr "_Kazalo"
 
-#: ui/evolution.h:34
-msgid "_Mail message (FIXME)"
-msgstr "_Pošlji sporočilo (FIXME)"
+#: po/tmp/evolution.xml.h:39
+msgid "_Mail message"
+msgstr "_Pošlji sporočilo"
 
-#: ui/evolution.h:36
+#: po/tmp/evolution.xml.h:41
 msgid "_Settings"
 msgstr "_Nastavitve"
 
-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
-msgstr "_Pošlji poročilo o hrošču"
-
-#: ui/evolution.h:38
+#: po/tmp/evolution.xml.h:42
 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
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Poskusno"
@@ -6611,15 +7414,14 @@ msgstr "Čas zaključka sestanka:"
 msgid "All Attendees"
 msgstr "Vsi udeleženi"
 
-#. 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
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "PTSČPSN"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2736
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -6627,44 +7429,623 @@ msgstr "%B %Y"
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Sedaj"
+
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
-#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
-#: widgets/misc/e-dateedit.c:1127
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
-#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
-#: widgets/misc/e-dateedit.c:1130
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: widgets/misc/e-dateedit.c:359
-msgid "Now"
-msgstr "Sedaj"
+#: widgets/misc/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr "_Išči"
 
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Skupina %i"
 
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Predmet(i) pripada(jo) tem kategorijam:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "Dostopne kategorije:"
+
+#~ msgid "External Directories"
+#~ msgstr "Zunanji imeniki"
+
+#~ msgid "Port Number:"
+#~ msgstr "Številka vrat:"
+
+#~ msgid "window2"
+#~ msgstr "okno2"
+
+#~ msgid "Headings:"
+#~ msgstr "Zaglavja:"
+
+#~ msgid "Empty days:"
+#~ msgstr "Prazni dnevi:"
+
+#~ msgid "Appointments:"
+#~ msgstr "Zmenki:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "Osvetljen dan:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "Številke dni:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "Številka trenutnega dne:"
+
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "Predmet za-opravit, ki še ni na vrsti:"
+
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "Predmet za-opravit, ki je na vrsti danes:"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "Predmet za-opravit, ki je že pretekel:"
+
+#~ msgid "Recur on the"
+#~ msgstr "Ponovitev na"
+
+#~ msgid "th day of the month"
+#~ msgstr "dan v mesecu"
+
+#~ msgid ""
+#~ "This appointment has custom recurrence rules that cannot be edited by "
+#~ "Evolution.\n"
+#~ "\n"
+#~ "However, the appointment will recur at the appropriate time and will be "
+#~ "displayed properly in the calendar views."
+#~ msgstr ""
+#~ "Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana znotraj "
+#~ "Evolucije.\n"
+#~ "\n"
+#~ "Vendar se bo zmenek ponovil pravočasno in bo  pravilno prikazan v pogledu "
+#~ "koledarja."
+
+#~ msgid "may"
+#~ msgstr "maj"
+
+#~ msgid "sept"
+#~ msgstr "sept"
+
+#~ msgid "sunday"
+#~ msgstr "nedelja"
+
+#~ msgid "monday"
+#~ msgstr "ponedeljek"
+
+#~ msgid "tuesday"
+#~ msgstr "torek"
+
+#~ msgid "tues"
+#~ msgstr "tor"
+
+#~ msgid "wednesday"
+#~ msgstr "sreda"
+
+#~ msgid "wednes"
+#~ msgstr "sre"
+
+#~ msgid "thursday"
+#~ msgstr "četrtek"
+
+#~ msgid "thur"
+#~ msgstr "čet"
+
+#~ msgid "thurs"
+#~ msgstr "čet"
+
+#~ msgid "friday"
+#~ msgstr "petek"
+
+#~ msgid "saturday"
+#~ msgstr "sobota"
+
+#~ msgid "fortnight"
+#~ msgstr "štirinajst dni"
+
+#~ msgid "min"
+#~ msgstr "min"
+
+#~ msgid "sec"
+#~ msgstr "sek"
+
+#~ msgid "tomorrow"
+#~ msgstr "jutri"
+
+#~ msgid "yesterday"
+#~ msgstr "včeraj"
+
+#~ msgid "today"
+#~ msgstr "danes"
+
+#~ msgid "last"
+#~ msgstr "zadnji"
+
+#~ msgid "this"
+#~ msgstr "ta"
+
+#~ msgid "next"
+#~ msgstr "naslednji"
+
+#~ msgid "first"
+#~ msgstr "prvi"
+
+#~ msgid "third"
+#~ msgstr "tretji"
+
+#~ msgid "fourth"
+#~ msgstr "četrti"
+
+#~ msgid "fifth"
+#~ msgstr "peti"
+
+#~ msgid "sixth"
+#~ msgstr "šesti"
+
+#~ msgid "seventh"
+#~ msgstr "sedmi"
+
+#~ msgid "eighth"
+#~ msgstr "osmi"
+
+#~ msgid "ninth"
+#~ msgstr "deveti"
+
+#~ msgid "tenth"
+#~ msgstr "deseti"
+
+#~ msgid "eleventh"
+#~ msgstr "enajsti"
+
+#~ msgid "twelfth"
+#~ msgstr "dvanajsti"
+
+#~ msgid "ago"
+#~ msgstr "nazaj"
+
+#~ msgid "Create to-do item"
+#~ msgstr "Ustvari predmet za-opravit"
+
+#~ msgid "Edit to-do item"
+#~ msgstr "Uredi predemet za-opravit"
+
+#~ msgid "Summary:"
+#~ msgstr "Povzetek:"
+
+#~ msgid "Due Date:"
+#~ msgstr "Do datuma:"
+
+#~ msgid "Item Comments:"
+#~ msgstr "Komentarji predmeta:"
+
+#~ 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:"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Prosim izberite datum na katerega hočete iti.\n"
+#~ "Ko klikente na dan boste samodejno šli\n"
+#~ "na ta datum."
+
+#~ msgid "Time display"
+#~ msgstr "Prikaz časa"
+
+#~ msgid "Time format"
+#~ msgstr "Oblika izpisa časa"
+
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12 urna (dop./pop.)"
+
+#~ msgid "24-hour"
+#~ msgstr "24 urna"
+
+#~ msgid "Weeks start on"
+#~ msgstr "Tedni se začnejo v"
+
+#~ msgid "Day range"
+#~ msgstr "Razpon dni"
+
+#~ msgid ""
+#~ "Please select the start and end hours you want\n"
+#~ "to be displayed in the day view and week view.\n"
+#~ "Times outside this range will not be displayed\n"
+#~ "by default."
+#~ msgstr ""
+#~ "Prosim izberite ure začetka in konca dneva, ki naj\n"
+#~ "bodo prikazane v dnevnem in tedenskem pogledu.\n"
+#~ "Časi izven tega razpona ne bodo samodejno prikazani"
+
+#~ msgid "Day start:"
+#~ msgstr "Začetek dneva:"
+
+#~ msgid "Day end:"
+#~ msgstr "Konec dneva:"
+
+#~ msgid "Colors for display"
+#~ msgstr "Barve za prikaz"
+
+#~ msgid "Show on TODO List:"
+#~ msgstr "Pokaži v seznamu za-opravit:"
+
+#~ msgid "To Do List style options:"
+#~ msgstr "Slog seznama za-opravit:"
+
+#~ msgid "Highlight overdue items"
+#~ msgstr "Osvetli pretečene predmete"
+
+#~ msgid "Highlight not yet due items"
+#~ msgstr "Osvetli še nepretečene predmete"
+
+#~ msgid "Highlight items due today"
+#~ msgstr "Osvetli predmete z današnjim rokom"
+
+#~ msgid "To Do List Properties"
+#~ msgstr "Lastnosti seznama Za-opravit"
+
+#~ msgid "To Do List"
+#~ msgstr "Seznam Za-opravit"
+
+#~ msgid "Preferences"
+#~ msgstr "Nastavitve"
+
+#~ msgid "Alarm Properties"
+#~ msgstr "Lastnosti alarma"
+
+#~ msgid "Beep on display alarms"
+#~ msgstr "Piskaj ob zaslonskih alarmih"
+
+#~ 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 "
+
+#~ msgid "Could not create summary"
+#~ msgstr "Nisem mogel ustvariti povzetka"
+
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Ne morem dobiti sporočila: %s"
+
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "Za branje pošte dostavljene na krajevni sistem in za shranjevanje pošte na "
+#~ "krajevni disk."
+
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "Nisem mogel preimenovati mape %s v %s: cilj že obstaja"
+
+#~ msgid "Could not open summary %s"
+#~ msgstr "Nisem mogel odpreti povzetka %s"
+
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Povzetek se ne ujema, X-Evolucije glava manjka"
+
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Ne morem kopirati podatkov v izhodno datoteko: %s"
+
+#~ msgid "Could not load or create summary"
+#~ msgstr "Nisem mogel naložiti ali ustvariti povzetka"
+
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Nisem mogel preimenovati mape `%s': %s že obstaja"
+
+#~ msgid "MH folders may not be nested."
+#~ msgstr "MH mape ne morejo biti gnezdene"
+
+#~ msgid "Deleted"
+#~ msgstr "Zbrisano"
+
+#~ msgid "Draft"
+#~ msgstr "Osnutek"
+
+#~ msgid "Set Flag"
+#~ msgstr "Postavi označbo"
+
+#~ msgid "does not match regex"
+#~ msgstr "ne ustreza z regularnemu izrazu"
+
+#~ msgid "matches regex"
+#~ msgstr "ustreza regularnemu izrazu"
+
+#~ msgid "Cannot initialize Evolution's mail storage hash."
+#~ msgstr "Ne morem inicializirati Evolucijine komponente za razpršeno shrambo."
+
+#~ msgid "Custom search"
+#~ msgstr "Iskanje po meri"
+
+#~ msgid "Open in New Window"
+#~ msgstr "Odpri v novem oknu"
+
+#~ msgid "Edit Message"
+#~ msgstr "Uredi sporočilo"
+
+#~ msgid "Forward Message"
+#~ msgstr "Sporočilo posreduj naprej"
+
+#~ msgid "Move Message"
+#~ msgstr "Prestavi sporočilo"
+
+#~ msgid "Copy Message"
+#~ msgstr "Kopiraj sporočilo"
+
+#~ msgid "Full Search"
+#~ msgstr "Polno iskanje"
+
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Nimate nastavljenih izvorov pošte"
+
+#~ msgid ""
+#~ "Enter your name and email address to be used in outgoing mail. You may also, "
+#~ "optionally, enter the name of your organization, and the name of a file to "
+#~ "read your signature from."
+#~ msgstr ""
+#~ "Vnesite svoje ime in e-poštni naslov, ki naj se uporablja v izhodni pošti Po "
+#~ "želji lahko vnesete tudi ime vaše organizacije in ime datoteke iz katere naj "
+#~ "se prebere vaš podpis."
+
+#~ msgid "Signature File"
+#~ msgstr "Datoteka s podpisom"
+
+#~ msgid "Detect supported types..."
+#~ msgstr "Ugotovi podprte tipe..."
+
+#~ 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:"
+
+#~ msgid ""
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Izberite vrsto poštnega strežnika, ki ga uporabljate, in nastavite zanj  "
+#~ "potrebne podatke.\n"
+#~ "\n"
+#~ "Če strežnik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
+#~ "podprte tipe...\" potem, ko boste vnesli ostale podatke."
+
+#~ msgid ""
+#~ "Select the kind of news server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
+#~ msgstr ""
+#~ "Izberite vrsto poštnega strežnika, ki ga uporabljate, in nastavite zanj  "
+#~ "potrebne podatke.\n"
+#~ "\n"
+#~ "Če strežnik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi podprte "
+#~ "tipe...\", po tem ko boste vnesli ostale podatke."
+
+#~ msgid "Mail transport type:"
+#~ msgstr "Tip prenosa pošte:"
+
+#~ msgid "Add Identity"
+#~ msgstr "Dodaj identiteto"
+
+#~ msgid "Edit Identity"
+#~ msgstr "Uredi identiteto"
+
+#~ msgid "Edit Source"
+#~ msgstr "Uredi izbor"
+
+#~ msgid "Add News Server"
+#~ msgstr "Dodaj novičarski strežnik"
+
+#~ msgid "Edit News Server"
+#~ msgstr "Uredi novičarski strežnik"
+
+#~ msgid "Testing \"%s\""
+#~ msgstr "Preizkušam \"%s\""
+
+#~ msgid "The connection was successful!"
+#~ msgstr "Povezava je bila uspešna!"
+
+#~ msgid "Querying authorization capabilities of \"%s\""
+#~ msgstr "Poizvedujem o možnostih avtentifikacije pri \"%s\""
+
+#~ msgid "Query authorization at \"%s\""
+#~ msgstr "Poizvedi o možnostih avtentifikacije pri \"%s\""
+
+#~ msgid ""
+#~ "Welcome to the Evolution Mail configuration wizard!\n"
+#~ "By filling in some information about your email\n"
+#~ "settings, you can start sending and receiving email\n"
+#~ "right away. Click Next to continue."
+#~ msgstr ""
+#~ "Dobrodošli v nastavitvenem čarovniku pošte!\n"
+#~ "Z vpisom nekaterih podatkov o vaših nastavitvah e-pošte\n"
+#~ "lahko takoj pričnete pošiljati in sprejemati pošto\n"
+#~ "Kliknite naprej za nadaljevanje."
+
+#~ msgid "Mail Transport"
+#~ msgstr "Prenos Pošte"
+
+#~ msgid "Identities"
+#~ msgstr "Identitete"
+
+#~ msgid "Address"
+#~ msgstr "Naslov"
+
+#~ msgid "Mail Sources"
+#~ msgstr "Izvori pošte"
+
+#~ msgid "News Servers"
+#~ msgstr "Novičarski strežniki"
+
+#~ msgid "News Sources"
+#~ msgstr "Viri novic"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Pošiljaj sporočila v HTML obliki"
+
+#~ msgid "Mark message as seen [ms]: "
+#~ msgstr "Označi sporočilo kot viden [ms]:"
+
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Nisem mogel ustvariti cevi do %s: %s"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Nisem mogel izvršiti %s: %s\n"
+
+#~ msgid "No GPG/PGP support available in this copy of Evolution."
+#~ msgstr "V tej različici Evolucije GPG/PGP podpora ni prisotna."
+
+#~ msgid " (XXX unread)"
+#~ msgstr " (XXX neprebran)"
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Pošlji sporočilo brez navedene zadeve"
+
+#~ msgid "Expunge \"%s\""
+#~ msgstr "Uniči \"%s\""
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Izbiram sporočila v mapi \"%s\""
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Izberi sporočila v mapi \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Izbiram sporočilo %d od %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Osveži mape v \"%s\""
+
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "Prilagam sporočilo iz mape \"%s\""
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Priloži sporočilo iz mape \"%s\""
+
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "Posredujem sporočilo \"%s\""
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "Posredujem sporočilo brez navedene zadeve"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Posreduj sporočilo \"%s\""
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Posreduj sporočilo brez navedene zadeve"
+
+#~ msgid ""
+#~ "Failed to generate mime part from message while generating forwarded message."
+#~ msgstr ""
+#~ "Nisem uspel generirati mime dela iz sporočila med generiranjem posredovanega "
+#~ "sporočila."
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "Nalagam \"%s\""
+
+#~ msgid "Load \"%s\""
+#~ msgstr "Naloži \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Ustvarjam \"%s\""
+
+#~ msgid "Exception while reporting result to shell component listener."
+#~ msgstr "Izjema med sporočanjem rezultatov lupini"
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Uskladi \"%s\""
+
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "Prikazujem sporočilo z UID \"%s\""
+
+#~ msgid "Clearing message display"
+#~ msgstr "Čistim prikazano sporočilo"
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Prikaži sporočilo z UID \"%s\""
+
+#~ msgid "Clear message display"
+#~ msgstr "Čisti prikaz sporočila"
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "Odpiram sporočila iz  mape \"%s\""
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "Odpri sporočilo iz \"%s\""
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Gledam sporočilo iz mape \"%s\""
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "Glej sporočilo iz \"%s\""
+
+#~ msgid "Don't know protocol to open URI `%s'"
+#~ msgstr "Ne poznam protokola za odpiranje URIja `%s'"
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "Obnavljam pogled sporočil"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "Obnovi pogled sporočil"
+
+#~ msgid "Threading message list"
+#~ msgstr "Nitim seznam sporočil"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "N_ov strežnik imenikov"
+
+#~ msgid "_Actions"
+#~ msgstr "_Dejanja"
+
+#~ msgid "New Ca_lendar"
+#~ msgstr "Nov Ko_ledar"
+
+#~ msgid "_New appointment..."
+#~ msgstr "_Nov zmenek..."
+
+#~ msgid "_Save Calendar As"
+#~ msgstr "_Shrani koledar kot"
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "_Ustvari novo mapo..."
+
 #~ msgid "Quick Search"
 #~ msgstr "Hitro iskanje"
 
 #~ msgid "Bad storage URL (no server): %s"
 #~ msgstr "Neveljaven URL shrambe (ni strežnika): %s"
 
-#~ msgid "Retrieving messages : %s"
-#~ msgstr "Prenašam sporočilo : %s"
-
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "FIXME: _Zmenek"
-
-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "FIXME: Za_hteva po sestanku"
-
 #~ msgid "Ne_xt"
 #~ msgstr "_Naslednji"
 
@@ -6677,9 +8058,6 @@ msgstr "Skupina %i"
 #~ msgid "FIXME: New _Letter to Contact"
 #~ msgstr "FIXME: Novo _pismo za stik"
 
-#~ msgid "FIXME: New _Message to Contact"
-#~ msgstr "FIXME: Novo sporočilo za stik"
-
 #~ msgid "FIXME: New Meetin_g with Contact"
 #~ msgstr "FIXME: Nov sestanek s stikom"
 
@@ -6743,27 +8121,6 @@ msgstr "Skupina %i"
 #~ msgid "FIXME: _Delete"
 #~ msgstr "FIXME: _Zbriši"
 
-#~ msgid "FIXME: _New Task"
-#~ msgstr "FIXME: _Nova naloga"
-
-#~ msgid "FIXME: S_end Status Report"
-#~ msgstr "FIXME: Pošlji poročilo stanja"
-
-#~ msgid "FIXME: _Mark Complete"
-#~ msgstr "FIXME: _Označi kot dokončano"
-
-#~ msgid "FIXME: S_kip Occurrence"
-#~ msgstr "FIXME: Preskoči ponovitev"
-
-#~ msgid "FIXME: Assig_n Task"
-#~ msgstr "FIXME: Dodali _nalogo"
-
-#~ msgid "FIXME: _Reply"
-#~ msgstr "FIXME: _Odgovori"
-
-#~ msgid "FIXME: Reply to A_ll"
-#~ msgstr "FIXME: Odgovori v_sem"
-
 #~ msgid "FIXME: Save and Close"
 #~ msgstr "FIXME: Shrani in zapri"
 
@@ -6788,9 +8145,6 @@ msgstr "Skupina %i"
 #~ msgid "S_ubject:"
 #~ msgstr "Z_adeva:"
 
-#~ msgid "Owner:"
-#~ msgstr "Lastnik:"
-
 #~ msgid ""
 #~ "Not Started\n"
 #~ "In Progress\n"
@@ -6814,15 +8168,6 @@ msgstr "Skupina %i"
 #~ msgid "Resources:"
 #~ msgstr "Viri:"
 
-#~ msgid "Start Date"
-#~ msgstr "Datum pričetka"
-
-#~ msgid "End Date"
-#~ msgstr "Datum konca"
-
-#~ msgid "Geographical Position"
-#~ msgstr "Zemljepisna lega"
-
 #~ msgid "Last Modification Date"
 #~ msgstr "Datum zadnje spremembe"
 
@@ -6835,12 +8180,6 @@ msgstr "Skupina %i"
 #~ msgid "% Complete"
 #~ msgstr "% končano"
 
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "?"
-#~ msgstr "?"
-
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "FIXME: Ko_kedar..."
 
@@ -6943,9 +8282,6 @@ msgstr "Skupina %i"
 #~ msgid "To-do list"
 #~ msgstr "Seznam za opravit"
 
-#~ msgid "Add..."
-#~ msgstr "Dodaj..."
-
 #~ msgid "Edit..."
 #~ msgstr "Uredi..."
 
@@ -6985,9 +8321,6 @@ msgstr "Skupina %i"
 #~ msgid "Select recipients' addresses"
 #~ msgstr "Izberi naslove prejemnikov"
 
-#~ msgid "Name"
-#~ msgstr "Ime"
-
 #~ msgid "To: >>"
 #~ msgstr "Za: >>"
 
@@ -7006,51 +8339,15 @@ msgstr "Skupina %i"
 #~ msgid "label8"
 #~ msgstr "oznaka8"
 
-#~ msgid "About to save changes to message..."
-#~ msgstr "Shranil bom spremembe sporočila"
-
 #~ msgid "Load a previously saved message"
 #~ msgstr "Naloži prej shranjeno sporočilo"
 
-#~ msgid "_Save as..."
-#~ msgstr "Shrani kot..."
-
-#~ msgid "Save in _folder..."
-#~ msgstr "Shrani v _mapo..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Shrani sporočilo v izbrano mapo"
-
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_Vstavi datoteko z besedilom... (FIXME)"
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Vstavi datoteko v sporočilo kot besedilo"
-
 #~ msgid "_Close..."
 #~ msgstr "_Zapri..."
 
 #~ msgid "_Format"
 #~ msgstr "_Oblika izpisa"
 
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Pošlji pošto v HTML obliki"
-
-#~ msgid "Show _attachments"
-#~ msgstr "Kaži priloge"
-
-#~ msgid "Show/hide attachments"
-#~ msgstr "Kaži/skrij priloge"
-
-#~ msgid "Send this message"
-#~ msgstr "Pošlji to sporočilo"
-
-#~ msgid "Attach"
-#~ msgstr "Priloži"
-
 #~ msgid "Check for new mail"
 #~ msgstr "Preveri za novo pošto"
 
@@ -7066,21 +8363,6 @@ msgstr "Skupina %i"
 #~ msgid "Waiting for user to enter data"
 #~ msgstr "Čakam na uporabnika, da vpiše podatek"
 
-#~ msgid "Online Status"
-#~ msgstr "Stanje priklopa"
-
-#~ msgid "From"
-#~ msgstr "Od"
-
-#~ msgid "To"
-#~ msgstr "Za"
-
-#~ msgid "Size"
-#~ msgstr "Velikost"
-
-#~ msgid "Show _shortcut bar"
-#~ msgstr "Kaži vrstico z _bližnjicami"
-
 #~ msgid "Show _folder bar"
 #~ msgstr "Kaži vrstico z _mapami"
 
@@ -7090,9 +8372,6 @@ msgstr "Skupina %i"
 #~ msgid "Fields"
 #~ msgstr "Polja"
 
-#~ msgid "Grouping"
-#~ msgstr "Grupiranje"
-
 #~ msgid "Sort"
 #~ msgstr "Sortiranje"