various syntax checking

svn path=/trunk/; revision=4471

7 files changed, 6277 insertions, 3011 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index b8d8cad41f..24ae3515d0 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-02  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* es.po,hu.po,it.po,sl.po: various syntax checkings (missing %s, %S
+	instead of %s etc)
+
 2000-07-30  Valek Filippov  <frob@df.ru>
 
 	* ru.po: updated russian translation.
diff --git a/po/da.po b/po/da.po
index 20792d6456..24705a774b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution beta\n"
-"POT-Creation-Date: 2000-07-11 19:50+0200\n"
+"POT-Creation-Date: 2000-08-02 16:39+0200\n"
 "PO-Revision-Date: 2000-07-22 00:38+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -715,7 +715,7 @@ msgid "Delete a contact"
 msgstr "Fjern kontaktperson"
 
 #: addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:1039
+#: addressbook/gui/component/addressbook.c:1034
 msgid "As _Table"
 msgstr "Som _tabel"
 
@@ -751,20 +751,20 @@ msgstr ""
 "er det nřdvendigt at hente og installere OpenLDAP og\n"
 "rekompilere og installere evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:943
+#: addressbook/gui/component/addressbook.c:938
 #: addressbook/gui/minicard/e-minicard.c:330
 msgid "Save as VCard"
 msgstr "Gem som vCard"
 
-#: addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/component/addressbook.c:1005
 msgid "* Click here to add a contact *"
 msgstr "* Klik her for at tilfřje en kontakt *"
 
-#: addressbook/gui/component/addressbook.c:1046
+#: addressbook/gui/component/addressbook.c:1041
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
-#: addressbook/gui/component/addressbook.c:1097
+#: addressbook/gui/component/addressbook.c:1092
 msgid "The URI that the Folder Browser will display"
 msgstr "Uri'en som mappebladreren vil vise"
 
@@ -810,7 +810,7 @@ msgid "g"
 msgstr "g"
 
 #: addressbook/gui/component/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:98
+#: calendar/cal-util/timeutil.c:131
 msgid "h"
 msgstr "h"
 
@@ -1108,11 +1108,11 @@ msgstr "Modsat pĺ lige sider"
 msgid "Header/Footer"
 msgstr "Top-/bundtekst"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:544
 msgid "am"
 msgstr " "
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:543
 msgid "pm"
 msgstr " "
 
@@ -1241,7 +1241,7 @@ msgstr "I dag"
 msgid "Go to present time"
 msgstr "Gĺ til nutiden"
 
-#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
+#: calendar/gui/calendar-commands.c:554
 msgid "Next"
 msgstr "Nćste"
 
@@ -1725,7 +1725,7 @@ msgid "Due Date"
 msgstr "Fćrdig-dato"
 
 #: calendar/gui/gncal-todo.c:436 calendar/gui/prop.c:605
-#: mail/message-list.c:472
+#: mail/message-list.c:474
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -2352,45 +2352,45 @@ msgstr "Emne:"
 msgid "Enter the subject of the mail"
 msgstr "Indtast emnet for meddelelsen"
 
-#: composer/e-msg-composer.c:447
+#: composer/e-msg-composer.c:444
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: composer/e-msg-composer.c:458
+#: composer/e-msg-composer.c:455
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl ved gemning af fil: %s"
 
-#: composer/e-msg-composer.c:478
+#: composer/e-msg-composer.c:475
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl ved indlćsning af fil: %s"
 
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:494
 msgid "Discard this message?"
 msgstr "Fjern denne meddelelse"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:511
 msgid "Open file"
 msgstr "Ĺbn fil"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:623
 msgid "That file does not exist."
 msgstr "Den fil eksisterer ikke."
 
-#: composer/e-msg-composer.c:636
+#: composer/e-msg-composer.c:633
 msgid "That is not a regular file."
 msgstr "Dette er ikke en almindelig fil."
 
-#: composer/e-msg-composer.c:646
+#: composer/e-msg-composer.c:643
 msgid "That file exists but is not readable."
 msgstr "Den fil eksisterer men kan ikke lćses."
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:653
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Den fil sĺ ud til at vćre tilgćngelig, men open(2) fejlede."
 
-#: composer/e-msg-composer.c:678
+#: composer/e-msg-composer.c:675
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2398,152 +2398,120 @@ msgstr ""
 "Filen er meget stor (mere end 100 k).\n"
 "Er du sikker pĺ at du řnsker at indsćtte den?"
 
-#: composer/e-msg-composer.c:699
+#: composer/e-msg-composer.c:696
 msgid "An error occurred while reading the file."
 msgstr "En fejl skete ved lćsning af filen."
 
-#: composer/e-msg-composer.c:795 shell/e-shell-view-menu.c:438
+#: composer/e-msg-composer.c:792 shell/e-shell-view-menu.c:438
 msgid "_File"
 msgstr "_Fil"
 
-#: composer/e-msg-composer.c:801
+#: composer/e-msg-composer.c:798
 msgid "_Open..."
 msgstr "_Ĺbn..."
 
-#: composer/e-msg-composer.c:802
+#: composer/e-msg-composer.c:799
 msgid "Load a previously saved message"
 msgstr "Indlćs en tidligere gemt besked"
 
-#: composer/e-msg-composer.c:810
+#: composer/e-msg-composer.c:807
 msgid "_Save..."
 msgstr "Gem..."
 
-#: composer/e-msg-composer.c:811
+#: composer/e-msg-composer.c:808
 msgid "Save message"
 msgstr "Gem meddelelsen"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:816
 msgid "_Save as..."
 msgstr "_Gem som..."
 
-#: composer/e-msg-composer.c:820
+#: composer/e-msg-composer.c:817
 msgid "Save message with a different name"
 msgstr "Gem meddelelse med et andet navn"
 
-#: composer/e-msg-composer.c:828
+#: composer/e-msg-composer.c:825
 msgid "Save in _folder..."
 msgstr "Gem i _mappe..."
 
-#: composer/e-msg-composer.c:829
+#: composer/e-msg-composer.c:826
 msgid "Save the message in a specified folder"
 msgstr "Gem meddelelsen i en specificeret mappe"
 
-#: composer/e-msg-composer.c:838
+#: composer/e-msg-composer.c:835
 msgid "_Insert text file... (FIXME)"
 msgstr "_Indsćt tekstfil..."
 
-#: composer/e-msg-composer.c:839
+#: composer/e-msg-composer.c:836
 msgid "Insert a file as text into the message"
 msgstr "Indsćt en fil som tekst i meddelelsen"
 
-#: composer/e-msg-composer.c:848
+#: composer/e-msg-composer.c:845
 msgid "_Send"
 msgstr "_Send"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:846
 msgid "Send the message"
 msgstr "Send meddelelsen"
 
-#: composer/e-msg-composer.c:859
+#: composer/e-msg-composer.c:856
 msgid "_Close..."
 msgstr "_Luk..."
 
-#: composer/e-msg-composer.c:860
+#: composer/e-msg-composer.c:857
 msgid "Quit the message composer"
 msgstr "Afslut beskedskriver"
 
-#: composer/e-msg-composer.c:873 shell/e-shell-view-menu.c:480
+#: composer/e-msg-composer.c:870 shell/e-shell-view-menu.c:480
 msgid "_Edit"
 msgstr "_Redigér"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:881
 msgid "_Format"
 msgstr "_Format"
 
-#: composer/e-msg-composer.c:890
+#: composer/e-msg-composer.c:887
 msgid "HTML"
 msgstr "HTML"
 
-#: composer/e-msg-composer.c:891
+#: composer/e-msg-composer.c:888
 msgid "Send the mail in HTML format"
 msgstr "Send brevet i HTML format"
 
-#: composer/e-msg-composer.c:904 shell/e-shell-view-menu.c:387
+#: composer/e-msg-composer.c:901 shell/e-shell-view-menu.c:387
 #: shell/e-shell-view-menu.c:491
 msgid "_View"
 msgstr "_Vis"
 
-#: composer/e-msg-composer.c:910
+#: composer/e-msg-composer.c:907
 msgid "Show _attachments"
 msgstr "Vis _bilag"
 
-#: composer/e-msg-composer.c:911
+#: composer/e-msg-composer.c:908
 msgid "Show/hide attachments"
 msgstr "Vis/skjul bilag"
 
-#: composer/e-msg-composer.c:944
+#: composer/e-msg-composer.c:941
 msgid "Send"
 msgstr "Send"
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:942
 msgid "Send this message"
 msgstr "Send denne meddelelse"
 
-#: composer/e-msg-composer.c:954
+#: composer/e-msg-composer.c:951
 msgid "Attach"
 msgstr "Vedhćft"
 
-#: composer/e-msg-composer.c:955
+#: composer/e-msg-composer.c:952
 msgid "Attach a file"
 msgstr "Vedhćft en fil"
 
-#: composer/e-msg-composer.c:1142
+#: composer/e-msg-composer.c:1139
 msgid "Compose a message"
 msgstr "Skriv en meddelelse"
 
-#: filter/filter-editor.c:198
-msgid "Edit Filter"
-msgstr "Redigér filter"
-
-#: filter/filter-editor.c:198
-msgid "Create filter"
-msgstr "Opret filter"
-
-#: filter/filter-editor.c:209
-msgid "Back"
-msgstr "Tilbage"
-
-#: filter/filter-editor.c:211
-msgid "Finish"
-msgstr "Fuldfřr"
-
-#: filter/filter-editor.c:212
-msgid "Cancel"
-msgstr "Afbryd"
-
-#: filter/filter-editor.c:216
-msgid "Apply"
-msgstr "Anvend"
-
-#: filter/filter-editor.c:233
-msgid ""
-"<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
-"continue forwards to customise it.</p>"
-msgstr ""
-"<h2>Opret filtreringsregel</h2><p>Vćlg en af de basale regler ovenfor, "
-"fortsćt sĺ fremad for at tilpasse den.</p>"
-
-#: mail/component-factory.c:193
+#: mail/component-factory.c:188
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
@@ -2588,8 +2556,9 @@ msgid "Forward this message"
 msgstr "Videresend denne meddelelse"
 
 #: mail/folder-browser-factory.c:35
-msgid "Refile"
-msgstr "Omgem"
+#, fuzzy
+msgid "Move"
+msgstr "man"
 
 #: mail/folder-browser-factory.c:35
 msgid "Move message to a new folder"
@@ -2607,27 +2576,33 @@ msgstr "Slet denne meddelelse"
 msgid "_Threaded Message List"
 msgstr "_Trĺdet beskedliste"
 
-#: mail/folder-browser-factory.c:71
+#: mail/folder-browser-factory.c:72
+msgid "_Mark all messages seen"
+msgstr ""
+
+#: mail/folder-browser-factory.c:78
 msgid "_Expunge"
 msgstr "_Udslet"
 
-#: mail/folder-browser-factory.c:77
-msgid "_Filter Druid ..."
+#: mail/folder-browser-factory.c:84
+#, fuzzy
+msgid "Mail _Filters ..."
 msgstr "_Filter Druid ..."
 
-#: mail/folder-browser-factory.c:83
-msgid "_Virtual Folder Druid ..."
-msgstr "_Virtuel folder Druid ..."
+#: mail/folder-browser-factory.c:90
+#, fuzzy
+msgid "_vFolder Editor ..."
+msgstr "_Filter Druid ..."
 
-#: mail/folder-browser-factory.c:89
+#: mail/folder-browser-factory.c:96
 msgid "_Mail Configuration ..."
 msgstr "_Post konfiguration ..."
 
-#: mail/folder-browser-factory.c:95
+#: mail/folder-browser-factory.c:102
 msgid "Forget _Passwords"
 msgstr "Glem _adgangskoder"
 
-#: mail/mail-config.c:262
+#: mail/mail-config.c:688
 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 "
@@ -2637,51 +2612,51 @@ msgstr ""
 "eventuelt angive navnet pĺ din organisation, og navnet pĺ den fil som din "
 "signatur kan lćses fra."
 
-#: mail/mail-config.c:277
+#: mail/mail-config.c:701
 msgid "Full name:"
 msgstr "Fulde navn:"
 
-#: mail/mail-config.c:305
+#: mail/mail-config.c:725
 msgid "Email address:"
 msgstr "E-post adresse:"
 
-#: mail/mail-config.c:328
+#: mail/mail-config.c:740
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.c:340
+#: mail/mail-config.c:751
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.c:345
+#: mail/mail-config.c:756
 msgid "Signature File"
 msgstr "Signaturfil"
 
-#: mail/mail-config.c:730 mail/mail-config.c:824 mail/mail-config.c:1637
+#: mail/mail-config.c:1167
 msgid "Server:"
 msgstr "Tjener:"
 
-#: mail/mail-config.c:737
+#: mail/mail-config.c:1173
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: mail/mail-config.c:744
+#: mail/mail-config.c:1179
 msgid "Path:"
 msgstr "Sti:"
 
-#: mail/mail-config.c:751 mail/mail-config.c:831
+#: mail/mail-config.c:1187
 msgid "Authentication:"
 msgstr "Autentisering:"
 
-#: mail/mail-config.c:763 mail/mail-config.c:843
+#: mail/mail-config.c:1199
 msgid "Detect supported types..."
 msgstr "Sřg efter understřttede typer..."
 
-#: mail/mail-config.c:789 mail/mail-config.c:865
-msgid "Test these values before continuing"
-msgstr "Test disse vćrdier fřr du gĺr videre"
+#: mail/mail-config.c:1222
+msgid "Test Settings"
+msgstr ""
 
-#: mail/mail-config.c:976
+#: mail/mail-config.c:1344 mail/mail-config.c:1392
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -2695,66 +2670,50 @@ msgstr ""
 "Hvis tjenesten behřver autentifikation kan du klikke pĺ knappen med 'find "
 "understřttede typer' efter at have angivet de andre informationer."
 
-#: mail/mail-config.c:994
-msgid "Select the method you would like to use to deliver your mail."
-msgstr "Vćlg den metode som du gerne vil bruge til at aflevere din post."
-
-#: mail/mail-config.c:1179 mail/mail-config.c:1258
-msgid "Mail Configuration"
-msgstr "E-post konfiguration"
-
-#. Identity page
-#: mail/mail-config.c:1196
-msgid "Identity"
-msgstr "Identitet"
-
-#. Source page
-#: mail/mail-config.c:1215
-msgid "Mail Source"
-msgstr "E-postkilde"
-
-#. Transport page
-#: mail/mail-config.c:1236
-msgid "Mail Transport"
-msgstr "E-post transport"
+#: mail/mail-config.c:1368
+#, fuzzy
+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 ""
+"vćlg den type postprogram du har, og angiv den relevante information om "
+"det,\n"
+"\n"
+"Hvis tjenesten behřver autentifikation kan du klikke pĺ knappen med 'find "
+"understřttede typer' efter at have angivet de andre informationer."
 
-#: mail/mail-config.c:1359
+#: mail/mail-config.c:1434
 msgid "Edit Identity"
 msgstr "Redigér identitet"
 
-#: mail/mail-config.c:1361
+#: mail/mail-config.c:1436
 msgid "Add Identity"
 msgstr "Tilfřj identitet"
 
-#: mail/mail-config.c:1504
+#: mail/mail-config.c:1515
 msgid "Edit Source"
 msgstr "Redigér kilde"
 
-#: mail/mail-config.c:1506
+#: mail/mail-config.c:1517
 msgid "Add Source"
 msgstr "Tilfřj kilde"
 
-#. "\n\n"
-#. "If the server requires authentication, you can click the "
-#. "\"Detect supported types...\" button after entering "
-#. "the other information."
-#: mail/mail-config.c:1616
-msgid "Enter the hostname of the News Server you have."
-msgstr "Indtast vćrtsnavnet pĺ den nyhedsserver du har."
-
-#: mail/mail-config.c:1672
+#: mail/mail-config.c:1598
 msgid "Edit News Server"
 msgstr "Redigér nyhedsserver"
 
-#: mail/mail-config.c:1674
+#: mail/mail-config.c:1600
 msgid "Add News Server"
 msgstr "Tilfřj nyhedsserver"
 
-#: mail/mail-ops.c:374
+#: mail/mail-ops.c:393
 msgid "Fetching mail"
 msgstr "Henter post"
 
-#: mail/mail-ops.c:386
+#: mail/mail-ops.c:405
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -2762,8 +2721,9 @@ msgstr ""
 "Denne besked har intet emne.\n"
 "Skal den sendes alligevel?"
 
-#: mail/mail-ops.c:774
-msgid "Refile message(s) to"
+#: mail/mail-ops.c:791
+#, fuzzy
+msgid "Move message(s) to"
 msgstr "Omgem meddelelser i"
 
 #: mail/mail-threads.c:483
@@ -2790,31 +2750,31 @@ msgstr "Kunne ikke oprette dialogboks."
 msgid "User cancelled query."
 msgstr "Bruger annullerede forespřrgsel."
 
-#: mail/message-list.c:458
+#: mail/message-list.c:456
 msgid "Online Status"
 msgstr "Opkoblet status"
 
-#: mail/message-list.c:486
+#: mail/message-list.c:492
 msgid "From"
 msgstr "Fra"
 
-#: mail/message-list.c:493
+#: mail/message-list.c:499
 msgid "Subject"
 msgstr "Emne"
 
-#: mail/message-list.c:500
+#: mail/message-list.c:506
 msgid "Date"
 msgstr "Dato"
 
-#: mail/message-list.c:507
+#: mail/message-list.c:513
 msgid "Received"
 msgstr "Modtaget"
 
-#: mail/message-list.c:514
+#: mail/message-list.c:520
 msgid "To"
 msgstr "Til"
 
-#: mail/message-list.c:521
+#: mail/message-list.c:527
 msgid "Size"
 msgstr "Střrrelse"
 
@@ -3044,15 +3004,15 @@ msgstr "Vis information om Evolution"
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:339
+#: shell/e-shell-view.c:342
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:731
+#: shell/e-shell-view.c:734
 msgid "None"
 msgstr "Ingen"
 
-#: shell/e-shell-view.c:735
+#: shell/e-shell-view.c:738
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
@@ -3193,15 +3153,15 @@ msgstr ""
 "Tak\n"
 "Holdet bag Evolution\n"
 
-#: shell/main.c:124
+#: shell/main.c:128
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan ikke initialisere Evolution-skallen."
 
-#: shell/main.c:162
+#: shell/main.c:166
 msgid "Cannot initialize the configuration system."
 msgstr "Kan ikke initialisere konfigurerings-systemet."
 
-#: shell/main.c:168
+#: shell/main.c:172
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo-komponentsystemet."
 
@@ -3361,6 +3321,58 @@ msgstr "..."
 msgid "Group %i"
 msgstr "Gruppe %i"
 
+#~ msgid "Edit Filter"
+#~ msgstr "Redigér filter"
+
+#~ msgid "Create filter"
+#~ msgstr "Opret filter"
+
+#~ msgid "Back"
+#~ msgstr "Tilbage"
+
+#~ msgid "Finish"
+#~ msgstr "Fuldfřr"
+
+#~ msgid "Cancel"
+#~ msgstr "Afbryd"
+
+#~ msgid "Apply"
+#~ msgstr "Anvend"
+
+#~ msgid ""
+#~ "<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
+#~ "continue forwards to customise it.</p>"
+#~ msgstr ""
+#~ "<h2>Opret filtreringsregel</h2><p>Vćlg en af de basale regler ovenfor, "
+#~ "fortsćt sĺ fremad for at tilpasse den.</p>"
+
+#~ msgid "Refile"
+#~ msgstr "Omgem"
+
+#~ msgid "_Virtual Folder Druid ..."
+#~ msgstr "_Virtuel folder Druid ..."
+
+#~ msgid "Test these values before continuing"
+#~ msgstr "Test disse vćrdier fřr du gĺr videre"
+
+#~ msgid "Select the method you would like to use to deliver your mail."
+#~ msgstr "Vćlg den metode som du gerne vil bruge til at aflevere din post."
+
+#~ msgid "Mail Configuration"
+#~ msgstr "E-post konfiguration"
+
+#~ msgid "Identity"
+#~ msgstr "Identitet"
+
+#~ msgid "Mail Source"
+#~ msgstr "E-postkilde"
+
+#~ msgid "Mail Transport"
+#~ msgstr "E-post transport"
+
+#~ msgid "Enter the hostname of the News Server you have."
+#~ msgstr "Indtast vćrtsnavnet pĺ den nyhedsserver du har."
+
 #~ msgid "Cut selected region into the clipboard"
 #~ msgstr "Klip valgt omrĺde ud til klippebordet"
 
diff --git a/po/es.po b/po/es.po
index a2381163f8..c820415c13 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,21 +2,19 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Héctor García Álvarez <hector@scouts-es.org>, 2000.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2000-07-10 21:51-0400\n"
+"Project-Id-Version: evolution 0.0.3\n"
+"POT-Creation-Date: 2000-08-02 16:35+0200\n"
 "PO-Revision-Date: 2000-05-03 14:26+0200\n"
 "Last-Translator: Héctor García Alvarez <hector@scouts-es.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/gui/component/addressbook-factory.c:58
-#: calendar/gui/calendar-pilot-sync.c:138 calendar/gui/main.c:68
+#: addressbook/gui/component/addressbook-factory.c:59 calendar/gui/main.c:68
 #, fuzzy
 msgid "Could not initialize Bonobo"
 msgstr "Componenete de correo: No pude inicializar Bonobo"
@@ -40,483 +38,484 @@ msgstr ""
 msgid "Available Categories:"
 msgstr "Campos disponibles"
 
-#: addressbook/contact-editor/e-contact-editor.c:579
-#: calendar/gui/event-editor.c:1118
+#: addressbook/contact-editor/e-contact-editor.c:643
+#: calendar/gui/event-editor.c:1168
 #, fuzzy
 msgid "FIXME: _Appointment"
 msgstr "C_ita"
 
-#: addressbook/contact-editor/e-contact-editor.c:580
-#: calendar/gui/event-editor.c:1119
+#: addressbook/contact-editor/e-contact-editor.c:644
+#: calendar/gui/event-editor.c:1169
 #, fuzzy
 msgid "FIXME: Meeting Re_quest"
 msgstr "_Petición de reunión"
 
-#: addressbook/contact-editor/e-contact-editor.c:582
-#: calendar/gui/event-editor.c:1121
+#: addressbook/contact-editor/e-contact-editor.c:646
+#: calendar/gui/event-editor.c:1171
 #, fuzzy
 msgid "FIXME: _Mail Message"
 msgstr "_Mensaje de correo"
 
-#: addressbook/contact-editor/e-contact-editor.c:583
-#: calendar/gui/event-editor.c:1122
+#: addressbook/contact-editor/e-contact-editor.c:647
+#: calendar/gui/event-editor.c:1172
 #, fuzzy
 msgid "FIXME: _Contact"
 msgstr "C_ontacto"
 
-#: addressbook/contact-editor/e-contact-editor.c:584
-#: calendar/gui/event-editor.c:1123
+#: addressbook/contact-editor/e-contact-editor.c:648
+#: calendar/gui/event-editor.c:1173
 msgid "FIXME: _Task"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:585
-#: calendar/gui/event-editor.c:1124
+#: addressbook/contact-editor/e-contact-editor.c:649
+#: calendar/gui/event-editor.c:1174
 #, fuzzy
 msgid "FIXME: Task _Request"
 msgstr "P_etición de tarea"
 
-#: addressbook/contact-editor/e-contact-editor.c:586
-#: calendar/gui/event-editor.c:1125
+#: addressbook/contact-editor/e-contact-editor.c:650
+#: calendar/gui/event-editor.c:1175
 msgid "FIXME: _Journal Entry"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:587
-#: calendar/gui/event-editor.c:1126
+#: addressbook/contact-editor/e-contact-editor.c:651
+#: calendar/gui/event-editor.c:1176
 msgid "FIXME: _Note"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:589
-#: addressbook/contact-editor/e-contact-editor.c:694
-#: calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:653
+#: addressbook/contact-editor/e-contact-editor.c:758
+#: calendar/gui/event-editor.c:1178 calendar/gui/event-editor.c:1285
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:594
-#: calendar/gui/event-editor.c:1133
+#: addressbook/contact-editor/e-contact-editor.c:658
+#: calendar/gui/event-editor.c:1183
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:596
-#: calendar/gui/event-editor.c:1135
+#: addressbook/contact-editor/e-contact-editor.c:660
+#: calendar/gui/event-editor.c:1185
 msgid "FIXME: Define Print _Styles..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:603
-#: calendar/gui/event-editor.c:1142
+#: addressbook/contact-editor/e-contact-editor.c:667
+#: calendar/gui/event-editor.c:1192
 msgid "FIXME: S_end"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:607
-#: calendar/gui/event-editor.c:1146
+#: addressbook/contact-editor/e-contact-editor.c:671
+#: calendar/gui/event-editor.c:1196
 #, fuzzy
 msgid "FIXME: Save Attac_hments..."
 msgstr "Incluir adjunto..."
 
-#: addressbook/contact-editor/e-contact-editor.c:609
-#: calendar/gui/event-editor.c:1148
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: addressbook/contact-editor/e-contact-editor.c:673
 #, fuzzy
-msgid "FIXME: _Delete"
+msgid "_Delete"
 msgstr "Borrar"
 
-#: addressbook/contact-editor/e-contact-editor.c:610
-#: calendar/gui/event-editor.c:1149
+#: addressbook/contact-editor/e-contact-editor.c:674
+#: calendar/gui/event-editor.c:1199
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:611
-#: calendar/gui/event-editor.c:1150
+#: addressbook/contact-editor/e-contact-editor.c:675
+#: calendar/gui/event-editor.c:1200
 msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:613
-#: calendar/gui/event-editor.c:1152
+#: addressbook/contact-editor/e-contact-editor.c:677
+#: calendar/gui/event-editor.c:1202
 #, fuzzy
 msgid "Page Set_up"
 msgstr "Configuración de la página:"
 
-#: addressbook/contact-editor/e-contact-editor.c:614
-#: calendar/gui/event-editor.c:1153
+#: addressbook/contact-editor/e-contact-editor.c:678
+#: calendar/gui/event-editor.c:1203
 msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:635
-#: calendar/gui/event-editor.c:1174
+#: addressbook/contact-editor/e-contact-editor.c:699
+#: calendar/gui/event-editor.c:1224
 msgid "FIXME: Paste _Special..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:640
-#: calendar/gui/event-editor.c:1179
+#: addressbook/contact-editor/e-contact-editor.c:704
+#: calendar/gui/event-editor.c:1229
 msgid "FIXME: Mark as U_nread"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:644
-#: calendar/gui/event-editor.c:1183
+#: addressbook/contact-editor/e-contact-editor.c:708
+#: calendar/gui/event-editor.c:1233
 #, fuzzy
 msgid "_Object"
 msgstr "Asunto"
 
-#: addressbook/contact-editor/e-contact-editor.c:649
-#: addressbook/contact-editor/e-contact-editor.c:656
-#: calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
+#: addressbook/contact-editor/e-contact-editor.c:713
+#: addressbook/contact-editor/e-contact-editor.c:720
+#: calendar/gui/event-editor.c:1238 calendar/gui/event-editor.c:1245
 msgid "FIXME: _Item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:650
-#: addressbook/contact-editor/e-contact-editor.c:657
-#: calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:714
+#: addressbook/contact-editor/e-contact-editor.c:721
+#: calendar/gui/event-editor.c:1239 calendar/gui/event-editor.c:1246
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:651
-#: calendar/gui/event-editor.c:1190
+#: addressbook/contact-editor/e-contact-editor.c:715
+#: calendar/gui/event-editor.c:1240
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:658
-#: calendar/gui/event-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:722
+#: calendar/gui/event-editor.c:1247
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:663
-#: calendar/gui/event-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:727
+#: calendar/gui/event-editor.c:1252
 msgid "FIXME: _Standard"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:665
-#: calendar/gui/event-editor.c:1204
+#: addressbook/contact-editor/e-contact-editor.c:729
+#: calendar/gui/event-editor.c:1254
 msgid "FIXME: __Formatting"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:668
-#: calendar/gui/event-editor.c:1207
+#: addressbook/contact-editor/e-contact-editor.c:732
+#: calendar/gui/event-editor.c:1257
 msgid "FIXME: _Customize..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:673
-#: calendar/gui/event-editor.c:1212
+#: addressbook/contact-editor/e-contact-editor.c:737
+#: calendar/gui/event-editor.c:1262
 msgid "Pre_vious"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:674
-#: calendar/gui/event-editor.c:1213
+#: addressbook/contact-editor/e-contact-editor.c:738
+#: calendar/gui/event-editor.c:1263
 msgid "Ne_xt"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:676
-#: calendar/gui/event-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:740
+#: calendar/gui/event-editor.c:1267
 #, fuzzy
 msgid "_Toolbars"
 msgstr "_Herramientas"
 
-#: addressbook/contact-editor/e-contact-editor.c:681
-#: calendar/gui/event-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:745
+#: calendar/gui/event-editor.c:1272
 msgid "FIXME: _File..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:682
-#: calendar/gui/event-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:746
+#: calendar/gui/event-editor.c:1273
 msgid "FIXME: It_em..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:683
-#: calendar/gui/event-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:747
+#: calendar/gui/event-editor.c:1274
 msgid "FIXME: _Object..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:688
-#: calendar/gui/event-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:752
+#: calendar/gui/event-editor.c:1279
 #, fuzzy
 msgid "FIXME: _Font..."
 msgstr "Fuente..."
 
-#: addressbook/contact-editor/e-contact-editor.c:689
-#: calendar/gui/event-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:753
+#: calendar/gui/event-editor.c:1280
 msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:696
-#: calendar/gui/event-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:760
+#: calendar/gui/event-editor.c:1287
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:697
-#: calendar/gui/event-editor.c:1238
+#: addressbook/contact-editor/e-contact-editor.c:761
+#: calendar/gui/event-editor.c:1288
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/event-editor.c:1240
+#: addressbook/contact-editor/e-contact-editor.c:763
+#: calendar/gui/event-editor.c:1290
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:700
-#: calendar/gui/event-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:764
+#: calendar/gui/event-editor.c:1291
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:702
-#: calendar/gui/event-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:766
+#: calendar/gui/event-editor.c:1293
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:707
-#: calendar/gui/event-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:771
+#: calendar/gui/event-editor.c:1298
 msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:709
-#: calendar/gui/event-editor.c:1253
+#: addressbook/contact-editor/e-contact-editor.c:773
+#: calendar/gui/event-editor.c:1303
 #, fuzzy
 msgid "_Forms"
 msgstr "Formatear"
 
-#: addressbook/contact-editor/e-contact-editor.c:714
+#: addressbook/contact-editor/e-contact-editor.c:778
 msgid "FIXME: _New Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:715
+#: addressbook/contact-editor/e-contact-editor.c:779
 msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:717
+#: addressbook/contact-editor/e-contact-editor.c:781
 msgid "FIXME: New _Letter to Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:718
+#: addressbook/contact-editor/e-contact-editor.c:782
 msgid "FIXME: New _Message to Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:719
+#: addressbook/contact-editor/e-contact-editor.c:783
 msgid "FIXME: New Meetin_g with Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:720
+#: addressbook/contact-editor/e-contact-editor.c:784
 msgid "FIXME: _Plan a Meeting..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:721
+#: addressbook/contact-editor/e-contact-editor.c:785
 msgid "FIXME: New _Task for Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:722
+#: addressbook/contact-editor/e-contact-editor.c:786
 msgid "FIXME: New _Journal Entry for Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:724
+#: addressbook/contact-editor/e-contact-editor.c:788
 msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:725
+#: addressbook/contact-editor/e-contact-editor.c:789
 msgid "FIXME: _Display Map of Address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:726
+#: addressbook/contact-editor/e-contact-editor.c:790
 msgid "FIXME: _Open Web Page"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:728
+#: addressbook/contact-editor/e-contact-editor.c:792
 msgid "FIXME: Forward as _vCard"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:729
-#: calendar/gui/event-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:793
+#: calendar/gui/event-editor.c:1316
 #, fuzzy
 msgid "FIXME: For_ward"
 msgstr "Reenviar"
 
-#: addressbook/contact-editor/e-contact-editor.c:741
-#: calendar/gui/event-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:805
+#: calendar/gui/event-editor.c:1329
 msgid "_Insert"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:742
-#: calendar/gui/event-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:806
+#: calendar/gui/event-editor.c:1330
 #, fuzzy
 msgid "F_ormat"
 msgstr "Formatear"
 
-#. FIXME: add Favorites here
-#: addressbook/contact-editor/e-contact-editor.c:743
-#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:473
+#: addressbook/contact-editor/e-contact-editor.c:807
+#: calendar/gui/event-editor.c:1331 shell/e-shell-view-menu.c:515
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: addressbook/contact-editor/e-contact-editor.c:744
-#: calendar/gui/event-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:808
+#: calendar/gui/event-editor.c:1332
 #, fuzzy
 msgid "Actio_ns"
 msgstr "_Acciones"
 
-#: addressbook/contact-editor/e-contact-editor.c:775
+#: addressbook/contact-editor/e-contact-editor.c:839
 msgid "Save and Close"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:776
-#: calendar/gui/event-editor.c:1321
+#: addressbook/contact-editor/e-contact-editor.c:840
+#: calendar/gui/event-editor.c:1371
 msgid "Save the appointment and close the dialog box"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:780
-#: calendar/gui/event-editor.c:1325
-msgid "FIXME: Print..."
-msgstr ""
+#: addressbook/contact-editor/e-contact-editor.c:844
+#: calendar/gui/calendar-commands.c:673
+#, fuzzy
+msgid "Print..."
+msgstr "Imprimir"
 
-#: addressbook/contact-editor/e-contact-editor.c:781
-#: calendar/gui/event-editor.c:1326
+#: addressbook/contact-editor/e-contact-editor.c:845
+#: calendar/gui/event-editor.c:1376
 msgid "Print this item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:782
-#: calendar/gui/event-editor.c:1327
+#: addressbook/contact-editor/e-contact-editor.c:848
+#: calendar/gui/event-editor.c:1377
 msgid "FIXME: Insert File..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:783
-#: calendar/gui/event-editor.c:1328
+#: addressbook/contact-editor/e-contact-editor.c:849
+#: calendar/gui/event-editor.c:1378
 msgid "Insert a file as an attachment"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/event-editor.c:1336
-#, fuzzy
-msgid "FIXME: Delete"
+#. Delete
+#: addressbook/contact-editor/e-contact-editor.c:852
+#: addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:508
+#: mail/folder-browser-factory.c:39
+msgid "Delete"
 msgstr "Borrar"
 
-#: addressbook/contact-editor/e-contact-editor.c:786
-#: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:326
+#: addressbook/contact-editor/e-contact-editor.c:853
+#: calendar/gui/event-editor.c:1387 calendar/gui/gncal-todo.c:336
 #, fuzzy
 msgid "Delete this item"
 msgstr "Borrar este mensaje"
 
-#: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/event-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:856
+#: calendar/gui/event-editor.c:1389
 msgid "FIXME: Previous"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:789
-#: calendar/gui/event-editor.c:1340
+#: addressbook/contact-editor/e-contact-editor.c:857
+#: calendar/gui/event-editor.c:1390
 msgid "Go to the previous item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:790
-#: calendar/gui/event-editor.c:1341
+#: addressbook/contact-editor/e-contact-editor.c:859
+#: calendar/gui/event-editor.c:1391
 msgid "FIXME: Next"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:791
-#: calendar/gui/event-editor.c:1342
+#: addressbook/contact-editor/e-contact-editor.c:860
+#: calendar/gui/event-editor.c:1392
 msgid "Go to the next item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:792
-#: calendar/gui/event-editor.c:1343
+#: addressbook/contact-editor/e-contact-editor.c:862
+#: calendar/gui/event-editor.c:1393
 msgid "FIXME: Help"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/event-editor.c:1344
+#: addressbook/contact-editor/e-contact-editor.c:863
+#: calendar/gui/event-editor.c:1394
 msgid "See online help"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1208
+#: addressbook/contact-editor/e-contact-editor.c:1278
 #, fuzzy
 msgid "Assistant"
 msgstr "Nombre del asistente:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1209
-#: addressbook/contact-editor/e-contact-editor.c:1313
+#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1383
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1210
+#: addressbook/contact-editor/e-contact-editor.c:1280
 #, fuzzy
 msgid "Business 2"
 msgstr "Trabajo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1211
+#: addressbook/contact-editor/e-contact-editor.c:1281
 #, fuzzy
 msgid "Business Fax"
 msgstr "_Fax del trabajo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1212
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1213
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Car"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1214
+#: addressbook/contact-editor/e-contact-editor.c:1284
 #, fuzzy
 msgid "Company"
 msgstr "Compańia:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1215
-#: addressbook/contact-editor/e-contact-editor.c:1314
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/contact-editor/e-contact-editor.c:1384
 #, fuzzy
 msgid "Home"
 msgstr "_Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1216
+#: addressbook/contact-editor/e-contact-editor.c:1286
 #, fuzzy
 msgid "Home 2"
 msgstr "_Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:1287
 #, fuzzy
 msgid "Home Fax"
 msgstr "_Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1219
+#: addressbook/contact-editor/e-contact-editor.c:1289
 #, fuzzy
 msgid "Mobile"
 msgstr "_Movil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1220
-#: addressbook/contact-editor/e-contact-editor.c:1315
+#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1385
 msgid "Other"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:1292
 #, fuzzy
 msgid "Pager"
 msgstr "Pagina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1293
 #, fuzzy
 msgid "Primary"
 msgstr "Correo electrónico principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:1294
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1225
+#: addressbook/contact-editor/e-contact-editor.c:1295
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:1296
 msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1340
 msgid "Primary Email"
 msgstr "Correo electrónico principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1341
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1342
 msgid "Email 3"
 msgstr ""
 
@@ -530,11 +529,6 @@ msgstr ""
 msgid "_Add"
 msgstr "Ańadir"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#, fuzzy
-msgid "_Delete"
-msgstr "Borrar"
-
 #: addressbook/contact-editor/e-contact-editor-strings.h:9
 msgid "Phone Types"
 msgstr "Tipo de teléfono"
@@ -545,7 +539,6 @@ msgid "New phone type"
 msgstr "Nuevo tipo de teléfono"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:91
 msgid "Add"
 msgstr "Ańadir"
 
@@ -619,7 +612,6 @@ msgid "_Company:"
 msgstr "Compańia:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "General"
 msgstr "General"
 
@@ -736,66 +728,59 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/gui/component/addressbook.c:415
+#: addressbook/gui/component/addressbook.c:420
 #: calendar/gui/calendar-commands.c:544
 #, fuzzy
 msgid "New"
 msgstr "Correo _nuevo"
 
-#: addressbook/gui/component/addressbook.c:415
+#: addressbook/gui/component/addressbook.c:420
 msgid "Create a new contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:419
+#: addressbook/gui/component/addressbook.c:424
 msgid "Find"
 msgstr "Buscar"
 
-#: addressbook/gui/component/addressbook.c:419
+#: addressbook/gui/component/addressbook.c:424
 msgid "Find a contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:420
-#: addressbook/gui/component/addressbook.c:487
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
+#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:492
+#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:37
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/component/addressbook.c:420
+#: addressbook/gui/component/addressbook.c:425
 msgid "Print contacts"
 msgstr ""
 
-#. Delete
-#: addressbook/gui/component/addressbook.c:421
-#: calendar/gui/event-editor-dialog.glade.h:93 calendar/gui/gncal-todo.c:498
-#: mail/folder-browser-factory.c:45
-msgid "Delete"
-msgstr "Borrar"
-
-#: addressbook/gui/component/addressbook.c:421
+#: addressbook/gui/component/addressbook.c:426
 #, fuzzy
 msgid "Delete a contact"
 msgstr "Seleccionar un adjunto"
 
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:499
 #: addressbook/gui/component/addressbook.c:1034
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:506
 #, fuzzy
 msgid "_New Contact"
 msgstr "C_ontacto"
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:514
 msgid "N_ew Directory Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:588
+#: addressbook/gui/component/addressbook.c:593
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Presione aquí para acceder a la agenda"
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:598
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -808,7 +793,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook.c:938
-#: addressbook/gui/minicard/e-minicard.c:329
+#: addressbook/gui/minicard/e-minicard.c:330
 msgid "Save as VCard"
 msgstr ""
 
@@ -867,7 +852,7 @@ msgid "g"
 msgstr ""
 
 #: addressbook/gui/component/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:98
+#: calendar/cal-util/timeutil.c:131
 msgid "h"
 msgstr ""
 
@@ -1083,7 +1068,6 @@ msgstr "Tipo:"
 
 #: addressbook/printing/e-contact-print.glade.h:31
 #: addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:81
 msgid "label26"
 msgstr "label26"
 
@@ -1162,12 +1146,12 @@ msgstr ""
 msgid "Header/Footer"
 msgstr "Cabecera/Pie"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:544
 #, fuzzy
 msgid "am"
 msgstr "Nombre"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:543
 msgid "pm"
 msgstr ""
 
@@ -1233,8 +1217,8 @@ msgstr ""
 msgid "Save calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:712
-#: calendar/gui/gncal-todo.c:716
+#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:722
+#: calendar/gui/gncal-todo.c:726
 msgid "Day"
 msgstr ""
 
@@ -1250,7 +1234,7 @@ msgstr ""
 msgid "Show the working week"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:711
+#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:721
 msgid "Week"
 msgstr ""
 
@@ -1302,7 +1286,7 @@ msgstr "Cuerpo"
 msgid "Go to present time"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
+#: calendar/gui/calendar-commands.c:554
 msgid "Next"
 msgstr ""
 
@@ -1339,11 +1323,6 @@ msgstr ""
 msgid "Save Calendar As"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:673
-#, fuzzy
-msgid "Print..."
-msgstr "Imprimir"
-
 #: calendar/gui/calendar-commands.c:682
 #, fuzzy
 msgid "_New appointment..."
@@ -1377,66 +1356,6 @@ msgstr ""
 msgid "'s calendar"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:68
-msgid "Specifies the port on which the Pilot is"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:68
-msgid "PORT"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:70
-msgid "If you want to debug the attributes on records"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:72
-msgid "Only syncs from desktop to pilot"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:74
-msgid "Only syncs from pilot to desktop"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:97
-msgid "Can not create Pilot socket\n"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:104
-#, c-format
-msgid "Can not bind to device %s\n"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:107
-msgid "Failed to get a connection from the Pilot device"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:111
-msgid "pi_accept failed"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:211
-msgid ""
-"\tObject has been modified on desktop and on the pilot, desktop takes "
-"precedence\n"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:531
-#, fuzzy
-msgid "No description"
-msgstr "Descripción:"
-
-#: calendar/gui/calendar-pilot-sync.c:692
-msgid "Could not open DatebookDB on the Pilot"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:693
-msgid "Unable to open DatebookDB"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:728
-msgid "Synced DateBook from Pilot to GnomeCal"
-msgstr ""
-
 #: calendar/gui/control-factory.c:136
 #, fuzzy
 msgid "The URI that the calendar will display"
@@ -1459,7 +1378,7 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1070
 #, fuzzy
 msgid "Snooze"
 msgstr "Tamańo"
@@ -1508,366 +1427,105 @@ msgstr "Borrar este mensaje"
 msgid "Delete all occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:289
+#: calendar/gui/event-editor.c:291
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "C_ita"
 
-#: calendar/gui/event-editor.c:294
+#: calendar/gui/event-editor.c:296
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/event-editor.c:298
+#: calendar/gui/event-editor.c:300
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "C_ita"
 
-#: calendar/gui/event-editor.c:301
+#: calendar/gui/event-editor.c:303
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/event-editor.c:304
+#: calendar/gui/event-editor.c:306
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
 #. Owner, summary
-#: calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688
+#: calendar/gui/event-editor.c:622 calendar/gui/event-editor.c:718
 msgid "?"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1215
+#: calendar/gui/event-editor.c:1198
+#, fuzzy
+msgid "FIXME: _Delete"
+msgstr "Borrar"
+
+#: calendar/gui/event-editor.c:1265
 msgid "FIXME: Ca_lendar..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1250
+#: calendar/gui/event-editor.c:1300
 msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1251
+#: calendar/gui/event-editor.c:1301
 msgid "FIXME: Address _Book..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1258
+#: calendar/gui/event-editor.c:1308
 #, fuzzy
 msgid "FIXME: _New Appointment"
 msgstr "C_ita"
 
-#: calendar/gui/event-editor.c:1260
+#: calendar/gui/event-editor.c:1310
 msgid "FIXME: Rec_urrence..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1262
-msgid "FIXME: Intive _Attendees..."
-msgstr ""
+#: calendar/gui/event-editor.c:1312
+#, fuzzy
+msgid "FIXME: Invite _Attendees..."
+msgstr "Incluir adjunto..."
 
-#: calendar/gui/event-editor.c:1263
+#: calendar/gui/event-editor.c:1313
 msgid "FIXME: C_ancel Invitation..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1265
+#: calendar/gui/event-editor.c:1315
 msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1320
+#: calendar/gui/event-editor.c:1370
 msgid "FIXME: Save and Close"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1330
+#: calendar/gui/event-editor.c:1375
+msgid "FIXME: Print..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1380
 msgid "FIXME: Recurrence..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1331
+#: calendar/gui/event-editor.c:1381
 msgid "Configure recurrence rules"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1333
+#: calendar/gui/event-editor.c:1383
 msgid "FIXME: Invite Attendees..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1334
+#: calendar/gui/event-editor.c:1384
 msgid "Invite attendees to a meeting"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1745
-msgid "%a %b %d %Y"
-msgstr ""
-
-#. todo
-#.
-#. build some of the recur stuff by hand to take into account
-#. the start-on-monday preference?
-#.
-#. get the apply button to work right
-#.
-#. 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 ""
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "_Summary:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "_Owner:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Time"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Start time:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "End time:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "A_ll day event"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:14 calendar/gui/prop.c:780
-msgid "Alarms"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days\n"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Audio"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_Program"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:34
-#, fuzzy
-msgid "_Mail"
-msgstr "_Movil"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "Mail _to:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Pu_blic"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-#, fuzzy
-msgid "Pri_vate"
-msgstr "Pegar"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "_Confidential"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "Recurrence rule"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:43 shell/e-shell-view.c:596
-#, fuzzy
-msgid "None"
-msgstr "_Nota"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-#, fuzzy
-msgid "Daily"
-msgstr "Detalles"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "Weekly"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Monthly"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "Yearly"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:48
-#, fuzzy
-msgid "label23"
-msgstr "label2"
-
-#: calendar/gui/event-editor-dialog.glade.h:49
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:82
-msgid "Every "
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "day(s)"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:51
-#, fuzzy
-msgid "label24"
-msgstr "label2"
-
-#: calendar/gui/event-editor-dialog.glade.h:53
-msgid "week(s)"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/event-editor-dialog.glade.h:60
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:61
+#: calendar/gui/event-editor.c:1386
 #, fuzzy
-msgid "label25"
-msgstr "label2"
-
-#: calendar/gui/event-editor-dialog.glade.h:62
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "Recur on the"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:64
-msgid "th day of the month"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid ""
-"1st\n"
-"2nd\n"
-"3rd\n"
-"4th\n"
-"5th\n"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:71
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday\n"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:79
-msgid "Every"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:80
-#, fuzzy
-msgid "month(s)"
-msgstr "Fuentes"
-
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "year(s)"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:84
-#, fuzzy
-msgid "label27"
-msgstr "label7"
-
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "Ending date"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "Repeat forever"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:87
-msgid "End on "
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "End after"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:89
-msgid "occurrence(s)"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:90
-#, fuzzy
-msgid "Exceptions"
-msgstr "Opciones"
-
-#: calendar/gui/event-editor-dialog.glade.h:92
-#, fuzzy
-msgid "Change"
-msgstr "Oscureciendo"
+msgid "FIXME: Delete"
+msgstr "Borrar"
 
-#: calendar/gui/event-editor-dialog.glade.h:94
-msgid "Recurrence"
+#: calendar/gui/event-editor.c:1828
+msgid "%a %b %d %Y"
 msgstr ""
 
 #: calendar/gui/getdate.y:391
@@ -2097,119 +1755,148 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:137
+#: calendar/gui/gncal-todo.c:140
 msgid "Create to-do item"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:137
+#: calendar/gui/gncal-todo.c:140
 msgid "Edit to-do item"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:171
+#: calendar/gui/gncal-todo.c:176
 msgid "Summary:"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:181
+#: calendar/gui/gncal-todo.c:186
 #, fuzzy
 msgid "Due Date:"
 msgstr "Departamento:"
 
-#: calendar/gui/gncal-todo.c:190
+#: calendar/gui/gncal-todo.c:195
 #, fuzzy
 msgid "Priority:"
 msgstr "Prioridad"
 
-#: calendar/gui/gncal-todo.c:206
+#: calendar/gui/gncal-todo.c:212
 msgid "Item Comments:"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:324
+#: calendar/gui/gncal-todo.c:334
 msgid "Add to-do item..."
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:325
+#: calendar/gui/gncal-todo.c:335
 msgid "Edit this item..."
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:424
+#: calendar/gui/gncal-todo.c:434
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:425 calendar/gui/prop.c:604
+#: calendar/gui/gncal-todo.c:435 calendar/gui/prop.c:604
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:605
+#: calendar/gui/gncal-todo.c:436 calendar/gui/prop.c:605
 #: mail/message-list.c:474
 msgid "Priority"
 msgstr "Prioridad"
 
-#: calendar/gui/gncal-todo.c:427
+#: calendar/gui/gncal-todo.c:437
 msgid "Time Left"
 msgstr ""
 
 #. Label
-#: calendar/gui/gncal-todo.c:439
+#: calendar/gui/gncal-todo.c:449
 #, fuzzy
 msgid "To-do list"
 msgstr "_Herramientas"
 
 #. Add
-#: calendar/gui/gncal-todo.c:478
+#: calendar/gui/gncal-todo.c:488
 #: composer/e-msg-composer-address-dialog.glade.h:13
 msgid "Add..."
 msgstr "Ańadir..."
 
 #. Edit
-#: calendar/gui/gncal-todo.c:487
+#: calendar/gui/gncal-todo.c:497
 #, fuzzy
 msgid "Edit..."
 msgstr "Ańadir..."
 
-#: calendar/gui/gncal-todo.c:711
+#: calendar/gui/gncal-todo.c:721
 msgid "Weeks"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:712 calendar/gui/gncal-todo.c:716
+#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
 msgid "Days"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:717 calendar/gui/gncal-todo.c:721
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
 msgid "Hours"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:717 calendar/gui/gncal-todo.c:721
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
 msgid "Hour"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
+#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
 msgid "Minutes"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
+#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
 msgid "Minute"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
+#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
 #, fuzzy
 msgid "Seconds"
 msgstr "Secciones:"
 
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
+#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
 #, fuzzy
 msgid "Second"
 msgstr "Enviar"
 
-#: calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
-#: calendar/gui/gnome-cal.c:1120
+#: calendar/gui/gnome-cal.c:461 calendar/gui/gnome-cal.c:1078
+#: calendar/gui/gnome-cal.c:1134
 msgid "Reminder of your appointment at "
 msgstr ""
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124
+#: calendar/gui/gnome-cal.c:1083 calendar/gui/gnome-cal.c:1138
 msgid "Ok"
 msgstr ""
 
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr ""
+
 #: calendar/gui/goto.c:82
 msgid "Year:"
 msgstr ""
@@ -2529,6 +2216,10 @@ msgstr ""
 msgid "To Do List"
 msgstr ""
 
+#: calendar/gui/prop.c:780
+msgid "Alarms"
+msgstr ""
+
 #. build miscellaneous box
 #: calendar/gui/prop.c:783
 #, fuzzy
@@ -2557,7 +2248,7 @@ msgstr ""
 msgid "Defaults"
 msgstr "Detalles"
 
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:766
+#: composer/e-msg-composer-address-dialog.c:183
 msgid "Cut"
 msgstr "Cortar"
 
@@ -2565,7 +2256,7 @@ msgstr "Cortar"
 msgid "Cut selected item into clipboard"
 msgstr "Corta la selección y la coloca en el portapapeles"
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:767
+#: composer/e-msg-composer-address-dialog.c:187
 msgid "Copy"
 msgstr "Copiar"
 
@@ -2574,7 +2265,7 @@ msgid "Copy selected item into clipboard"
 msgstr "Copia la selección y la coloca en el portapapeles"
 
 #: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:768
+#: composer/e-msg-composer-address-dialog.c:199
 msgid "Paste"
 msgstr "Pegar"
 
@@ -2664,7 +2355,7 @@ msgstr ""
 msgid "Add attachment"
 msgstr "Incluir adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:332
+#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
 msgid "Remove"
 msgstr "Quitar"
 
@@ -2737,272 +2428,332 @@ msgstr "Asunto:"
 msgid "Enter the subject of the mail"
 msgstr "Escriba el asunto del mensaje"
 
-#: composer/e-msg-composer.c:463
+#: composer/e-msg-composer.c:444
 #, fuzzy
 msgid "Save as..."
 msgstr "Buscar..."
 
-#: composer/e-msg-composer.c:474
+#: composer/e-msg-composer.c:455
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:494
+#: composer/e-msg-composer.c:475
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:513
+#: composer/e-msg-composer.c:494
 #, fuzzy
 msgid "Discard this message?"
 msgstr "Reenviar este mensaje"
 
-#: composer/e-msg-composer.c:561
+#: composer/e-msg-composer.c:511
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:623
+msgid "That file does not exist."
+msgstr ""
+
+#: composer/e-msg-composer.c:633
+msgid "That is not a regular file."
+msgstr ""
+
+#: composer/e-msg-composer.c:643
+msgid "That file exists but is not readable."
+msgstr ""
+
+#: composer/e-msg-composer.c:653
+msgid "That file appeared accesible but open(2) failed."
+msgstr ""
+
+#: composer/e-msg-composer.c:675
+msgid ""
+"The file is very large (more than 100K).\n"
+"Are you sure you wish to insert it?"
+msgstr ""
+
+#: composer/e-msg-composer.c:696
+msgid "An error occurred while reading the file."
+msgstr ""
+
+#: composer/e-msg-composer.c:792 shell/e-shell-view-menu.c:438
+#, fuzzy
+msgid "_File"
+msgstr "Filtro"
+
+#: composer/e-msg-composer.c:798
+#, fuzzy
+msgid "_Open..."
+msgstr "_Abrir"
+
+#: composer/e-msg-composer.c:799
+msgid "Load a previously saved message"
+msgstr ""
+
+#: composer/e-msg-composer.c:807
+#, fuzzy
+msgid "_Save..."
+msgstr "Buscar..."
+
+#: composer/e-msg-composer.c:808
+#, fuzzy
+msgid "Save message"
+msgstr "Enviar un nuevo mensaje"
+
+#: composer/e-msg-composer.c:816
+#, fuzzy
+msgid "_Save as..."
+msgstr "Buscar..."
+
+#: composer/e-msg-composer.c:817
+#, fuzzy
+msgid "Save message with a different name"
+msgstr "Guardar el mensaje en una carpeta especificada"
+
+#: composer/e-msg-composer.c:825
 msgid "Save in _folder..."
 msgstr "Guardar en _carpeta..."
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:826
 msgid "Save the message in a specified folder"
 msgstr "Guardar el mensaje en una carpeta especificada"
 
-#: composer/e-msg-composer.c:721 composer/e-msg-composer.c:763
-msgid "Send"
+#: composer/e-msg-composer.c:835
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: composer/e-msg-composer.c:836
+#, fuzzy
+msgid "Insert a file as text into the message"
+msgstr "Adjuntar un fichero al mensaje"
+
+#: composer/e-msg-composer.c:845
+#, fuzzy
+msgid "_Send"
 msgstr "Enviar"
 
-#: composer/e-msg-composer.c:721
+#: composer/e-msg-composer.c:846
 msgid "Send the message"
 msgstr "Enviar el mensaje"
 
-#: composer/e-msg-composer.c:733
-msgid "View _attachments"
-msgstr "Ver _adjuntos"
+#: composer/e-msg-composer.c:856
+msgid "_Close..."
+msgstr ""
 
-#: composer/e-msg-composer.c:733
-msgid "View/hide attachments"
-msgstr "Ver/ocultar adjuntos"
+#: composer/e-msg-composer.c:857
+msgid "Quit the message composer"
+msgstr ""
 
-#: composer/e-msg-composer.c:763
-msgid "Send this message"
-msgstr "Enviar este mensaje"
+#: composer/e-msg-composer.c:870 shell/e-shell-view-menu.c:480
+#, fuzzy
+msgid "_Edit"
+msgstr "Ańadir..."
 
-#: composer/e-msg-composer.c:766
-msgid "Cut selected region into the clipboard"
-msgstr "Corta la región seleccionada y la coloca en el portapapeles"
+#: composer/e-msg-composer.c:881
+#, fuzzy
+msgid "_Format"
+msgstr "Formatear"
 
-#: composer/e-msg-composer.c:767
-msgid "Copy selected region into the clipboard"
-msgstr "Copia la región seleccionada y la coloca en el portapapeles"
+#: composer/e-msg-composer.c:887
+msgid "HTML"
+msgstr ""
 
-#: composer/e-msg-composer.c:768
-msgid "Paste selected region into the clipboard"
+#: composer/e-msg-composer.c:888
+msgid "Send the mail in HTML format"
 msgstr ""
 
-#: composer/e-msg-composer.c:769
-msgid "Undo"
-msgstr "Deshacer"
+#: composer/e-msg-composer.c:901 shell/e-shell-view-menu.c:387
+#: shell/e-shell-view-menu.c:491
+#, fuzzy
+msgid "_View"
+msgstr "Correo _nuevo"
+
+#: composer/e-msg-composer.c:907
+#, fuzzy
+msgid "Show _attachments"
+msgstr "Ver _adjuntos"
 
-#: composer/e-msg-composer.c:769
-msgid "Undo last operation"
-msgstr "Deshacer la ultima operación"
+#: composer/e-msg-composer.c:908
+#, fuzzy
+msgid "Show/hide attachments"
+msgstr "Ver/ocultar adjuntos"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:941
+msgid "Send"
+msgstr "Enviar"
+
+#: composer/e-msg-composer.c:942
+msgid "Send this message"
+msgstr "Enviar este mensaje"
+
+#: composer/e-msg-composer.c:951
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:952
 msgid "Attach a file"
 msgstr "Adjuntar un fichero"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:1139
 #, fuzzy
 msgid "Compose a message"
 msgstr "Compone un nuevo mensaje de correo"
 
-#: filter/filter-editor.c:198
-#, fuzzy
-msgid "Edit Filter"
-msgstr "Filtro"
-
-#: filter/filter-editor.c:198
-msgid "Create filter"
-msgstr ""
-
-#: filter/filter-editor.c:209
-msgid "Back"
-msgstr ""
-
-#: filter/filter-editor.c:211
-#, fuzzy
-msgid "Finish"
-msgstr "Buscar"
-
-#: filter/filter-editor.c:212
-msgid "Cancel"
-msgstr ""
-
-#: filter/filter-editor.c:216
-#, fuzzy
-msgid "Apply"
-msgstr "Responder"
-
-#: filter/filter-editor.c:233
-msgid ""
-"<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
-"continue forwards to customise it.</p>"
-msgstr ""
-
-#: mail/component-factory.c:196
+#: mail/component-factory.c:188
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No pued inicializar la shell de Evolution."
 
-#: mail/folder-browser-factory.c:29
+#: mail/folder-browser-factory.c:23
 msgid "Get mail"
 msgstr "Correo nuevo"
 
-#: mail/folder-browser-factory.c:29
+#: mail/folder-browser-factory.c:23
 msgid "Check for new mail"
 msgstr "Comprobar correo"
 
-#: mail/folder-browser-factory.c:30
+#: mail/folder-browser-factory.c:24
 msgid "Compose"
 msgstr ""
 
-#: mail/folder-browser-factory.c:30
+#: mail/folder-browser-factory.c:24
 #, fuzzy
 msgid "Compose a new message"
 msgstr "Compone un nuevo mensaje de correo"
 
-#: mail/folder-browser-factory.c:34
+#: mail/folder-browser-factory.c:28
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/folder-browser-factory.c:34
+#: mail/folder-browser-factory.c:28
 msgid "Reply to the sender of this message"
 msgstr "Responder al remitente de este mensaje"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:29
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:29
 msgid "Reply to all recipients of this message"
 msgstr "Responder a todos los destinatarios de este mensaje"
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser-factory.c:31
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser-factory.c:31
 msgid "Forward this message"
 msgstr "Reenviar este mensaje"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:35
 #, fuzzy
-msgid "Refile"
-msgstr "Recivido"
+msgid "Move"
+msgstr "_Movil"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:35
 #, fuzzy
 msgid "Move message to a new folder"
 msgstr "Guardar el mensaje en una carpeta especificada"
 
-#: mail/folder-browser-factory.c:43
+#: mail/folder-browser-factory.c:37
 msgid "Print the selected message"
 msgstr "Imprimir el mensaje seleccionado"
 
-#: mail/folder-browser-factory.c:45
+#: mail/folder-browser-factory.c:39
 msgid "Delete this message"
 msgstr "Borrar este mensaje"
 
-#: mail/folder-browser-factory.c:65
+#: mail/folder-browser-factory.c:59
 msgid "_Threaded Message List"
 msgstr ""
 
-#: mail/folder-browser-factory.c:77
+#: mail/folder-browser-factory.c:72
+msgid "_Mark all messages seen"
+msgstr ""
+
+#: mail/folder-browser-factory.c:78
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: mail/folder-browser-factory.c:83
+#: mail/folder-browser-factory.c:84
 #, fuzzy
-msgid "_Filter Druid ..."
+msgid "Mail _Filters ..."
 msgstr "Asistente para _filtros"
 
-#: mail/folder-browser-factory.c:89
-msgid "_Virtual Folder Druid ..."
-msgstr ""
+#: mail/folder-browser-factory.c:90
+#, fuzzy
+msgid "_vFolder Editor ..."
+msgstr "Asistente para _filtros"
 
-#: mail/folder-browser-factory.c:95
+#: mail/folder-browser-factory.c:96
 msgid "_Mail Configuration ..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:101
+#: mail/folder-browser-factory.c:102
 msgid "Forget _Passwords"
 msgstr ""
 
-#: mail/mail-config.c:259
+#: mail/mail-config.c:688
 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 ""
 
-#: mail/mail-config.c:274
+#: mail/mail-config.c:701
 #, fuzzy
 msgid "Full name:"
 msgstr "Nombre del fichero:"
 
-#: mail/mail-config.c:302
+#: mail/mail-config.c:725
 #, fuzzy
 msgid "Email address:"
 msgstr "Dirección de la página web:"
 
-#: mail/mail-config.c:325
+#: mail/mail-config.c:740
 #, fuzzy
 msgid "Organization:"
 msgstr "Orientación"
 
-#: mail/mail-config.c:337
+#: mail/mail-config.c:751
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.c:342
+#: mail/mail-config.c:756
 msgid "Signature File"
 msgstr ""
 
-#: mail/mail-config.c:699 mail/mail-config.c:790
+#: mail/mail-config.c:1167
 #, fuzzy
 msgid "Server:"
 msgstr "Servidor LDAP:"
 
-#: mail/mail-config.c:705
+#: mail/mail-config.c:1173
 #, fuzzy
 msgid "Username:"
 msgstr "Nombre del fichero:"
 
-#: mail/mail-config.c:711
+#: mail/mail-config.c:1179
 #, fuzzy
 msgid "Path:"
 msgstr "Pegar"
 
-#: mail/mail-config.c:717 mail/mail-config.c:796
+#: mail/mail-config.c:1187
 #, fuzzy
 msgid "Authentication:"
 msgstr "Orientación"
 
-#: mail/mail-config.c:729 mail/mail-config.c:808
+#: mail/mail-config.c:1199
 msgid "Detect supported types..."
 msgstr ""
 
-#: mail/mail-config.c:755 mail/mail-config.c:830
-msgid "Test these values before continuing"
+#: mail/mail-config.c:1222
+msgid "Test Settings"
 msgstr ""
 
-#: mail/mail-config.c:937
+#: mail/mail-config.c:1344 mail/mail-config.c:1392
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3011,59 +2762,53 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config.c:955
-msgid "Select the method you would like to use to deliver your mail."
-msgstr ""
-
-#: mail/mail-config.c:1129 mail/mail-config.c:1208
-msgid "Mail Configuration"
-msgstr ""
-
-#. Identity page
-#: mail/mail-config.c:1146
-msgid "Identity"
-msgstr ""
-
-#. Source page
-#: mail/mail-config.c:1165
-msgid "Mail Source"
-msgstr ""
-
-#. Transport page
-#: mail/mail-config.c:1186
-msgid "Mail Transport"
+#: mail/mail-config.c:1368
+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 ""
 
-#: mail/mail-config.c:1308
+#: mail/mail-config.c:1434
 msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config.c:1310
+#: mail/mail-config.c:1436
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config.c:1453
+#: mail/mail-config.c:1515
 msgid "Edit Source"
 msgstr ""
 
-#: mail/mail-config.c:1455
+#: mail/mail-config.c:1517
 msgid "Add Source"
 msgstr ""
 
-#: mail/mail-ops.c:372
+#: mail/mail-config.c:1598
+msgid "Edit News Server"
+msgstr ""
+
+#: mail/mail-config.c:1600
+msgid "Add News Server"
+msgstr ""
+
+#: mail/mail-ops.c:393
 #, fuzzy
 msgid "Fetching mail"
 msgstr "Correo nuevo"
 
-#: mail/mail-ops.c:384
+#: mail/mail-ops.c:405
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-ops.c:732
+#: mail/mail-ops.c:791
 #, fuzzy
-msgid "Refile message(s) to"
+msgid "Move message(s) to"
 msgstr "Buscar mensajes"
 
 #: mail/mail-threads.c:483
@@ -3090,44 +2835,36 @@ msgstr ""
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/main.c:62
-msgid "Mail Component: I could not initialize Bonobo"
-msgstr "Componenete de correo: No pude inicializar Bonobo"
-
-#: mail/message-list.c:460
+#: mail/message-list.c:456
 msgid "Online Status"
 msgstr ""
 
-#: mail/message-list.c:488
+#: mail/message-list.c:492
 msgid "From"
 msgstr "De"
 
-#: mail/message-list.c:495
+#: mail/message-list.c:499
 msgid "Subject"
 msgstr "Asunto"
 
-#: mail/message-list.c:502
+#: mail/message-list.c:506
 #, fuzzy
 msgid "Date"
 msgstr "Pegar"
 
-#: mail/message-list.c:509
+#: mail/message-list.c:513
 #, fuzzy
 msgid "Received"
 msgstr "Recivido"
 
-#: mail/message-list.c:516
+#: mail/message-list.c:520
 msgid "To"
 msgstr "A"
 
-#: mail/message-list.c:523
+#: mail/message-list.c:527
 msgid "Size"
 msgstr "Tamańo"
 
-#: shell/e-init.c:25
-msgid "Evolution can not create its local folders"
-msgstr ""
-
 #: shell/e-setup.c:47
 msgid "Evolution installation"
 msgstr ""
@@ -3193,31 +2930,31 @@ msgstr ""
 msgid "New..."
 msgstr "Correo _nuevo"
 
-#: shell/e-shell-folder-title-bar.c:355
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr ""
 
 #. you might have to call gnome_dialog_run() on the
 #. * dialog returned here, I don't remember...
 #.
-#: shell/e-shell-view-menu.c:110
+#: shell/e-shell-view-menu.c:113
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
 
 #. same as above
-#: shell/e-shell-view-menu.c:116
+#: shell/e-shell-view-menu.c:119
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:164
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:161
+#: shell/e-shell-view-menu.c:166
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:163
+#: shell/e-shell-view-menu.c:168
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -3227,149 +2964,159 @@ msgstr ""
 "groupware para manejar el correo, el calendario y la\n"
 "lista de contactos en el entorno del escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:301
+#: shell/e-shell-view-menu.c:324
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Guardar en _carpeta..."
 
-#: shell/e-shell-view-menu.c:365
+#: shell/e-shell-view-menu.c:381
+msgid "_New"
+msgstr "Correo _nuevo"
+
+#: shell/e-shell-view-menu.c:393
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: shell/e-shell-view-menu.c:369
-msgid "Evolution _Bar Shortcut"
+#: shell/e-shell-view-menu.c:399
+#, fuzzy
+msgid "Evolution bar _shortcut"
 msgstr "_Barra de atajos de Evolution"
 
-#: shell/e-shell-view-menu.c:375
+#: shell/e-shell-view-menu.c:408
 #, fuzzy
 msgid "_Mail message (FIXME)"
 msgstr "_Mensaje de correo"
 
-#: shell/e-shell-view-menu.c:376 shell/e-shell-view-menu.c:379
-msgid "Composes a new mail message"
-msgstr "Compone un nuevo mensaje de correo"
-
-#: shell/e-shell-view-menu.c:378
+#: shell/e-shell-view-menu.c:414
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "C_ita"
 
-#: shell/e-shell-view-menu.c:381
+#: shell/e-shell-view-menu.c:420
 #, fuzzy
 msgid "_Contact (FIXME)"
 msgstr "C_ontacto"
 
-#: shell/e-shell-view-menu.c:384
+#: shell/e-shell-view-menu.c:426
 msgid "_Task (FIXME)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:387
-#, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "P_etición de tarea"
-
-#: shell/e-shell-view-menu.c:390
-msgid "_Journal Entry (FIXME)"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:398
-msgid "_New"
-msgstr "Correo _nuevo"
-
-#: shell/e-shell-view-menu.c:402
+#: shell/e-shell-view-menu.c:448
 #, fuzzy
 msgid "_Go to folder..."
 msgstr "Guardar en _carpeta..."
 
-#: shell/e-shell-view-menu.c:402
+#: shell/e-shell-view-menu.c:449
 msgid "Display a different folder"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:404
+#: shell/e-shell-view-menu.c:456
 #, fuzzy
 msgid "_Create new folder..."
 msgstr "Guardar en _carpeta..."
 
-#: shell/e-shell-view-menu.c:404
+#: shell/e-shell-view-menu.c:457 shell/e-shell-view-menu.c:467
 msgid "Create a new folder"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:419
+#: shell/e-shell-view-menu.c:466
+#, fuzzy
+msgid "E_xit..."
+msgstr "Ańadir..."
+
+#: shell/e-shell-view-menu.c:497
 #, fuzzy
 msgid "Show _shortcut bar"
 msgstr "_Ocultar la barra de atajos"
 
-#: shell/e-shell-view-menu.c:420
+#: shell/e-shell-view-menu.c:498
 #, fuzzy
 msgid "Show the shortcut bar"
 msgstr "Oculta la barra de atajos"
 
-#: shell/e-shell-view-menu.c:422
+#: shell/e-shell-view-menu.c:503
 #, fuzzy
 msgid "Show _folder bar"
 msgstr "_Ocultar la barra de atajos"
 
-#: shell/e-shell-view-menu.c:423
+#: shell/e-shell-view-menu.c:504
 #, fuzzy
 msgid "Show the folder bar"
 msgstr "Oculta la barra de atajos"
 
-#: shell/e-shell-view-menu.c:440
-msgid "Help _Index"
-msgstr ""
+#: shell/e-shell-view-menu.c:526
+msgid "_Actions"
+msgstr "_Acciones"
 
-#: shell/e-shell-view-menu.c:443
-msgid "Getting _Started"
+#: shell/e-shell-view-menu.c:537
+#, fuzzy
+msgid "_Help"
+msgstr "_Casa"
+
+#: shell/e-shell-view-menu.c:543
+msgid "Help _index"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:446
-msgid "Using the _Mailer"
+#: shell/e-shell-view-menu.c:550
+#, fuzzy
+msgid "Getting _started"
+msgstr "_Petición de reunión"
+
+#: shell/e-shell-view-menu.c:557
+msgid "Using the _mailer"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:449
-msgid "Using the _Calendar"
+#: shell/e-shell-view-menu.c:564
+msgid "Using the _calendar"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:452
-msgid "Using the Cont_act Manager"
+#: shell/e-shell-view-menu.c:571
+msgid "Using the c_ontact manager"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:457
+#: shell/e-shell-view-menu.c:581
 #, fuzzy
 msgid "_Submit bug report"
 msgstr "_Enviar un reporte de error"
 
-#: shell/e-shell-view-menu.c:458
-msgid "Submit bug-report via bug-buddy"
+#: shell/e-shell-view-menu.c:582
+#, fuzzy
+msgid "Submit bug report using Bug Buddy"
 msgstr "Enviar un reporte de error a traves de bug-buddy"
 
-#: shell/e-shell-view-menu.c:474
-msgid "_Actions"
-msgstr "_Acciones"
+#: shell/e-shell-view-menu.c:591
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Evolution"
+
+#: shell/e-shell-view-menu.c:592
+msgid "Show information about Evolution"
+msgstr ""
 
-#: shell/e-shell-view.c:113
+#: shell/e-shell-view.c:114
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:208
+#: shell/e-shell-view.c:342
 #, fuzzy
 msgid "Folders"
 msgstr "_Carpeta"
 
-#: shell/e-shell-view.c:600
+#: shell/e-shell-view.c:734
+#, fuzzy
+msgid "None"
+msgstr "_Nota"
+
+#: shell/e-shell-view.c:738
 #, fuzzy, c-format
 msgid "Evolution - %s"
 msgstr "Evolution"
 
-#: shell/e-shell.c:299
+#: shell/e-shell.c:293
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shortcut.c:469
-msgid "New group"
-msgstr ""
-
 #: shell/e-shortcuts-view.c:235
 msgid "_Small icons"
 msgstr ""
@@ -3389,15 +3136,15 @@ msgstr "Margenes"
 msgid "Show the shortcuts as large icons"
 msgstr "Oculta la barra de atajos"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:330
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:330
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -3458,7 +3205,7 @@ msgstr ""
 msgid "Unknown error"
 msgstr ""
 
-#: shell/main.c:99
+#: shell/main.c:66
 #, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -3506,7 +3253,7 @@ msgstr ""
 "Ąesperamos\n"
 "contribuciones!\n"
 
-#: shell/main.c:126
+#: shell/main.c:93
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -3514,16 +3261,16 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: shell/main.c:172
+#: shell/main.c:128
 msgid "Cannot initialize the Evolution shell."
 msgstr "No pued inicializar la shell de Evolution."
 
-#: shell/main.c:214
+#: shell/main.c:166
 #, fuzzy
 msgid "Cannot initialize the configuration system."
 msgstr "No pued inicializar la shell de Evolution."
 
-#: shell/main.c:220
+#: shell/main.c:172
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
@@ -3683,13 +3430,92 @@ msgstr ""
 msgid "..."
 msgstr "Ańadir..."
 
-#: widgets/shortcut-bar/e-group-bar.c:633
+#: widgets/shortcut-bar/e-group-bar.c:632
 #, fuzzy, c-format
 msgid "Group %i"
 msgstr "Agrupando"
 
-#~ msgid "Send a new message"
-#~ msgstr "Enviar un nuevo mensaje"
+#, fuzzy
+#~ msgid "No description"
+#~ msgstr "Descripción:"
+
+#, fuzzy
+#~ msgid "_Mail"
+#~ msgstr "_Movil"
+
+#, fuzzy
+#~ msgid "Pri_vate"
+#~ msgstr "Pegar"
+
+#, fuzzy
+#~ msgid "Daily"
+#~ msgstr "Detalles"
+
+#, fuzzy
+#~ msgid "label23"
+#~ msgstr "label2"
+
+#, fuzzy
+#~ msgid "label24"
+#~ msgstr "label2"
+
+#, fuzzy
+#~ msgid "label25"
+#~ msgstr "label2"
+
+#, fuzzy
+#~ msgid "month(s)"
+#~ msgstr "Fuentes"
+
+#, fuzzy
+#~ msgid "label27"
+#~ msgstr "label7"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "Opciones"
+
+#, fuzzy
+#~ msgid "Change"
+#~ msgstr "Oscureciendo"
+
+#~ msgid "Cut selected region into the clipboard"
+#~ msgstr "Corta la región seleccionada y la coloca en el portapapeles"
+
+#~ msgid "Copy selected region into the clipboard"
+#~ msgstr "Copia la región seleccionada y la coloca en el portapapeles"
+
+#~ msgid "Undo"
+#~ msgstr "Deshacer"
+
+#~ msgid "Undo last operation"
+#~ msgstr "Deshacer la ultima operación"
+
+#, fuzzy
+#~ msgid "Edit Filter"
+#~ msgstr "Filtro"
+
+#, fuzzy
+#~ msgid "Finish"
+#~ msgstr "Buscar"
+
+#, fuzzy
+#~ msgid "Apply"
+#~ msgstr "Responder"
+
+#, fuzzy
+#~ msgid "Refile"
+#~ msgstr "Recivido"
+
+#~ msgid "Mail Component: I could not initialize Bonobo"
+#~ msgstr "Componenete de correo: No pude inicializar Bonobo"
+
+#~ msgid "Composes a new mail message"
+#~ msgstr "Compone un nuevo mensaje de correo"
+
+#, fuzzy
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "P_etición de tarea"
 
 #~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
 #~ msgstr ""
@@ -3707,9 +3533,6 @@ msgstr "Agrupando"
 #~ msgid "_New Folder"
 #~ msgstr "_Nueva carpeta"
 
-#~ msgid "_Open"
-#~ msgstr "_Abrir"
-
 #~ msgid "Clos_e All Items"
 #~ msgstr "_Cerrar todos los elementos"
 
diff --git a/po/gl.po b/po/gl.po
index 3e12399c1e..b4d3873184 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 0.0.2\n"
-"POT-Creation-Date: 2000-07-16 18:24+0200\n"
+"POT-Creation-Date: 2000-08-02 16:39+0200\n"
 "PO-Revision-Date: 2000-07-16 19:19+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
+#: addressbook/gui/component/addressbook-factory.c:59 calendar/gui/main.c:68
 msgid "Could not initialize Bonobo"
 msgstr "Non se puido inicializar Bonobo"
 
@@ -41,68 +41,68 @@ msgid "Available Categories:"
 msgstr "Categorías Dispońibles:"
 
 #: addressbook/contact-editor/e-contact-editor.c:643
-#: calendar/gui/event-editor.c:1118
+#: calendar/gui/event-editor.c:1168
 msgid "FIXME: _Appointment"
 msgstr "FIXME: _Cita"
 
 #: addressbook/contact-editor/e-contact-editor.c:644
-#: calendar/gui/event-editor.c:1119
+#: calendar/gui/event-editor.c:1169
 msgid "FIXME: Meeting Re_quest"
 msgstr "FIXME: _Solicitude de Reunión"
 
 #: addressbook/contact-editor/e-contact-editor.c:646
-#: calendar/gui/event-editor.c:1121
+#: calendar/gui/event-editor.c:1171
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Enviar _Mensaxe"
 
 #: addressbook/contact-editor/e-contact-editor.c:647
-#: calendar/gui/event-editor.c:1122
+#: calendar/gui/event-editor.c:1172
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Contacto"
 
 #: addressbook/contact-editor/e-contact-editor.c:648
-#: calendar/gui/event-editor.c:1123
+#: calendar/gui/event-editor.c:1173
 msgid "FIXME: _Task"
 msgstr "FIXME: _Tarefa"
 
 #: addressbook/contact-editor/e-contact-editor.c:649
-#: calendar/gui/event-editor.c:1124
+#: calendar/gui/event-editor.c:1174
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Solicitude de _Tarefa"
 
 #: addressbook/contact-editor/e-contact-editor.c:650
-#: calendar/gui/event-editor.c:1125
+#: calendar/gui/event-editor.c:1175
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Entrada de _Xornal"
 
 #: addressbook/contact-editor/e-contact-editor.c:651
-#: calendar/gui/event-editor.c:1126
+#: calendar/gui/event-editor.c:1176
 msgid "FIXME: _Note"
 msgstr "FIXME: _Nota"
 
 #: addressbook/contact-editor/e-contact-editor.c:653
 #: addressbook/contact-editor/e-contact-editor.c:758
-#: calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
+#: calendar/gui/event-editor.c:1178 calendar/gui/event-editor.c:1285
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:658
-#: calendar/gui/event-editor.c:1133
+#: calendar/gui/event-editor.c:1183
 msgid "FIXME: _Memo Style"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:660
-#: calendar/gui/event-editor.c:1135
+#: calendar/gui/event-editor.c:1185
 msgid "FIXME: Define Print _Styles..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:667
-#: calendar/gui/event-editor.c:1142
+#: calendar/gui/event-editor.c:1192
 msgid "FIXME: S_end"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:671
-#: calendar/gui/event-editor.c:1146
+#: calendar/gui/event-editor.c:1196
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Gardar Ad_xuntos..."
 
@@ -112,149 +112,149 @@ msgid "_Delete"
 msgstr "_Borrar"
 
 #: addressbook/contact-editor/e-contact-editor.c:674
-#: calendar/gui/event-editor.c:1149
+#: calendar/gui/event-editor.c:1199
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:675
-#: calendar/gui/event-editor.c:1150
+#: calendar/gui/event-editor.c:1200
 msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:677
-#: calendar/gui/event-editor.c:1152
+#: calendar/gui/event-editor.c:1202
 msgid "Page Set_up"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:678
-#: calendar/gui/event-editor.c:1153
+#: calendar/gui/event-editor.c:1203
 msgid "FIXME: Print Pre_view"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/event-editor.c:1174
+#: calendar/gui/event-editor.c:1224
 msgid "FIXME: Paste _Special..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:704
-#: calendar/gui/event-editor.c:1179
+#: calendar/gui/event-editor.c:1229
 msgid "FIXME: Mark as U_nread"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:708
-#: calendar/gui/event-editor.c:1183
+#: calendar/gui/event-editor.c:1233
 msgid "_Object"
 msgstr "_Obxecto"
 
 #: addressbook/contact-editor/e-contact-editor.c:713
 #: addressbook/contact-editor/e-contact-editor.c:720
-#: calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
+#: calendar/gui/event-editor.c:1238 calendar/gui/event-editor.c:1245
 msgid "FIXME: _Item"
 msgstr "FIXME: _Elemento"
 
 #: addressbook/contact-editor/e-contact-editor.c:714
 #: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
+#: calendar/gui/event-editor.c:1239 calendar/gui/event-editor.c:1246
 msgid "FIXME: _Unread Item"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:715
-#: calendar/gui/event-editor.c:1190
+#: calendar/gui/event-editor.c:1240
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:722
-#: calendar/gui/event-editor.c:1197
+#: calendar/gui/event-editor.c:1247
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:727
-#: calendar/gui/event-editor.c:1202
+#: calendar/gui/event-editor.c:1252
 msgid "FIXME: _Standard"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:729
-#: calendar/gui/event-editor.c:1204
+#: calendar/gui/event-editor.c:1254
 msgid "FIXME: __Formatting"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:732
-#: calendar/gui/event-editor.c:1207
+#: calendar/gui/event-editor.c:1257
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Personalizar..."
 
 #: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/event-editor.c:1212
+#: calendar/gui/event-editor.c:1262
 msgid "Pre_vious"
 msgstr "An_terior"
 
 #: addressbook/contact-editor/e-contact-editor.c:738
-#: calendar/gui/event-editor.c:1213
+#: calendar/gui/event-editor.c:1263
 msgid "Ne_xt"
 msgstr "Se_guinte"
 
 #: addressbook/contact-editor/e-contact-editor.c:740
-#: calendar/gui/event-editor.c:1217
+#: calendar/gui/event-editor.c:1267
 msgid "_Toolbars"
 msgstr "_Barras de ferramentas"
 
 #: addressbook/contact-editor/e-contact-editor.c:745
-#: calendar/gui/event-editor.c:1222
+#: calendar/gui/event-editor.c:1272
 msgid "FIXME: _File..."
 msgstr "FIXME: _Ficheiro..."
 
 #: addressbook/contact-editor/e-contact-editor.c:746
-#: calendar/gui/event-editor.c:1223
+#: calendar/gui/event-editor.c:1273
 msgid "FIXME: It_em..."
 msgstr "FIXME: _Elemento..."
 
 #: addressbook/contact-editor/e-contact-editor.c:747
-#: calendar/gui/event-editor.c:1224
+#: calendar/gui/event-editor.c:1274
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Obxecto..."
 
 #: addressbook/contact-editor/e-contact-editor.c:752
-#: calendar/gui/event-editor.c:1229
+#: calendar/gui/event-editor.c:1279
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Fonte..."
 
 #: addressbook/contact-editor/e-contact-editor.c:753
-#: calendar/gui/event-editor.c:1230
+#: calendar/gui/event-editor.c:1280
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: _Parágrafo..."
 
 #: addressbook/contact-editor/e-contact-editor.c:760
-#: calendar/gui/event-editor.c:1237
+#: calendar/gui/event-editor.c:1287
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:761
-#: calendar/gui/event-editor.c:1238
+#: calendar/gui/event-editor.c:1288
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:763
-#: calendar/gui/event-editor.c:1240
+#: calendar/gui/event-editor.c:1290
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:764
-#: calendar/gui/event-editor.c:1241
+#: calendar/gui/event-editor.c:1291
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:766
-#: calendar/gui/event-editor.c:1243
+#: calendar/gui/event-editor.c:1293
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:771
-#: calendar/gui/event-editor.c:1248
+#: calendar/gui/event-editor.c:1298
 msgid "FIXME: _Spelling..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:773
-#: calendar/gui/event-editor.c:1253
+#: calendar/gui/event-editor.c:1303
 msgid "_Forms"
 msgstr ""
 
@@ -307,28 +307,27 @@ msgid "FIXME: Forward as _vCard"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/event-editor.c:1266
+#: calendar/gui/event-editor.c:1316
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Reenviar"
 
 #: addressbook/contact-editor/e-contact-editor.c:805
-#: calendar/gui/event-editor.c:1279
+#: calendar/gui/event-editor.c:1329
 msgid "_Insert"
 msgstr "_Inserir"
 
 #: addressbook/contact-editor/e-contact-editor.c:806
-#: calendar/gui/event-editor.c:1280
+#: calendar/gui/event-editor.c:1330
 msgid "F_ormat"
 msgstr "_Formatar"
 
-#. FIXME: add Favorites here
 #: addressbook/contact-editor/e-contact-editor.c:807
-#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:473
+#: calendar/gui/event-editor.c:1331 shell/e-shell-view-menu.c:515
 msgid "_Tools"
 msgstr "_Utilidades"
 
 #: addressbook/contact-editor/e-contact-editor.c:808
-#: calendar/gui/event-editor.c:1282
+#: calendar/gui/event-editor.c:1332
 msgid "Actio_ns"
 msgstr "Acció_ns"
 
@@ -337,7 +336,7 @@ msgid "Save and Close"
 msgstr "Gardar e Pechar"
 
 #: addressbook/contact-editor/e-contact-editor.c:840
-#: calendar/gui/event-editor.c:1321
+#: calendar/gui/event-editor.c:1371
 msgid "Save the appointment and close the dialog box"
 msgstr "Garda-la cita e pecha-la caixa de diálogo"
 
@@ -347,59 +346,59 @@ msgid "Print..."
 msgstr "Imprimir..."
 
 #: addressbook/contact-editor/e-contact-editor.c:845
-#: calendar/gui/event-editor.c:1326
+#: calendar/gui/event-editor.c:1376
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
 #: addressbook/contact-editor/e-contact-editor.c:848
-#: calendar/gui/event-editor.c:1327
+#: calendar/gui/event-editor.c:1377
 msgid "FIXME: Insert File..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:849
-#: calendar/gui/event-editor.c:1328
+#: calendar/gui/event-editor.c:1378
 msgid "Insert a file as an attachment"
 msgstr "Inserir un ficheiro como adxunto"
 
 #. Delete
 #: addressbook/contact-editor/e-contact-editor.c:852
-#: addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499
-#: mail/folder-browser-factory.c:45
+#: addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:508
+#: mail/folder-browser-factory.c:39
 msgid "Delete"
 msgstr "Borrar"
 
 #: addressbook/contact-editor/e-contact-editor.c:853
-#: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327
+#: calendar/gui/event-editor.c:1387 calendar/gui/gncal-todo.c:336
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
 #: addressbook/contact-editor/e-contact-editor.c:856
-#: calendar/gui/event-editor.c:1339
+#: calendar/gui/event-editor.c:1389
 msgid "FIXME: Previous"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:857
-#: calendar/gui/event-editor.c:1340
+#: calendar/gui/event-editor.c:1390
 msgid "Go to the previous item"
 msgstr "Ir ó elemento anterior"
 
 #: addressbook/contact-editor/e-contact-editor.c:859
-#: calendar/gui/event-editor.c:1341
+#: calendar/gui/event-editor.c:1391
 msgid "FIXME: Next"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor.c:860
-#: calendar/gui/event-editor.c:1342
+#: calendar/gui/event-editor.c:1392
 msgid "Go to the next item"
 msgstr "Ir ó elemento seguinte"
 
 #: addressbook/contact-editor/e-contact-editor.c:862
-#: calendar/gui/event-editor.c:1343
+#: calendar/gui/event-editor.c:1393
 msgid "FIXME: Help"
 msgstr "FIXME: Axuda"
 
 #: addressbook/contact-editor/e-contact-editor.c:863
-#: calendar/gui/event-editor.c:1344
+#: calendar/gui/event-editor.c:1394
 msgid "See online help"
 msgstr "Ve-la axuda online"
 
@@ -696,7 +695,7 @@ msgstr "Buscar un contacto"
 
 #: addressbook/gui/component/addressbook.c:425
 #: addressbook/gui/component/addressbook.c:492
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
+#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:37
 msgid "Print"
 msgstr "Imprimir"
 
@@ -709,7 +708,7 @@ msgid "Delete a contact"
 msgstr "Borrar un contacto"
 
 #: addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:1039
+#: addressbook/gui/component/addressbook.c:1034
 msgid "As _Table"
 msgstr ""
 
@@ -737,20 +736,20 @@ msgid ""
 "OpenLDAP and recompile and install evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:943
+#: addressbook/gui/component/addressbook.c:938
 #: addressbook/gui/minicard/e-minicard.c:330
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/component/addressbook.c:1005
 msgid "* Click here to add a contact *"
 msgstr "* Prema aquí para engadir un contacto *"
 
-#: addressbook/gui/component/addressbook.c:1046
+#: addressbook/gui/component/addressbook.c:1041
 msgid "As _Minicards"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1097
+#: addressbook/gui/component/addressbook.c:1092
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosará o navegador de carpetas"
 
@@ -796,7 +795,7 @@ msgid "g"
 msgstr "g"
 
 #: addressbook/gui/component/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:98
+#: calendar/cal-util/timeutil.c:131
 msgid "h"
 msgstr "h"
 
@@ -1089,11 +1088,11 @@ msgstr ""
 msgid "Header/Footer"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:544
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:543
 msgid "pm"
 msgstr "pm"
 
@@ -1157,8 +1156,8 @@ msgstr "Abrir axenda"
 msgid "Save calendar"
 msgstr "Gardar axenda"
 
-#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713
-#: calendar/gui/gncal-todo.c:717
+#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:722
+#: calendar/gui/gncal-todo.c:726
 msgid "Day"
 msgstr "Día"
 
@@ -1174,7 +1173,7 @@ msgstr "5 Días"
 msgid "Show the working week"
 msgstr "Amosa-la semana laboral"
 
-#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712
+#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:721
 msgid "Week"
 msgstr "Semana"
 
@@ -1222,7 +1221,7 @@ msgstr "Hoxe"
 msgid "Go to present time"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
+#: calendar/gui/calendar-commands.c:554
 msgid "Next"
 msgstr ""
 
@@ -1312,7 +1311,7 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1070
 msgid "Snooze"
 msgstr ""
 
@@ -1356,99 +1355,100 @@ msgstr ""
 msgid "Delete all occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:289
+#: calendar/gui/event-editor.c:291
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/event-editor.c:294
+#: calendar/gui/event-editor.c:296
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/event-editor.c:298
+#: calendar/gui/event-editor.c:300
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/event-editor.c:301
+#: calendar/gui/event-editor.c:303
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/event-editor.c:304
+#: calendar/gui/event-editor.c:306
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
 #. Owner, summary
-#: calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688
+#: calendar/gui/event-editor.c:622 calendar/gui/event-editor.c:718
 msgid "?"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1148
+#: calendar/gui/event-editor.c:1198
 msgid "FIXME: _Delete"
 msgstr "FIXME: _Borrar"
 
-#: calendar/gui/event-editor.c:1215
+#: calendar/gui/event-editor.c:1265
 msgid "FIXME: Ca_lendar..."
 msgstr "FIXME: A_xenda..."
 
-#: calendar/gui/event-editor.c:1250
+#: calendar/gui/event-editor.c:1300
 msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1251
+#: calendar/gui/event-editor.c:1301
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: _Libro de enderezos..."
 
-#: calendar/gui/event-editor.c:1258
+#: calendar/gui/event-editor.c:1308
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nova Cita"
 
-#: calendar/gui/event-editor.c:1260
+#: calendar/gui/event-editor.c:1310
 msgid "FIXME: Rec_urrence..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1262
-msgid "FIXME: Intive _Attendees..."
-msgstr ""
+#: calendar/gui/event-editor.c:1312
+#, fuzzy
+msgid "FIXME: Invite _Attendees..."
+msgstr "FIXME: Gardar Ad_xuntos..."
 
-#: calendar/gui/event-editor.c:1263
+#: calendar/gui/event-editor.c:1313
 msgid "FIXME: C_ancel Invitation..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1265
+#: calendar/gui/event-editor.c:1315
 msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1320
+#: calendar/gui/event-editor.c:1370
 msgid "FIXME: Save and Close"
 msgstr "FIXME: Gardar e Pechar"
 
-#: calendar/gui/event-editor.c:1325
+#: calendar/gui/event-editor.c:1375
 msgid "FIXME: Print..."
 msgstr "FIXME: Imprimir..."
 
-#: calendar/gui/event-editor.c:1330
+#: calendar/gui/event-editor.c:1380
 msgid "FIXME: Recurrence..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1331
+#: calendar/gui/event-editor.c:1381
 msgid "Configure recurrence rules"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1333
+#: calendar/gui/event-editor.c:1383
 msgid "FIXME: Invite Attendees..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1334
+#: calendar/gui/event-editor.c:1384
 msgid "Invite attendees to a meeting"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1336
+#: calendar/gui/event-editor.c:1386
 msgid "FIXME: Delete"
 msgstr "FIXME: Borrar"
 
-#: calendar/gui/event-editor.c:1745
+#: calendar/gui/event-editor.c:1828
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -1665,110 +1665,110 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:137
+#: calendar/gui/gncal-todo.c:140
 msgid "Create to-do item"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:137
+#: calendar/gui/gncal-todo.c:140
 msgid "Edit to-do item"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:171
+#: calendar/gui/gncal-todo.c:176
 msgid "Summary:"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:181
+#: calendar/gui/gncal-todo.c:186
 msgid "Due Date:"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:190
+#: calendar/gui/gncal-todo.c:195
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: calendar/gui/gncal-todo.c:207
+#: calendar/gui/gncal-todo.c:212
 msgid "Item Comments:"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:325
+#: calendar/gui/gncal-todo.c:334
 msgid "Add to-do item..."
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:326
+#: calendar/gui/gncal-todo.c:335
 msgid "Edit this item..."
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:425
+#: calendar/gui/gncal-todo.c:434
 msgid "Summary"
 msgstr "Resume"
 
-#: calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604
+#: calendar/gui/gncal-todo.c:435 calendar/gui/prop.c:604
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605
+#: calendar/gui/gncal-todo.c:436 calendar/gui/prop.c:605
 #: mail/message-list.c:474
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/gncal-todo.c:428
+#: calendar/gui/gncal-todo.c:437
 msgid "Time Left"
 msgstr ""
 
 #. Label
-#: calendar/gui/gncal-todo.c:440
+#: calendar/gui/gncal-todo.c:449
 msgid "To-do list"
 msgstr ""
 
 #. Add
-#: calendar/gui/gncal-todo.c:479
+#: calendar/gui/gncal-todo.c:488
 #: composer/e-msg-composer-address-dialog.glade.h:13
 msgid "Add..."
 msgstr "Engadir..."
 
 #. Edit
-#: calendar/gui/gncal-todo.c:488
+#: calendar/gui/gncal-todo.c:497
 msgid "Edit..."
 msgstr "Editar..."
 
-#: calendar/gui/gncal-todo.c:712
+#: calendar/gui/gncal-todo.c:721
 msgid "Weeks"
 msgstr "Semanas"
 
-#: calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717
+#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
 msgid "Days"
 msgstr "Días"
 
-#: calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
 msgid "Hour"
 msgstr "Hora"
 
-#: calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
+#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
+#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
 msgid "Minute"
 msgstr "Minuto"
 
-#: calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
+#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
 msgid "Seconds"
 msgstr "Segundos"
 
-#: calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732
+#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
 msgid "Second"
 msgstr "Segundo"
 
-#: calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
-#: calendar/gui/gnome-cal.c:1120
+#: calendar/gui/gnome-cal.c:461 calendar/gui/gnome-cal.c:1078
+#: calendar/gui/gnome-cal.c:1134
 msgid "Reminder of your appointment at "
 msgstr ""
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124
+#: calendar/gui/gnome-cal.c:1083 calendar/gui/gnome-cal.c:1138
 msgid "Ok"
 msgstr ""
 
@@ -2146,7 +2146,7 @@ msgstr ""
 msgid "Defaults"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945
+#: composer/e-msg-composer-address-dialog.c:183
 msgid "Cut"
 msgstr "Cortar"
 
@@ -2154,7 +2154,7 @@ msgstr "Cortar"
 msgid "Cut selected item into clipboard"
 msgstr "Borrar e copiar o elemento seleccionado ó cartafol"
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946
+#: composer/e-msg-composer-address-dialog.c:187
 msgid "Copy"
 msgstr "Copiar"
 
@@ -2163,7 +2163,7 @@ msgid "Copy selected item into clipboard"
 msgstr "Copiar o elemento seleccionado ó cartafol"
 
 #: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947
+#: composer/e-msg-composer-address-dialog.c:199
 msgid "Paste"
 msgstr "Pegar"
 
@@ -2253,7 +2253,7 @@ msgstr "%.1fG"
 msgid "Add attachment"
 msgstr "Engadir adxunto"
 
-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:332
+#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
 msgid "Remove"
 msgstr "Quitar"
 
@@ -2326,45 +2326,45 @@ msgstr "Asunto:"
 msgid "Enter the subject of the mail"
 msgstr "Introduza o asunto da mensaxe"
 
-#: composer/e-msg-composer.c:463
+#: composer/e-msg-composer.c:444
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:474
+#: composer/e-msg-composer.c:455
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:494
+#: composer/e-msg-composer.c:475
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:513
+#: composer/e-msg-composer.c:494
 msgid "Discard this message?"
 msgstr "żDescartar esta mensaxe?"
 
-#: composer/e-msg-composer.c:561
+#: composer/e-msg-composer.c:511
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:623
 msgid "That file does not exist."
 msgstr "O ficheiro non existe."
 
-#: composer/e-msg-composer.c:686
+#: composer/e-msg-composer.c:633
 msgid "That is not a regular file."
 msgstr "Non é un ficheiro normal."
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:643
 msgid "That file exists but is not readable."
 msgstr "O ficheiro existe pero non se pode ler."
 
-#: composer/e-msg-composer.c:707
+#: composer/e-msg-composer.c:653
 msgid "That file appeared accesible but open(2) failed."
 msgstr "O ficheiro parecía accesible pero a chamada a open(2) fallou."
 
-#: composer/e-msg-composer.c:729
+#: composer/e-msg-composer.c:675
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2372,244 +2372,273 @@ msgstr ""
 "O ficheiro é moi longo (máis de 100K).\n"
 "żEstá seguro de querer inserilo?"
 
-#: composer/e-msg-composer.c:748
+#: composer/e-msg-composer.c:696
 msgid "An error occurred while reading the file."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:888
+#: composer/e-msg-composer.c:792 shell/e-shell-view-menu.c:438
+#, fuzzy
+msgid "_File"
+msgstr "_Móbil"
+
+#: composer/e-msg-composer.c:798
+msgid "_Open..."
+msgstr ""
+
+#: composer/e-msg-composer.c:799
+msgid "Load a previously saved message"
+msgstr ""
+
+#: composer/e-msg-composer.c:807
+#, fuzzy
+msgid "_Save..."
+msgstr "Gardar como..."
+
+#: composer/e-msg-composer.c:808
+#, fuzzy
+msgid "Save message"
+msgstr "Enviar a mensaxe"
+
+#: composer/e-msg-composer.c:816
+#, fuzzy
+msgid "_Save as..."
+msgstr "Gardar como..."
+
+#: composer/e-msg-composer.c:817
+#, fuzzy
+msgid "Save message with a different name"
+msgstr "Garda-la mensaxe na carpeta indicada"
+
+#: composer/e-msg-composer.c:825
 msgid "Save in _folder..."
 msgstr "Gardar en _carpeta..."
 
-#: composer/e-msg-composer.c:888
+#: composer/e-msg-composer.c:826
 msgid "Save the message in a specified folder"
 msgstr "Garda-la mensaxe na carpeta indicada"
 
-#: composer/e-msg-composer.c:891
-msgid "_Insert Text File"
+#: composer/e-msg-composer.c:835
+#, fuzzy
+msgid "_Insert text file... (FIXME)"
 msgstr "_Inserir Ficheiro de Texto"
 
-#: composer/e-msg-composer.c:891
+#: composer/e-msg-composer.c:836
 msgid "Insert a file as text into the message"
 msgstr "Inserir un ficheiro como texto na mensaxe"
 
-#: composer/e-msg-composer.c:894 composer/e-msg-composer.c:942
-msgid "Send"
+#: composer/e-msg-composer.c:845
+#, fuzzy
+msgid "_Send"
 msgstr "Enviar"
 
-#: composer/e-msg-composer.c:894
+#: composer/e-msg-composer.c:846
 msgid "Send the message"
 msgstr "Enviar a mensaxe"
 
-#: composer/e-msg-composer.c:906
-msgid "View _attachments"
-msgstr "Mirar _adxuntos"
+#: composer/e-msg-composer.c:856
+msgid "_Close..."
+msgstr ""
 
-#: composer/e-msg-composer.c:907
-msgid "View/hide attachments"
-msgstr "Mirar/ocultar adxuntos"
+#: composer/e-msg-composer.c:857
+msgid "Quit the message composer"
+msgstr ""
 
-#: composer/e-msg-composer.c:942
-msgid "Send this message"
-msgstr "Enviar esta mensaxe"
+#: composer/e-msg-composer.c:870 shell/e-shell-view-menu.c:480
+#, fuzzy
+msgid "_Edit"
+msgstr "Editar..."
+
+#: composer/e-msg-composer.c:881
+#, fuzzy
+msgid "_Format"
+msgstr "_Formatar"
+
+#: composer/e-msg-composer.c:887
+msgid "HTML"
+msgstr ""
+
+#: composer/e-msg-composer.c:888
+msgid "Send the mail in HTML format"
+msgstr ""
 
-#: composer/e-msg-composer.c:945
-msgid "Cut selected region into the clipboard"
-msgstr "Corta-la rexión seleccionada ó cartafol"
+#: composer/e-msg-composer.c:901 shell/e-shell-view-menu.c:387
+#: shell/e-shell-view-menu.c:491
+#, fuzzy
+msgid "_View"
+msgstr "_Nova"
 
-#: composer/e-msg-composer.c:946
-msgid "Copy selected region into the clipboard"
-msgstr "Copia-la rexión seleccionada ó cartafol"
+#: composer/e-msg-composer.c:907
+#, fuzzy
+msgid "Show _attachments"
+msgstr "Mirar _adxuntos"
 
-#: composer/e-msg-composer.c:947
-msgid "Paste selected region into the clipboard"
-msgstr "Pega-la rexión seleccionada ó cartafol"
+#: composer/e-msg-composer.c:908
+#, fuzzy
+msgid "Show/hide attachments"
+msgstr "Mirar/ocultar adxuntos"
 
-#: composer/e-msg-composer.c:948
-msgid "Undo"
-msgstr "Desfacer"
+#: composer/e-msg-composer.c:941
+msgid "Send"
+msgstr "Enviar"
 
-#: composer/e-msg-composer.c:948
-msgid "Undo last operation"
-msgstr "Desface-la última operación"
+#: composer/e-msg-composer.c:942
+msgid "Send this message"
+msgstr "Enviar esta mensaxe"
 
 #: composer/e-msg-composer.c:951
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: composer/e-msg-composer.c:951
+#: composer/e-msg-composer.c:952
 msgid "Attach a file"
 msgstr "Adxuntar un ficheiro"
 
-#: composer/e-msg-composer.c:1127
+#: composer/e-msg-composer.c:1139
 msgid "Compose a message"
 msgstr "Compońer unha mensaxe"
 
-#: filter/filter-editor.c:198
-msgid "Edit Filter"
-msgstr "Editar Filtro"
-
-#: filter/filter-editor.c:198
-msgid "Create filter"
-msgstr "Crear filtro"
-
-#: filter/filter-editor.c:209
-msgid "Back"
-msgstr "Atrás"
-
-#: filter/filter-editor.c:211
-msgid "Finish"
-msgstr "Finalizar"
-
-#: filter/filter-editor.c:212
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: filter/filter-editor.c:216
-msgid "Apply"
-msgstr "Aplicar"
-
-#: filter/filter-editor.c:233
-msgid ""
-"<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
-"continue forwards to customise it.</p>"
-msgstr ""
-
-#: mail/component-factory.c:196
+#: mail/component-factory.c:188
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializa-lo compońente de correo de Evolution."
 
-#: mail/folder-browser-factory.c:29
+#: mail/folder-browser-factory.c:23
 msgid "Get mail"
 msgstr "Baixar correo"
 
-#: mail/folder-browser-factory.c:29
+#: mail/folder-browser-factory.c:23
 msgid "Check for new mail"
 msgstr "Comprobar o novo correo"
 
-#: mail/folder-browser-factory.c:30
+#: mail/folder-browser-factory.c:24
 msgid "Compose"
 msgstr "Compońer"
 
-#: mail/folder-browser-factory.c:30
+#: mail/folder-browser-factory.c:24
 msgid "Compose a new message"
 msgstr "Compońer unha nova mensaxe"
 
-#: mail/folder-browser-factory.c:34
+#: mail/folder-browser-factory.c:28
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/folder-browser-factory.c:34
+#: mail/folder-browser-factory.c:28
 msgid "Reply to the sender of this message"
 msgstr "Responder ó autor desta mensaxe"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:29
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:29
 msgid "Reply to all recipients of this message"
 msgstr "Responder a tódolos destinatarios desta mensaxe"
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser-factory.c:31
 msgid "Forward"
 msgstr "Re-enviar"
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser-factory.c:31
 msgid "Forward this message"
 msgstr "Re-enviar esta mensaxe"
 
-#: mail/folder-browser-factory.c:41
-msgid "Refile"
-msgstr ""
+#: mail/folder-browser-factory.c:35
+#, fuzzy
+msgid "Move"
+msgstr "Lu"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:35
 msgid "Move message to a new folder"
 msgstr "Mover mensaxe a unha nova carpeta"
 
-#: mail/folder-browser-factory.c:43
+#: mail/folder-browser-factory.c:37
 msgid "Print the selected message"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: mail/folder-browser-factory.c:45
+#: mail/folder-browser-factory.c:39
 msgid "Delete this message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/folder-browser-factory.c:65
+#: mail/folder-browser-factory.c:59
 msgid "_Threaded Message List"
 msgstr ""
 
-#: mail/folder-browser-factory.c:77
+#: mail/folder-browser-factory.c:72
+msgid "_Mark all messages seen"
+msgstr ""
+
+#: mail/folder-browser-factory.c:78
 msgid "_Expunge"
 msgstr "_Eliminar"
 
-#: mail/folder-browser-factory.c:83
-msgid "_Filter Druid ..."
-msgstr ""
+#: mail/folder-browser-factory.c:84
+#, fuzzy
+msgid "Mail _Filters ..."
+msgstr "FIXME: _Ficheiro..."
 
-#: mail/folder-browser-factory.c:89
-msgid "_Virtual Folder Druid ..."
+#: mail/folder-browser-factory.c:90
+msgid "_vFolder Editor ..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:95
+#: mail/folder-browser-factory.c:96
 msgid "_Mail Configuration ..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:101
+#: mail/folder-browser-factory.c:102
 msgid "Forget _Passwords"
 msgstr "Esquecer _Contrasinais"
 
-#: mail/mail-config.c:262
+#: mail/mail-config.c:688
 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 ""
 
-#: mail/mail-config.c:277
+#: mail/mail-config.c:701
 msgid "Full name:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.c:305
+#: mail/mail-config.c:725
 msgid "Email address:"
 msgstr "Enderezo de email:"
 
-#: mail/mail-config.c:328
+#: mail/mail-config.c:740
 msgid "Organization:"
 msgstr "Organización:"
 
-#: mail/mail-config.c:340
+#: mail/mail-config.c:751
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.c:345
+#: mail/mail-config.c:756
 msgid "Signature File"
 msgstr "Ficheiro de Sinatura"
 
-#: mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621
+#: mail/mail-config.c:1167
 msgid "Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config.c:725
+#: mail/mail-config.c:1173
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: mail/mail-config.c:732
+#: mail/mail-config.c:1179
 msgid "Path:"
 msgstr "Camińo:"
 
-#: mail/mail-config.c:739 mail/mail-config.c:819
+#: mail/mail-config.c:1187
 msgid "Authentication:"
 msgstr "Autenticación:"
 
-#: mail/mail-config.c:751 mail/mail-config.c:831
+#: mail/mail-config.c:1199
 msgid "Detect supported types..."
 msgstr "Detectar tipos soportados..."
 
-#: mail/mail-config.c:777 mail/mail-config.c:853
-msgid "Test these values before continuing"
-msgstr "Probe eses valores antes de continuar"
+#: mail/mail-config.c:1222
+msgid "Test Settings"
+msgstr ""
 
-#: mail/mail-config.c:960
+#: mail/mail-config.c:1344 mail/mail-config.c:1392
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -2618,66 +2647,44 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config.c:978
-msgid "Select the method you would like to use to deliver your mail."
-msgstr ""
-
-#: mail/mail-config.c:1163 mail/mail-config.c:1242
-msgid "Mail Configuration"
-msgstr "Configuración do Correo"
-
-#. Identity page
-#: mail/mail-config.c:1180
-msgid "Identity"
-msgstr "Identidade"
-
-#. Source page
-#: mail/mail-config.c:1199
-msgid "Mail Source"
-msgstr ""
-
-#. Transport page
-#: mail/mail-config.c:1220
-msgid "Mail Transport"
+#: mail/mail-config.c:1368
+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 ""
 
-#: mail/mail-config.c:1343
+#: mail/mail-config.c:1434
 msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config.c:1345
+#: mail/mail-config.c:1436
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config.c:1488
+#: mail/mail-config.c:1515
 msgid "Edit Source"
 msgstr ""
 
-#: mail/mail-config.c:1490
+#: mail/mail-config.c:1517
 msgid "Add Source"
 msgstr ""
 
-#. "\n\n"
-#. "If the server requires authentication, you can click the "
-#. "\"Detect supported types...\" button after entering "
-#. "the other information."
-#: mail/mail-config.c:1600
-msgid "Enter the hostname of the News Server you have."
-msgstr ""
-
-#: mail/mail-config.c:1656
+#: mail/mail-config.c:1598
 msgid "Edit News Server"
 msgstr "Editar Servidor de News"
 
-#: mail/mail-config.c:1658
+#: mail/mail-config.c:1600
 msgid "Add News Server"
 msgstr "Engadir Servidor de News"
 
-#: mail/mail-ops.c:374
+#: mail/mail-ops.c:393
 msgid "Fetching mail"
 msgstr "Baixando correo"
 
-#: mail/mail-ops.c:386
+#: mail/mail-ops.c:405
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -2685,9 +2692,10 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "żEnviar realmente?"
 
-#: mail/mail-ops.c:731
-msgid "Refile message(s) to"
-msgstr ""
+#: mail/mail-ops.c:791
+#, fuzzy
+msgid "Move message(s) to"
+msgstr "Mover mensaxe a unha nova carpeta"
 
 #: mail/mail-threads.c:483
 msgid "Currently pending operations:"
@@ -2713,35 +2721,31 @@ msgstr ""
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/main.c:62
-msgid "Mail Component: I could not initialize Bonobo"
-msgstr "Compońente de Correo: Non se pode inicializar Bonobo"
-
-#: mail/message-list.c:460
+#: mail/message-list.c:456
 msgid "Online Status"
 msgstr ""
 
-#: mail/message-list.c:488
+#: mail/message-list.c:492
 msgid "From"
 msgstr "De"
 
-#: mail/message-list.c:495
+#: mail/message-list.c:499
 msgid "Subject"
 msgstr "Asunto"
 
-#: mail/message-list.c:502
+#: mail/message-list.c:506
 msgid "Date"
 msgstr "Data"
 
-#: mail/message-list.c:509
+#: mail/message-list.c:513
 msgid "Received"
 msgstr "Recibido"
 
-#: mail/message-list.c:516
+#: mail/message-list.c:520
 msgid "To"
 msgstr "A"
 
-#: mail/message-list.c:523
+#: mail/message-list.c:527
 msgid "Size"
 msgstr "Tamańo"
 
@@ -2755,7 +2759,8 @@ msgstr "Semella que é a primeira vez que executa Evolution."
 
 #: shell/e-setup.c:52
 msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr "Prema \"Aceptar\" para instala-los ficheiros de usuario de Evolution en"
+msgstr ""
+"Prema \"Aceptar\" para instala-los ficheiros de usuario de Evolution en"
 
 #: shell/e-setup.c:69
 #, c-format
@@ -2819,163 +2824,177 @@ msgstr ""
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:355
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
 #. you might have to call gnome_dialog_run() on the
 #. * dialog returned here, I don't remember...
 #.
-#: shell/e-shell-view-menu.c:110
+#: shell/e-shell-view-menu.c:113
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy non foi atopado no seu $PATH."
 
 #. same as above
-#: shell/e-shell-view-menu.c:116
+#: shell/e-shell-view-menu.c:119
 msgid "Bug buddy could not be run."
 msgstr "Non se puido executar Bug buddy."
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:164
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:161
+#: shell/e-shell-view-menu.c:166
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:163
+#: shell/e-shell-view-menu.c:168
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:301
+#: shell/e-shell-view-menu.c:324
 msgid "Go to folder..."
 msgstr "Ir á carpeta..."
 
-#: shell/e-shell-view-menu.c:365
+#: shell/e-shell-view-menu.c:381
+msgid "_New"
+msgstr "_Nova"
+
+#: shell/e-shell-view-menu.c:393
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: shell/e-shell-view-menu.c:369
-msgid "Evolution _Bar Shortcut"
+#: shell/e-shell-view-menu.c:399
+#, fuzzy
+msgid "Evolution bar _shortcut"
 msgstr "_Barra de Atallos de Evolution"
 
-#: shell/e-shell-view-menu.c:375
+#: shell/e-shell-view-menu.c:408
 msgid "_Mail message (FIXME)"
 msgstr "Enviar _Mensaxe (FIXME)"
 
-#: shell/e-shell-view-menu.c:376 shell/e-shell-view-menu.c:379
-msgid "Composes a new mail message"
-msgstr "Compońer unha nova mensaxe de correo"
-
-#: shell/e-shell-view-menu.c:378
+#: shell/e-shell-view-menu.c:414
 msgid "_Appointment (FIXME)"
 msgstr "_Cita (FIXME)"
 
-#: shell/e-shell-view-menu.c:381
+#: shell/e-shell-view-menu.c:420
 msgid "_Contact (FIXME)"
 msgstr "_Contacto (FIXME)"
 
-#: shell/e-shell-view-menu.c:384
+#: shell/e-shell-view-menu.c:426
 msgid "_Task (FIXME)"
 msgstr "_Tarefa (FIXME)"
 
-#: shell/e-shell-view-menu.c:387
-msgid "Task _Request (FIXME)"
-msgstr "Solicitar _Tarefa (FIXME)"
-
-#: shell/e-shell-view-menu.c:390
-msgid "_Journal Entry (FIXME)"
-msgstr "Entrada de _Xornal (FIXME)"
-
-#: shell/e-shell-view-menu.c:398
-msgid "_New"
-msgstr "_Nova"
-
-#: shell/e-shell-view-menu.c:402
+#: shell/e-shell-view-menu.c:448
 msgid "_Go to folder..."
 msgstr "_Ir á carpeta..."
 
-#: shell/e-shell-view-menu.c:402
+#: shell/e-shell-view-menu.c:449
 msgid "Display a different folder"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:404
+#: shell/e-shell-view-menu.c:456
 msgid "_Create new folder..."
 msgstr "_Crear unha nova carpeta..."
 
-#: shell/e-shell-view-menu.c:404
+#: shell/e-shell-view-menu.c:457 shell/e-shell-view-menu.c:467
 msgid "Create a new folder"
 msgstr "Crear unha nova carpeta"
 
-#: shell/e-shell-view-menu.c:419
+#: shell/e-shell-view-menu.c:466
+#, fuzzy
+msgid "E_xit..."
+msgstr "Editar..."
+
+#: shell/e-shell-view-menu.c:497
 msgid "Show _shortcut bar"
 msgstr "Amosar barra de _atallos"
 
-#: shell/e-shell-view-menu.c:420
+#: shell/e-shell-view-menu.c:498
 msgid "Show the shortcut bar"
 msgstr "Amosa-la barra de atallos"
 
-#: shell/e-shell-view-menu.c:422
+#: shell/e-shell-view-menu.c:503
 msgid "Show _folder bar"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:423
+#: shell/e-shell-view-menu.c:504
 msgid "Show the folder bar"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:440
-msgid "Help _Index"
+#: shell/e-shell-view-menu.c:526
+msgid "_Actions"
+msgstr "_Accións"
+
+#: shell/e-shell-view-menu.c:537
+#, fuzzy
+msgid "_Help"
+msgstr "_Casa"
+
+#: shell/e-shell-view-menu.c:543
+#, fuzzy
+msgid "Help _index"
 msgstr "_Índice da Axuda"
 
-#: shell/e-shell-view-menu.c:443
-msgid "Getting _Started"
-msgstr ""
+#: shell/e-shell-view-menu.c:550
+#, fuzzy
+msgid "Getting _started"
+msgstr "Hora de _comezo da reunión:"
 
-#: shell/e-shell-view-menu.c:446
-msgid "Using the _Mailer"
+#: shell/e-shell-view-menu.c:557
+#, fuzzy
+msgid "Using the _mailer"
 msgstr "Usando o _Lector"
 
-#: shell/e-shell-view-menu.c:449
-msgid "Using the _Calendar"
+#: shell/e-shell-view-menu.c:564
+#, fuzzy
+msgid "Using the _calendar"
 msgstr "Usando a _Axenda"
 
-#: shell/e-shell-view-menu.c:452
-msgid "Using the Cont_act Manager"
+#: shell/e-shell-view-menu.c:571
+#, fuzzy
+msgid "Using the c_ontact manager"
 msgstr "Usando o Xestor de _Contactos"
 
-#: shell/e-shell-view-menu.c:457
+#: shell/e-shell-view-menu.c:581
 msgid "_Submit bug report"
 msgstr "_Enviar informe de erro"
 
-#: shell/e-shell-view-menu.c:458
-msgid "Submit bug-report via bug-buddy"
+#: shell/e-shell-view-menu.c:582
+#, fuzzy
+msgid "Submit bug report using Bug Buddy"
 msgstr "Enviar un informe de erro con bug-buddy"
 
-#: shell/e-shell-view-menu.c:474
-msgid "_Actions"
-msgstr "_Accións"
+#: shell/e-shell-view-menu.c:591
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Evolution"
 
-#: shell/e-shell-view.c:113
+#: shell/e-shell-view-menu.c:592
+msgid "Show information about Evolution"
+msgstr ""
+
+#: shell/e-shell-view.c:114
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:208
+#: shell/e-shell-view.c:342
 msgid "Folders"
 msgstr "Carpetas"
 
-#: shell/e-shell-view.c:596
+#: shell/e-shell-view.c:734
 msgid "None"
 msgstr ""
 
-#: shell/e-shell-view.c:600
+#: shell/e-shell-view.c:738
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:299
+#: shell/e-shell.c:293
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o almacenamento local -- %s"
@@ -2996,15 +3015,15 @@ msgstr "Iconas _Grandes"
 msgid "Show the shortcuts as large icons"
 msgstr "Amosa-los atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:330
 msgid "Activate"
 msgstr "Activar"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:330
 msgid "Activate this shortcut"
 msgstr "Activar este atallo"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -3064,7 +3083,7 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Erro descońecido"
 
-#: shell/main.c:99
+#: shell/main.c:66
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -3086,7 +3105,7 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:126
+#: shell/main.c:93
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -3094,15 +3113,15 @@ msgstr ""
 "Gracińas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:172
+#: shell/main.c:128
 msgid "Cannot initialize the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:214
+#: shell/main.c:166
 msgid "Cannot initialize the configuration system."
 msgstr "Non se pode inicializa-lo sistema de configuración."
 
-#: shell/main.c:220
+#: shell/main.c:172
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compońentes de Bonobo"
 
@@ -3255,7 +3274,61 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/shortcut-bar/e-group-bar.c:633
+#: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Grupo %i"
+
+#~ msgid "Cut selected region into the clipboard"
+#~ msgstr "Corta-la rexión seleccionada ó cartafol"
+
+#~ msgid "Copy selected region into the clipboard"
+#~ msgstr "Copia-la rexión seleccionada ó cartafol"
+
+#~ msgid "Paste selected region into the clipboard"
+#~ msgstr "Pega-la rexión seleccionada ó cartafol"
+
+#~ msgid "Undo"
+#~ msgstr "Desfacer"
+
+#~ msgid "Undo last operation"
+#~ msgstr "Desface-la última operación"
+
+#~ msgid "Edit Filter"
+#~ msgstr "Editar Filtro"
+
+#~ msgid "Create filter"
+#~ msgstr "Crear filtro"
+
+#~ msgid "Back"
+#~ msgstr "Atrás"
+
+#~ msgid "Finish"
+#~ msgstr "Finalizar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Test these values before continuing"
+#~ msgstr "Probe eses valores antes de continuar"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "Configuración do Correo"
+
+#~ msgid "Identity"
+#~ msgstr "Identidade"
+
+#~ msgid "Mail Component: I could not initialize Bonobo"
+#~ msgstr "Compońente de Correo: Non se pode inicializar Bonobo"
+
+#~ msgid "Composes a new mail message"
+#~ msgstr "Compońer unha nova mensaxe de correo"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Solicitar _Tarefa (FIXME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "Entrada de _Xornal (FIXME)"
diff --git a/po/hu.po b/po/hu.po
index 73deb565bd..11cf67e9ca 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2000-07-28 16:43+0200\n"
+"POT-Creation-Date: 2000-08-02 16:37+0200\n"
 "PO-Revision-Date: 2000-05-19 19:06+0100\n"
 "Last-Translator: Szabolcs BAN <shooby@gnome.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -709,7 +709,7 @@ msgid "Delete a contact"
 msgstr "Névjegy törlése"
 
 #: addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:1039
+#: addressbook/gui/component/addressbook.c:1034
 msgid "As _Table"
 msgstr "_Táblázatként"
 
@@ -745,20 +745,20 @@ msgstr ""
 "használni egy LDAP szervert, le kell töltened és\n"
 "telepítened az OpenLDAP csomagot, és újrafordítani az Evolúciót.\n"
 
-#: addressbook/gui/component/addressbook.c:943
+#: addressbook/gui/component/addressbook.c:938
 #: addressbook/gui/minicard/e-minicard.c:330
 msgid "Save as VCard"
 msgstr "VCard-ként mentés"
 
-#: addressbook/gui/component/addressbook.c:1010
+#: addressbook/gui/component/addressbook.c:1005
 msgid "* Click here to add a contact *"
 msgstr "* Kattints ide névjegy hozzáadásához *"
 
-#: addressbook/gui/component/addressbook.c:1046
+#: addressbook/gui/component/addressbook.c:1041
 msgid "As _Minicards"
 msgstr "_Kártyákként"
 
-#: addressbook/gui/component/addressbook.c:1097
+#: addressbook/gui/component/addressbook.c:1092
 msgid "The URI that the Folder Browser will display"
 msgstr "Az URI amit a Mappa Böngésző meg fog nyitni"
 
@@ -804,7 +804,7 @@ msgid "g"
 msgstr "g"
 
 #: addressbook/gui/component/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:98
+#: calendar/cal-util/timeutil.c:131
 msgid "h"
 msgstr "h"
 
@@ -1102,11 +1102,11 @@ msgstr "Páros lapokon fordított"
 msgid "Header/Footer"
 msgstr "Fejléc/lábléc"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:544
 msgid "am"
 msgstr "de"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:543
 msgid "pm"
 msgstr "du"
 
@@ -1235,7 +1235,7 @@ msgstr "Ma"
 msgid "Go to present time"
 msgstr "Jelenidőre ugrás"
 
-#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
+#: calendar/gui/calendar-commands.c:554
 msgid "Next"
 msgstr "Köv."
 
@@ -1719,7 +1719,7 @@ msgid "Due Date"
 msgstr "Lejárat"
 
 #: calendar/gui/gncal-todo.c:436 calendar/gui/prop.c:605
-#: mail/message-list.c:470
+#: mail/message-list.c:474
 msgid "Priority"
 msgstr "Prioritás"
 
@@ -2346,45 +2346,45 @@ msgstr "Téma:"
 msgid "Enter the subject of the mail"
 msgstr "Írd be a levél címét (subject)"
 
-#: composer/e-msg-composer.c:447
+#: composer/e-msg-composer.c:444
 msgid "Save as..."
 msgstr "Ment mint..."
 
-#: composer/e-msg-composer.c:458
+#: composer/e-msg-composer.c:455
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fájl mentési hiba: %s"
 
-#: composer/e-msg-composer.c:478
+#: composer/e-msg-composer.c:475
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fájl betöltési hiba: %s"
 
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:494
 msgid "Discard this message?"
 msgstr "Az üzenet figyelmen kívül hagyása?"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:511
 msgid "Open file"
 msgstr "Fájl megnyitás"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:623
 msgid "That file does not exist."
 msgstr "A fájl nem létezik."
 
-#: composer/e-msg-composer.c:636
+#: composer/e-msg-composer.c:633
 msgid "That is not a regular file."
 msgstr "Nem sima fájl."
 
-#: composer/e-msg-composer.c:646
+#: composer/e-msg-composer.c:643
 msgid "That file exists but is not readable."
 msgstr "Az a fájl létezik, de nem olvasható."
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:653
 msgid "That file appeared accesible but open(2) failed."
 msgstr "A fájl elérhetőnek látszik, de open(2) hiba történt."
 
-#: composer/e-msg-composer.c:678
+#: composer/e-msg-composer.c:675
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2392,152 +2392,120 @@ msgstr ""
 "A fájl túl nagy (100K fölötti).\n"
 "Tényleg be szeretnéd szúrni?"
 
-#: composer/e-msg-composer.c:699
+#: composer/e-msg-composer.c:696
 msgid "An error occurred while reading the file."
 msgstr "Hiba történt megnyitás közben."
 
-#: composer/e-msg-composer.c:795 shell/e-shell-view-menu.c:438
+#: composer/e-msg-composer.c:792 shell/e-shell-view-menu.c:438
 msgid "_File"
 msgstr "_Fájl"
 
-#: composer/e-msg-composer.c:801
+#: composer/e-msg-composer.c:798
 msgid "_Open..."
 msgstr "_Megnyit..."
 
-#: composer/e-msg-composer.c:802
+#: composer/e-msg-composer.c:799
 msgid "Load a previously saved message"
 msgstr "Előzőleg mentett üzenet betöltése"
 
-#: composer/e-msg-composer.c:810
+#: composer/e-msg-composer.c:807
 msgid "_Save..."
 msgstr "_Ment..."
 
-#: composer/e-msg-composer.c:811
+#: composer/e-msg-composer.c:808
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:816
 msgid "_Save as..."
 msgstr "_Ment mint..."
 
-#: composer/e-msg-composer.c:820
+#: composer/e-msg-composer.c:817
 msgid "Save message with a different name"
 msgstr "A levél elmentése másik néven"
 
-#: composer/e-msg-composer.c:828
+#: composer/e-msg-composer.c:825
 msgid "Save in _folder..."
 msgstr "Mentsd _mappába"
 
-#: composer/e-msg-composer.c:829
+#: composer/e-msg-composer.c:826
 msgid "Save the message in a specified folder"
 msgstr "A levél elmentése másik mappába"
 
-#: composer/e-msg-composer.c:838
+#: composer/e-msg-composer.c:835
 msgid "_Insert text file... (FIXME)"
 msgstr "_Szövegfájl beillesztése (FIXME)"
 
-#: composer/e-msg-composer.c:839
+#: composer/e-msg-composer.c:836
 msgid "Insert a file as text into the message"
 msgstr "Fájl beillesztése szövegként"
 
-#: composer/e-msg-composer.c:848
+#: composer/e-msg-composer.c:845
 msgid "_Send"
 msgstr "_Elküld"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:846
 msgid "Send the message"
 msgstr "Levél elküldése"
 
-#: composer/e-msg-composer.c:859
+#: composer/e-msg-composer.c:856
 msgid "_Close..."
 msgstr "_Bezár..."
 
-#: composer/e-msg-composer.c:860
+#: composer/e-msg-composer.c:857
 msgid "Quit the message composer"
 msgstr "Kilépés a levélszerkesztőből"
 
-#: composer/e-msg-composer.c:873 shell/e-shell-view-menu.c:480
+#: composer/e-msg-composer.c:870 shell/e-shell-view-menu.c:480
 msgid "_Edit"
 msgstr "_Szerkeszt"
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:881
 msgid "_Format"
 msgstr "_Formátum"
 
-#: composer/e-msg-composer.c:890
+#: composer/e-msg-composer.c:887
 msgid "HTML"
 msgstr "HTML"
 
-#: composer/e-msg-composer.c:891
+#: composer/e-msg-composer.c:888
 msgid "Send the mail in HTML format"
 msgstr "A levelet HTML formátumban küldd"
 
-#: composer/e-msg-composer.c:904 shell/e-shell-view-menu.c:387
+#: composer/e-msg-composer.c:901 shell/e-shell-view-menu.c:387
 #: shell/e-shell-view-menu.c:491
 msgid "_View"
 msgstr "_Nézet"
 
-#: composer/e-msg-composer.c:910
+#: composer/e-msg-composer.c:907
 msgid "Show _attachments"
 msgstr "Csatolások _nézete"
 
-#: composer/e-msg-composer.c:911
+#: composer/e-msg-composer.c:908
 msgid "Show/hide attachments"
 msgstr "Csatolások megjelenítése/elrejtése"
 
-#: composer/e-msg-composer.c:944
+#: composer/e-msg-composer.c:941
 msgid "Send"
 msgstr "Elküld"
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:942
 msgid "Send this message"
 msgstr "Küldd el a levelet"
 
-#: composer/e-msg-composer.c:954
+#: composer/e-msg-composer.c:951
 msgid "Attach"
 msgstr "Csatolás"
 
-#: composer/e-msg-composer.c:955
+#: composer/e-msg-composer.c:952
 msgid "Attach a file"
 msgstr "Fájl csatolása"
 
-#: composer/e-msg-composer.c:1142
+#: composer/e-msg-composer.c:1139
 msgid "Compose a message"
 msgstr "Levél írása"
 
-#: filter/filter-editor.c:198
-msgid "Edit Filter"
-msgstr "Szűrő szerkesztése"
-
-#: filter/filter-editor.c:198
-msgid "Create filter"
-msgstr "Szűrő készítése"
-
-#: filter/filter-editor.c:209
-msgid "Back"
-msgstr "Vissza"
-
-#: filter/filter-editor.c:211
-msgid "Finish"
-msgstr "Kész"
-
-#: filter/filter-editor.c:212
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: filter/filter-editor.c:216
-msgid "Apply"
-msgstr "Alkalmaz"
-
-#: filter/filter-editor.c:233
-msgid ""
-"<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
-"continue forwards to customise it.</p>"
-msgstr ""
-"<h2>Szűrő szabály készítése</h2><p>Válassz egyet az alapszabályok közül, "
-"majd folytasd a további beállításokhoz.</p>"
-
-#: mail/component-factory.c:193
+#: mail/component-factory.c:188
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nem tudom az Evolúció levelező komponensét elindítani."
 
@@ -2601,27 +2569,33 @@ msgstr "A levél törlése"
 msgid "_Threaded Message List"
 msgstr "_Témaszerinti levéllista"
 
-#: mail/folder-browser-factory.c:71
+#: mail/folder-browser-factory.c:72
+msgid "_Mark all messages seen"
+msgstr ""
+
+#: mail/folder-browser-factory.c:78
 msgid "_Expunge"
 msgstr "_Tisztít"
 
-#: mail/folder-browser-factory.c:77
-msgid "_Filter Druid ..."
+#: mail/folder-browser-factory.c:84
+#, fuzzy
+msgid "Mail _Filters ..."
 msgstr "_Szűrő mágus ..."
 
-#: mail/folder-browser-factory.c:83
-msgid "_Virtual Folder Druid ..."
-msgstr "_Virtuális mappa mágus ..."
+#: mail/folder-browser-factory.c:90
+#, fuzzy
+msgid "_vFolder Editor ..."
+msgstr "_Szűrő mágus ..."
 
-#: mail/folder-browser-factory.c:89
+#: mail/folder-browser-factory.c:96
 msgid "_Mail Configuration ..."
 msgstr "_Levelezési beállítások ... "
 
-#: mail/folder-browser-factory.c:95
+#: mail/folder-browser-factory.c:102
 msgid "Forget _Passwords"
 msgstr "_Jelszó elfelejtése"
 
-#: mail/mail-config.c:262
+#: mail/mail-config.c:688
 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 "
@@ -2631,51 +2605,51 @@ msgstr ""
 "használsz. Mellesleg beírhatod a céged nevét is, valamint az aláírásfájlod "
 "is megadhatod."
 
-#: mail/mail-config.c:277
+#: mail/mail-config.c:701
 msgid "Full name:"
 msgstr "Teljes név:"
 
-#: mail/mail-config.c:305
+#: mail/mail-config.c:725
 msgid "Email address:"
 msgstr "Email cím:"
 
-#: mail/mail-config.c:328
+#: mail/mail-config.c:740
 msgid "Organization:"
 msgstr "Szervezet:"
 
-#: mail/mail-config.c:340
+#: mail/mail-config.c:751
 msgid "Signature file:"
 msgstr "Aláírás fájl:"
 
-#: mail/mail-config.c:345
+#: mail/mail-config.c:756
 msgid "Signature File"
 msgstr "Aláírás fájl"
 
-#: mail/mail-config.c:734 mail/mail-config.c:828 mail/mail-config.c:1641
+#: mail/mail-config.c:1167
 msgid "Server:"
 msgstr "Szerver:"
 
-#: mail/mail-config.c:741
+#: mail/mail-config.c:1173
 msgid "Username:"
 msgstr "Felhasználó:"
 
-#: mail/mail-config.c:748
+#: mail/mail-config.c:1179
 msgid "Path:"
 msgstr "Útvonal:"
 
-#: mail/mail-config.c:755 mail/mail-config.c:835
+#: mail/mail-config.c:1187
 msgid "Authentication:"
 msgstr "Authentikáció:"
 
-#: mail/mail-config.c:767 mail/mail-config.c:847
+#: mail/mail-config.c:1199
 msgid "Detect supported types..."
 msgstr "Támogatott típusok érzékelése..."
 
-#: mail/mail-config.c:793 mail/mail-config.c:869
-msgid "Test these values before continuing"
-msgstr "Az értékek ellenőrzése folytatás előtt"
+#: mail/mail-config.c:1222
+msgid "Test Settings"
+msgstr ""
 
-#: mail/mail-config.c:980
+#: mail/mail-config.c:1344 mail/mail-config.c:1392
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -2689,66 +2663,50 @@ msgstr ""
 "Ha a szerver authentikációt igényel, a 'Támogatott típusok keresése...' "
 "gombra kattints az információk megadása után."
 
-#: mail/mail-config.c:998
-msgid "Select the method you would like to use to deliver your mail."
-msgstr "Válassz egy módot, hogy szeretnéd a leveled kézbesítését."
-
-#: mail/mail-config.c:1183 mail/mail-config.c:1262
-msgid "Mail Configuration"
-msgstr "Levelezés beállítása"
-
-#. Identity page
-#: mail/mail-config.c:1200
-msgid "Identity"
-msgstr "Azonosító"
-
-#. Source page
-#: mail/mail-config.c:1219
-msgid "Mail Source"
-msgstr "Levél forrás"
-
-#. Transport page
-#: mail/mail-config.c:1240
-msgid "Mail Transport"
-msgstr "Levél küldés"
+#: mail/mail-config.c:1368
+#, fuzzy
+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 ""
+"Válaszd ki a levelezőszervered típusát, majd add meg a vele "
+"kapcsolatosinformációkat.\n"
+"\n"
+"Ha a szerver authentikációt igényel, a 'Támogatott típusok keresése...' "
+"gombra kattints az információk megadása után."
 
-#: mail/mail-config.c:1363
+#: mail/mail-config.c:1434
 msgid "Edit Identity"
 msgstr "Azonosító szerkesztése"
 
-#: mail/mail-config.c:1365
+#: mail/mail-config.c:1436
 msgid "Add Identity"
 msgstr "Azonosító hozzáadása"
 
-#: mail/mail-config.c:1508
+#: mail/mail-config.c:1515
 msgid "Edit Source"
 msgstr "Forrás szerkesztése"
 
-#: mail/mail-config.c:1510
+#: mail/mail-config.c:1517
 msgid "Add Source"
 msgstr "Forrás hozzáadása"
 
-#. "\n\n"
-#. "If the server requires authentication, you can click the "
-#. "\"Detect supported types...\" button after entering "
-#. "the other information."
-#: mail/mail-config.c:1620
-msgid "Enter the hostname of the News Server you have."
-msgstr "Írd be a hírcsoport szervered nevét."
-
-#: mail/mail-config.c:1676
+#: mail/mail-config.c:1598
 msgid "Edit News Server"
 msgstr "Hírcsoport-szerver szerkeszése"
 
-#: mail/mail-config.c:1678
+#: mail/mail-config.c:1600
 msgid "Add News Server"
 msgstr "Hírcsoport-szerver hozzáadása"
 
-#: mail/mail-ops.c:367
+#: mail/mail-ops.c:393
 msgid "Fetching mail"
 msgstr "Levelek letöltése"
 
-#: mail/mail-ops.c:379
+#: mail/mail-ops.c:405
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -2756,7 +2714,7 @@ msgstr ""
 "Nincs tárgya a levélnek.\n"
 "Tényleg elküldjem?"
 
-#: mail/mail-ops.c:767
+#: mail/mail-ops.c:791
 msgid "Move message(s) to"
 msgstr "Levél(levelek) mozgatása más mappába"
 
@@ -2788,27 +2746,27 @@ msgstr "A lekérdezést megszakítottad."
 msgid "Online Status"
 msgstr "Online státusz"
 
-#: mail/message-list.c:484
+#: mail/message-list.c:492
 msgid "From"
 msgstr "Feladó"
 
-#: mail/message-list.c:491
+#: mail/message-list.c:499
 msgid "Subject"
 msgstr "Téma"
 
-#: mail/message-list.c:498
+#: mail/message-list.c:506
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/message-list.c:505
+#: mail/message-list.c:513
 msgid "Received"
 msgstr "Kézbesítve"
 
-#: mail/message-list.c:512
+#: mail/message-list.c:520
 msgid "To"
 msgstr "Címzett"
 
-#: mail/message-list.c:519
+#: mail/message-list.c:527
 msgid "Size"
 msgstr "Méret"
 
@@ -3357,7 +3315,56 @@ msgstr "..."
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
-msgstr "Csoportosítás"
+msgstr "Csoportosítás %i"
+
+#~ msgid "Edit Filter"
+#~ msgstr "Szűrő szerkesztése"
+
+#~ msgid "Create filter"
+#~ msgstr "Szűrő készítése"
+
+#~ msgid "Back"
+#~ msgstr "Vissza"
+
+#~ msgid "Finish"
+#~ msgstr "Kész"
+
+#~ msgid "Cancel"
+#~ msgstr "Mégsem"
+
+#~ msgid "Apply"
+#~ msgstr "Alkalmaz"
+
+#~ msgid ""
+#~ "<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
+#~ "continue forwards to customise it.</p>"
+#~ msgstr ""
+#~ "<h2>Szűrő szabály készítése</h2><p>Válassz egyet az alapszabályok közül, "
+#~ "majd folytasd a további beállításokhoz.</p>"
+
+#~ msgid "_Virtual Folder Druid ..."
+#~ msgstr "_Virtuális mappa mágus ..."
+
+#~ msgid "Test these values before continuing"
+#~ msgstr "Az értékek ellenőrzése folytatás előtt"
+
+#~ msgid "Select the method you would like to use to deliver your mail."
+#~ msgstr "Válassz egy módot, hogy szeretnéd a leveled kézbesítését."
+
+#~ msgid "Mail Configuration"
+#~ msgstr "Levelezés beállítása"
+
+#~ msgid "Identity"
+#~ msgstr "Azonosító"
+
+#~ msgid "Mail Source"
+#~ msgstr "Levél forrás"
+
+#~ msgid "Mail Transport"
+#~ msgstr "Levél küldés"
+
+#~ msgid "Enter the hostname of the News Server you have."
+#~ msgstr "Írd be a hírcsoport szervered nevét."
 
 #~ msgid "Cut selected region into the clipboard"
 #~ msgstr "Vágd ki a kiválasztott részt a vágólapra"
diff --git a/po/it.po b/po/it.po
index daee8d78e9..96b215002b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,604 +1,777 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Clara Tattoni <clara.tattoni@libero.it>, 2000
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1.0\n"
-"POT-Creation-Date: 2000-06-23 14:52-0400\n"
+"POT-Creation-Date: 2000-08-02 16:37+0200\n"
 "PO-Revision-Date: 2000-07-15 23:33+02:00\n"
 "Last-Translator: Clara Tattoni <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/gui/component/addressbook-factory.c:57
-#: calendar/gui/evolution-calendar-control.c:64 calendar/gui/main.c:68
+#: addressbook/gui/component/addressbook-factory.c:59 calendar/gui/main.c:68
 #, fuzzy
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
-#: addressbook/contact-editor/e-contact-editor.c:578
-#: calendar/gui/event-editor.c:1118
+#.
+#. * 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/categories-strings.h:7
+#, fuzzy
+msgid "categories"
+msgstr "Ca_tegorie"
+
+#: addressbook/contact-editor/categories-strings.h:8
+msgid "Item(s) belong to these categories:"
+msgstr ""
+
+#: addressbook/contact-editor/categories-strings.h:9
+#, fuzzy
+msgid "Available Categories:"
+msgstr "Campi disponibili"
+
+#: addressbook/contact-editor/e-contact-editor.c:643
+#: calendar/gui/event-editor.c:1168
 #, fuzzy
 msgid "FIXME: _Appointment"
 msgstr "_Appuntamenti"
 
-#: addressbook/contact-editor/e-contact-editor.c:579
-#: calendar/gui/event-editor.c:1119
+#: addressbook/contact-editor/e-contact-editor.c:644
+#: calendar/gui/event-editor.c:1169
 #, fuzzy
 msgid "FIXME: Meeting Re_quest"
 msgstr "_Richieste di appuntamenti"
 
-#: addressbook/contact-editor/e-contact-editor.c:581
-#: calendar/gui/event-editor.c:1121
+#: addressbook/contact-editor/e-contact-editor.c:646
+#: calendar/gui/event-editor.c:1171
 #, fuzzy
 msgid "FIXME: _Mail Message"
 msgstr "Invia _Messaggio"
 
-#: addressbook/contact-editor/e-contact-editor.c:582
-#: calendar/gui/event-editor.c:1122
+#: addressbook/contact-editor/e-contact-editor.c:647
+#: calendar/gui/event-editor.c:1172
 #, fuzzy
 msgid "FIXME: _Contact"
 msgstr "_Contatti"
 
-#: addressbook/contact-editor/e-contact-editor.c:583
-#: calendar/gui/event-editor.c:1123
+#: addressbook/contact-editor/e-contact-editor.c:648
+#: calendar/gui/event-editor.c:1173
 msgid "FIXME: _Task"
 msgstr "_Compito"
 
-#: addressbook/contact-editor/e-contact-editor.c:584
-#: calendar/gui/event-editor.c:1124
+#: addressbook/contact-editor/e-contact-editor.c:649
+#: calendar/gui/event-editor.c:1174
 #, fuzzy
 msgid "FIXME: Task _Request"
 msgstr "_Richiesta compiti"
 
-#: addressbook/contact-editor/e-contact-editor.c:585
-#: calendar/gui/event-editor.c:1125
+#: addressbook/contact-editor/e-contact-editor.c:650
+#: calendar/gui/event-editor.c:1175
 #, fuzzy
 msgid "FIXME: _Journal Entry"
 msgstr "_Ingressi giornalieri"
 
-#: addressbook/contact-editor/e-contact-editor.c:586
-#: calendar/gui/event-editor.c:1126
+#: addressbook/contact-editor/e-contact-editor.c:651
+#: calendar/gui/event-editor.c:1176
 msgid "FIXME: _Note"
 msgstr "_Note"
 
-#: addressbook/contact-editor/e-contact-editor.c:588
-#: addressbook/contact-editor/e-contact-editor.c:693
-#: calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:653
+#: addressbook/contact-editor/e-contact-editor.c:758
+#: calendar/gui/event-editor.c:1178 calendar/gui/event-editor.c:1285
 msgid "FIXME: Ch_oose Form..."
 msgstr "Scegli sc_heda..."
 
-#: addressbook/contact-editor/e-contact-editor.c:593
-#: calendar/gui/event-editor.c:1133
+#: addressbook/contact-editor/e-contact-editor.c:658
+#: calendar/gui/event-editor.c:1183
 msgid "FIXME: _Memo Style"
 msgstr "Stile _Memo"
 
-#: addressbook/contact-editor/e-contact-editor.c:595
-#: calendar/gui/event-editor.c:1135
+#: addressbook/contact-editor/e-contact-editor.c:660
+#: calendar/gui/event-editor.c:1185
 msgid "FIXME: Define Print _Styles..."
 msgstr "Definisci _Stili di Stampa"
 
-#: addressbook/contact-editor/e-contact-editor.c:602
-#: calendar/gui/event-editor.c:1142
+#: addressbook/contact-editor/e-contact-editor.c:667
+#: calendar/gui/event-editor.c:1192
 msgid "FIXME: S_end"
 msgstr "_Invia"
 
-#: addressbook/contact-editor/e-contact-editor.c:606
-#: calendar/gui/event-editor.c:1146
+#: addressbook/contact-editor/e-contact-editor.c:671
+#: calendar/gui/event-editor.c:1196
 #, fuzzy
 msgid "FIXME: Save Attac_hments..."
 msgstr "Salva allegato..."
 
-#: addressbook/contact-editor/e-contact-editor.c:608
-#: calendar/gui/event-editor.c:1148
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: addressbook/contact-editor/e-contact-editor.c:673
 #, fuzzy
-msgid "FIXME: _Delete"
-msgstr "_Elimina"
+msgid "_Delete"
+msgstr "Elimina"
 
-#: addressbook/contact-editor/e-contact-editor.c:609
-#: calendar/gui/event-editor.c:1149
+#: addressbook/contact-editor/e-contact-editor.c:674
+#: calendar/gui/event-editor.c:1199
 msgid "FIXME: _Move to Folder..."
 msgstr "_Sposta nella cartella..."
 
-#: addressbook/contact-editor/e-contact-editor.c:610
-#: calendar/gui/event-editor.c:1150
+#: addressbook/contact-editor/e-contact-editor.c:675
+#: calendar/gui/event-editor.c:1200
 msgid "FIXME: Cop_y to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: addressbook/contact-editor/e-contact-editor.c:612
-#: calendar/gui/event-editor.c:1152
+#: addressbook/contact-editor/e-contact-editor.c:677
+#: calendar/gui/event-editor.c:1202
 #, fuzzy
 msgid "Page Set_up"
 msgstr "Impostazione pagina"
 
-#: addressbook/contact-editor/e-contact-editor.c:613
-#: calendar/gui/event-editor.c:1153
+#: addressbook/contact-editor/e-contact-editor.c:678
+#: calendar/gui/event-editor.c:1203
 msgid "FIXME: Print Pre_view"
 msgstr "A_nteprima di stampa"
 
-#: addressbook/contact-editor/e-contact-editor.c:634
-#: calendar/gui/event-editor.c:1174
+#: addressbook/contact-editor/e-contact-editor.c:699
+#: calendar/gui/event-editor.c:1224
 msgid "FIXME: Paste _Special..."
 msgstr "Incolla _speciale..."
 
-#: addressbook/contact-editor/e-contact-editor.c:639
-#: calendar/gui/event-editor.c:1179
+#: addressbook/contact-editor/e-contact-editor.c:704
+#: calendar/gui/event-editor.c:1229
 msgid "FIXME: Mark as U_nread"
 msgstr "Segna come _non letto"
 
-#: addressbook/contact-editor/e-contact-editor.c:643
-#: calendar/gui/event-editor.c:1183
+#: addressbook/contact-editor/e-contact-editor.c:708
+#: calendar/gui/event-editor.c:1233
 msgid "_Object"
 msgstr "_Oggetto"
 
-#: addressbook/contact-editor/e-contact-editor.c:648
-#: addressbook/contact-editor/e-contact-editor.c:655
-#: calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
+#: addressbook/contact-editor/e-contact-editor.c:713
+#: addressbook/contact-editor/e-contact-editor.c:720
+#: calendar/gui/event-editor.c:1238 calendar/gui/event-editor.c:1245
 msgid "FIXME: _Item"
 msgstr "_Articolo"
 
-#: addressbook/contact-editor/e-contact-editor.c:649
-#: addressbook/contact-editor/e-contact-editor.c:656
-#: calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:714
+#: addressbook/contact-editor/e-contact-editor.c:721
+#: calendar/gui/event-editor.c:1239 calendar/gui/event-editor.c:1246
 msgid "FIXME: _Unread Item"
 msgstr "Articolo _non letto"
 
-#: addressbook/contact-editor/e-contact-editor.c:650
-#: calendar/gui/event-editor.c:1190
+#: addressbook/contact-editor/e-contact-editor.c:715
+#: calendar/gui/event-editor.c:1240
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "P_rimo articolo nella cartella"
 
-#: addressbook/contact-editor/e-contact-editor.c:657
-#: calendar/gui/event-editor.c:1197
+#: addressbook/contact-editor/e-contact-editor.c:722
+#: calendar/gui/event-editor.c:1247
 msgid "FIXME: _Last Item in Folder"
 msgstr "U_ltimo articolo nella cartella"
 
-#: addressbook/contact-editor/e-contact-editor.c:662
-#: calendar/gui/event-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:727
+#: calendar/gui/event-editor.c:1252
 msgid "FIXME: _Standard"
 msgstr "_Strandard"
 
-#: addressbook/contact-editor/e-contact-editor.c:664
-#: calendar/gui/event-editor.c:1204
+#: addressbook/contact-editor/e-contact-editor.c:729
+#: calendar/gui/event-editor.c:1254
 msgid "FIXME: __Formatting"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:667
-#: calendar/gui/event-editor.c:1207
+#: addressbook/contact-editor/e-contact-editor.c:732
+#: calendar/gui/event-editor.c:1257
 msgid "FIXME: _Customize..."
 msgstr "Pe_rsonalizza..."
 
-#: addressbook/contact-editor/e-contact-editor.c:672
-#: calendar/gui/event-editor.c:1212
+#: addressbook/contact-editor/e-contact-editor.c:737
+#: calendar/gui/event-editor.c:1262
 msgid "Pre_vious"
 msgstr "Prec_edente"
 
-#: addressbook/contact-editor/e-contact-editor.c:673
-#: calendar/gui/event-editor.c:1213
+#: addressbook/contact-editor/e-contact-editor.c:738
+#: calendar/gui/event-editor.c:1263
 msgid "Ne_xt"
 msgstr "Succe_ssivo"
 
-#: addressbook/contact-editor/e-contact-editor.c:675
-#: calendar/gui/event-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:740
+#: calendar/gui/event-editor.c:1267
 #, fuzzy
 msgid "_Toolbars"
 msgstr "S_trumenti"
 
-#: addressbook/contact-editor/e-contact-editor.c:680
-#: calendar/gui/event-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:745
+#: calendar/gui/event-editor.c:1272
 msgid "FIXME: _File..."
 msgstr "_File..."
 
-#: addressbook/contact-editor/e-contact-editor.c:681
-#: calendar/gui/event-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:746
+#: calendar/gui/event-editor.c:1273
 msgid "FIXME: It_em..."
 msgstr "_Articolo"
 
-#: addressbook/contact-editor/e-contact-editor.c:682
-#: calendar/gui/event-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:747
+#: calendar/gui/event-editor.c:1274
 msgid "FIXME: _Object..."
 msgstr "Oggetto..."
 
-#: addressbook/contact-editor/e-contact-editor.c:687
-#: calendar/gui/event-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:752
+#: calendar/gui/event-editor.c:1279
 #, fuzzy
 msgid "FIXME: _Font..."
 msgstr "Carattere..."
 
-#: addressbook/contact-editor/e-contact-editor.c:688
-#: calendar/gui/event-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:753
+#: calendar/gui/event-editor.c:1280
 msgid "FIXME: _Paragraph..."
 msgstr "_Paragrafo..."
 
-#: addressbook/contact-editor/e-contact-editor.c:695
-#: calendar/gui/event-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:760
+#: calendar/gui/event-editor.c:1287
 msgid "FIXME: Desi_gn This Form"
 msgstr "Impo_sta questa scheda..."
 
-#: addressbook/contact-editor/e-contact-editor.c:696
-#: calendar/gui/event-editor.c:1238
+#: addressbook/contact-editor/e-contact-editor.c:761
+#: calendar/gui/event-editor.c:1288
 msgid "FIXME: D_esign a Form..."
 msgstr "_imposta una scheda..."
 
-#: addressbook/contact-editor/e-contact-editor.c:698
-#: calendar/gui/event-editor.c:1240
+#: addressbook/contact-editor/e-contact-editor.c:763
+#: calendar/gui/event-editor.c:1290
 msgid "FIXME: Publish _Form..."
 msgstr "Pu_bblica scheda..."
 
-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/event-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:764
+#: calendar/gui/event-editor.c:1291
 msgid "FIXME: Pu_blish Form As..."
 msgstr "Pubblica _scheda come..."
 
-#: addressbook/contact-editor/e-contact-editor.c:701
-#: calendar/gui/event-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:766
+#: calendar/gui/event-editor.c:1293
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:706
-#: calendar/gui/event-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:771
+#: calendar/gui/event-editor.c:1298
 msgid "FIXME: _Spelling..."
 msgstr "Or_tografia..."
 
-#: addressbook/contact-editor/e-contact-editor.c:708
-#: calendar/gui/event-editor.c:1253
+#: addressbook/contact-editor/e-contact-editor.c:773
+#: calendar/gui/event-editor.c:1303
 #, fuzzy
 msgid "_Forms"
 msgstr "Formato"
 
-#: addressbook/contact-editor/e-contact-editor.c:713
+#: addressbook/contact-editor/e-contact-editor.c:778
 msgid "FIXME: _New Contact"
 msgstr "_Nuovo Contatto"
 
-#: addressbook/contact-editor/e-contact-editor.c:714
+#: addressbook/contact-editor/e-contact-editor.c:779
 msgid "FIXME: New _Contact from Same Company"
 msgstr "Nuovo _Contatto della Stessa Compagnia"
 
-#: addressbook/contact-editor/e-contact-editor.c:716
+#: addressbook/contact-editor/e-contact-editor.c:781
 msgid "FIXME: New _Letter to Contact"
 msgstr "Nuova _Lettera per il Contatto"
 
-#: addressbook/contact-editor/e-contact-editor.c:717
+#: addressbook/contact-editor/e-contact-editor.c:782
 msgid "FIXME: New _Message to Contact"
 msgstr "Nuovo _Messaggio per il Contatto"
 
-#: addressbook/contact-editor/e-contact-editor.c:718
+#: addressbook/contact-editor/e-contact-editor.c:783
 msgid "FIXME: New Meetin_g with Contact"
 msgstr "Nuovo meetin_g con Contatto"
 
-#: addressbook/contact-editor/e-contact-editor.c:719
+#: addressbook/contact-editor/e-contact-editor.c:784
 msgid "FIXME: _Plan a Meeting..."
 msgstr "O_rganizza un Meeting..."
 
-#: addressbook/contact-editor/e-contact-editor.c:720
+#: addressbook/contact-editor/e-contact-editor.c:785
 msgid "FIXME: New _Task for Contact"
 msgstr "Nuovo _Compito per il Contatto"
 
-#: addressbook/contact-editor/e-contact-editor.c:721
+#: addressbook/contact-editor/e-contact-editor.c:786
 msgid "FIXME: New _Journal Entry for Contact"
 msgstr "Nuova a_ggiunta quotidiana per il Contatto"
 
-#: addressbook/contact-editor/e-contact-editor.c:723
+#: addressbook/contact-editor/e-contact-editor.c:788
 msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:724
+#: addressbook/contact-editor/e-contact-editor.c:789
 msgid "FIXME: _Display Map of Address"
 msgstr "_Mostra la Mappa degli Indirizzi"
 
-#: addressbook/contact-editor/e-contact-editor.c:725
+#: addressbook/contact-editor/e-contact-editor.c:790
 msgid "FIXME: _Open Web Page"
 msgstr "_Apri Pagina Web"
 
-#: addressbook/contact-editor/e-contact-editor.c:727
+#: addressbook/contact-editor/e-contact-editor.c:792
 msgid "FIXME: Forward as _vCard"
 msgstr "Inoltra come _vCard"
 
-#: addressbook/contact-editor/e-contact-editor.c:728
-#: calendar/gui/event-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:793
+#: calendar/gui/event-editor.c:1316
 #, fuzzy
 msgid "FIXME: For_ward"
 msgstr "_Inoltra"
 
-#: addressbook/contact-editor/e-contact-editor.c:740
-#: calendar/gui/event-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:805
+#: calendar/gui/event-editor.c:1329
 msgid "_Insert"
 msgstr "_Inserisci"
 
-#: addressbook/contact-editor/e-contact-editor.c:741
-#: calendar/gui/event-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:806
+#: calendar/gui/event-editor.c:1330
 #, fuzzy
 msgid "F_ormat"
 msgstr "Formato"
 
-#. FIXME: add Favorites here
-#: addressbook/contact-editor/e-contact-editor.c:742
-#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:468
+#: addressbook/contact-editor/e-contact-editor.c:807
+#: calendar/gui/event-editor.c:1331 shell/e-shell-view-menu.c:515
 msgid "_Tools"
 msgstr "S_trumenti"
 
-#: addressbook/contact-editor/e-contact-editor.c:743
-#: calendar/gui/event-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:808
+#: calendar/gui/event-editor.c:1332
 #, fuzzy
 msgid "Actio_ns"
 msgstr "_Azioni"
 
-#: addressbook/contact-editor/e-contact-editor.c:774
-#: calendar/gui/event-editor.c:1320
-msgid "FIXME: Save and Close"
+#: addressbook/contact-editor/e-contact-editor.c:839
+#, fuzzy
+msgid "Save and Close"
 msgstr "Salva ed Esci"
 
-#: addressbook/contact-editor/e-contact-editor.c:775
-#: calendar/gui/event-editor.c:1321
+#: addressbook/contact-editor/e-contact-editor.c:840
+#: calendar/gui/event-editor.c:1371
 msgid "Save the appointment and close the dialog box"
 msgstr "Salva l'appuntamento ed esci dalla finestra di dialogo"
 
-#: addressbook/contact-editor/e-contact-editor.c:779
-#: calendar/gui/event-editor.c:1325
-msgid "FIXME: Print..."
-msgstr "Stampa..."
+#: addressbook/contact-editor/e-contact-editor.c:844
+#: calendar/gui/calendar-commands.c:673
+#, fuzzy
+msgid "Print..."
+msgstr "Stampa"
 
-#: addressbook/contact-editor/e-contact-editor.c:780
-#: calendar/gui/event-editor.c:1326
+#: addressbook/contact-editor/e-contact-editor.c:845
+#: calendar/gui/event-editor.c:1376
 msgid "Print this item"
 msgstr "Stampa questo articolo"
 
-#: addressbook/contact-editor/e-contact-editor.c:781
-#: calendar/gui/event-editor.c:1327
+#: addressbook/contact-editor/e-contact-editor.c:848
+#: calendar/gui/event-editor.c:1377
 msgid "FIXME: Insert File..."
 msgstr "Inserisci un File..."
 
-#: addressbook/contact-editor/e-contact-editor.c:782
-#: calendar/gui/event-editor.c:1328
+#: addressbook/contact-editor/e-contact-editor.c:849
+#: calendar/gui/event-editor.c:1378
 msgid "Insert a file as an attachment"
 msgstr "Inserisci un file come allegato"
 
-#: addressbook/contact-editor/e-contact-editor.c:784
-#: calendar/gui/event-editor.c:1330
-msgid "FIXME: Recurrence..."
-msgstr "Ricorrenza..."
-
-#: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/event-editor.c:1331
-msgid "Configure recurrence rules"
-msgstr "Configura regole di ricorrenza"
-
-#: addressbook/contact-editor/e-contact-editor.c:787
-#: calendar/gui/event-editor.c:1333
-msgid "FIXME: Invite Attendees..."
-msgstr "Invita Assistenti"
-
-#: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/event-editor.c:1334
-msgid "Invite attendees to a meeting"
-msgstr "Invita gli assistenti al meeting"
-
-#: addressbook/contact-editor/e-contact-editor.c:790
-#: calendar/gui/event-editor.c:1336
-#, fuzzy
-msgid "FIXME: Delete"
+#. Delete
+#: addressbook/contact-editor/e-contact-editor.c:852
+#: addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:508
+#: mail/folder-browser-factory.c:39
+msgid "Delete"
 msgstr "Elimina"
 
-#: addressbook/contact-editor/e-contact-editor.c:791
-#: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:326
+#: addressbook/contact-editor/e-contact-editor.c:853
+#: calendar/gui/event-editor.c:1387 calendar/gui/gncal-todo.c:336
 #, fuzzy
 msgid "Delete this item"
 msgstr "Elimina questo messaggio"
 
-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/event-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:856
+#: calendar/gui/event-editor.c:1389
 msgid "FIXME: Previous"
 msgstr "Precedente"
 
-#: addressbook/contact-editor/e-contact-editor.c:794
-#: calendar/gui/event-editor.c:1340
+#: addressbook/contact-editor/e-contact-editor.c:857
+#: calendar/gui/event-editor.c:1390
 msgid "Go to the previous item"
 msgstr "Vai al precedente"
 
-#: addressbook/contact-editor/e-contact-editor.c:795
-#: calendar/gui/event-editor.c:1341
+#: addressbook/contact-editor/e-contact-editor.c:859
+#: calendar/gui/event-editor.c:1391
 msgid "FIXME: Next"
 msgstr "Successivo"
 
-#: addressbook/contact-editor/e-contact-editor.c:796
-#: calendar/gui/event-editor.c:1342
+#: addressbook/contact-editor/e-contact-editor.c:860
+#: calendar/gui/event-editor.c:1392
 msgid "Go to the next item"
 msgstr "Vai al successivo"
 
-#: addressbook/contact-editor/e-contact-editor.c:797
-#: calendar/gui/event-editor.c:1343
+#: addressbook/contact-editor/e-contact-editor.c:862
+#: calendar/gui/event-editor.c:1393
 msgid "FIXME: Help"
 msgstr "Aiuto"
 
-#: addressbook/contact-editor/e-contact-editor.c:798
-#: calendar/gui/event-editor.c:1344
+#: addressbook/contact-editor/e-contact-editor.c:863
+#: calendar/gui/event-editor.c:1394
 msgid "See online help"
 msgstr "Vedere l'aiuto in linea"
 
-#: addressbook/contact-editor/e-contact-editor.c:1213
+#: addressbook/contact-editor/e-contact-editor.c:1278
 #, fuzzy
 msgid "Assistant"
 msgstr "Nome dell'_Assistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1214
-#: addressbook/contact-editor/e-contact-editor.c:1318
+#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1383
 #, fuzzy
 msgid "Business"
 msgstr "_Ufficio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1215
+#: addressbook/contact-editor/e-contact-editor.c:1280
 #, fuzzy
 msgid "Business 2"
 msgstr "_Ufficio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1216
+#: addressbook/contact-editor/e-contact-editor.c:1281
 #, fuzzy
 msgid "Business Fax"
 msgstr "_Fax Ufficio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Callback"
 msgstr "Richiamare"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1219
+#: addressbook/contact-editor/e-contact-editor.c:1284
 #, fuzzy
 msgid "Company"
 msgstr "_Compagnia"
 
-#: addressbook/contact-editor/e-contact-editor.c:1220
-#: addressbook/contact-editor/e-contact-editor.c:1319
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/contact-editor/e-contact-editor.c:1384
 #, fuzzy
 msgid "Home"
 msgstr "_Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:1286
 #, fuzzy
 msgid "Home 2"
 msgstr "_Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:1287
 #, fuzzy
 msgid "Home Fax"
 msgstr "_Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:1289
 #, fuzzy
 msgid "Mobile"
 msgstr "C_ellulare"
 
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1320 mail/mail-config.c:2039
+#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1385
 msgid "Other"
 msgstr "Altro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Other Fax"
 msgstr "Altro fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1227
+#: addressbook/contact-editor/e-contact-editor.c:1292
 #, fuzzy
 msgid "Pager"
 msgstr "Pagina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1293
 #, fuzzy
 msgid "Primary"
 msgstr "Posta Elettronica"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:1294
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1295
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/contact-editor/e-contact-editor.c:1296
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
+#: addressbook/contact-editor/e-contact-editor.c:1340
 msgid "Primary Email"
 msgstr "Posta Elettronica"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1341
 msgid "Email 2"
 msgstr "Posta elettronica 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1342
 msgid "Email 3"
 msgstr "Posta elettronica 3"
 
-#: addressbook/gui/component/addressbook.c:417 mail/message-list.c:631
-msgid "To"
-msgstr "A"
+#.
+#. * 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-strings.h:7
+msgid "_Add"
+msgstr "_Aggiungi"
 
-#: addressbook/gui/component/addressbook.c:418 mail/message-list.c:603
-msgid "From"
-msgstr "Da"
+#: addressbook/contact-editor/e-contact-editor-strings.h:9
+msgid "Phone Types"
+msgstr "Tipi di Telefono"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:10
+#: addressbook/contact-editor/e-contact-editor-strings.h:12
+msgid "New phone type"
+msgstr "Nuovo tipo di telefono"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:11
+msgid "Add"
+msgstr "Aggiungi"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:13
+msgid "Contact Editor"
+msgstr "Editor dei Contatti"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:14
+msgid "_Full Name..."
+msgstr "Nome e Cognome"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:15
+msgid "File As:"
+msgstr "Memorizza come:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:16
+#, fuzzy
+msgid "Web page address:"
+msgstr "Indirizzo email:"
 
-#: addressbook/gui/component/addressbook.c:419
-msgid "Cc"
+#: addressbook/contact-editor/e-contact-editor-strings.h:17
+msgid "Wants to receive _HTML mail"
+msgstr "Vuole ricevere messaggi in _HTML"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:18
+msgid "Address:"
+msgstr "Indirizzo"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
+#, fuzzy
+msgid "_Business"
+msgstr "_Ufficio"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
+#, fuzzy
+msgid "_Home"
+msgstr "_Casa"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#, fuzzy
+msgid "Business _Fax"
+msgstr "_Fax Ufficio"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#, fuzzy
+msgid "_Mobile"
+msgstr "C_ellulare"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
+msgid "B_usiness"
+msgstr "_Ufficio"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
+msgid "_This is the mailing address"
+msgstr "Indirizzo a cui _spedire"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:26
+msgid "C_ontacts..."
+msgstr "C_ontatti"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
+msgid "Ca_tegories..."
+msgstr "Ca_tegorie"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#, fuzzy
+msgid "_Job title:"
+msgstr "_Titolo"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#, fuzzy
+msgid "_Company:"
+msgstr "_Compagnia"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:30
+msgid "General"
+msgstr "Generale"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:31
+msgid "_Department:"
+msgstr "_Dipartimento"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:32
+msgid "_Office:"
+msgstr "_Ufficio"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:33
+msgid "_Profession:"
+msgstr "_Professione"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:34
+msgid "_Nickname:"
+msgstr "_Nickname"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:35
+msgid "_Spouse:"
+msgstr "Coniuge"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:36
+msgid "_Birthday:"
+msgstr "Co_mpleanno"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:37
+#, fuzzy
+msgid "_Assistant's name:"
+msgstr "Nome dell'_Assistente"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:38
+msgid "_Manager's Name:"
+msgstr "Nome del _Manager"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:39
+msgid "Anni_versary:"
+msgstr "Anni_versario"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:40
+msgid "No_tes:"
+msgstr "No_te"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:41
+#, fuzzy
+msgid "Details"
+msgstr "Predefinito"
+
+#.
+#. * 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/fullname-strings.h:7
+msgid "Check Full Name"
+msgstr "Verifiare Nome e Cognome"
+
+#: addressbook/contact-editor/fullname-strings.h:8
+msgid "_Title:"
+msgstr "_Titolo"
+
+#: addressbook/contact-editor/fullname-strings.h:9
+#, fuzzy
+msgid "_First:"
+msgstr "Formato"
+
+#: addressbook/contact-editor/fullname-strings.h:10
+#, fuzzy
+msgid "_Middle:"
+msgstr "_Titolo"
+
+#: addressbook/contact-editor/fullname-strings.h:11
+msgid "_Last:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:424
+#: addressbook/contact-editor/fullname-strings.h:12
+#, fuzzy
+msgid "_Suffix:"
+msgstr "_Ufficio"
+
+#: addressbook/contact-editor/fullname-strings.h:13
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Dr.\n"
+msgstr ""
+"\n"
+"Sig.\n"
+"Sig.ra\n"
+"Dott.\n"
+
+#: addressbook/contact-editor/fullname-strings.h:18
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:420
 #: calendar/gui/calendar-commands.c:544
 #, fuzzy
 msgid "New"
 msgstr "_Nuovo"
 
-#: addressbook/gui/component/addressbook.c:424
+#: addressbook/gui/component/addressbook.c:420
 msgid "Create a new contact"
 msgstr "Crea un nuovo contatto "
 
-#: addressbook/gui/component/addressbook.c:428
-#: mail/folder-browser-factory.c:37
+#: addressbook/gui/component/addressbook.c:424
 msgid "Find"
 msgstr "Trova"
 
-#: addressbook/gui/component/addressbook.c:428
+#: addressbook/gui/component/addressbook.c:424
 msgid "Find a contact"
 msgstr "Trova un contatto"
 
-#: addressbook/gui/component/addressbook.c:429
-#: addressbook/gui/component/addressbook.c:496
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:48
+#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:492
+#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:37
 msgid "Print"
 msgstr "Stampa"
 
-#: addressbook/gui/component/addressbook.c:429
+#: addressbook/gui/component/addressbook.c:425
 msgid "Print contacts"
 msgstr "Stampa contatti"
 
-#. Delete
-#: addressbook/gui/component/addressbook.c:430 calendar/gui/gncal-todo.c:498
-#: mail/folder-browser-factory.c:50 mail/mail-config.c:1865
-#: mail/mail-config.c:1961
-msgid "Delete"
-msgstr "Elimina"
-
-#: addressbook/gui/component/addressbook.c:430
+#: addressbook/gui/component/addressbook.c:426
 #, fuzzy
 msgid "Delete a contact"
 msgstr "Selezionare un contatto"
 
-#: addressbook/gui/component/addressbook.c:503
-msgid "Test Select Names"
-msgstr "Verifica i Nomi Selezionati"
-
-#: addressbook/gui/component/addressbook.c:510
-#: addressbook/gui/component/addressbook.c:1052
+#: addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook.c:1034
 msgid "As _Table"
 msgstr "Come _Tabella"
 
-#: addressbook/gui/component/addressbook.c:517
+#: addressbook/gui/component/addressbook.c:506
 #, fuzzy
 msgid "_New Contact"
 msgstr "_Contatti"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:514
 msgid "N_ew Directory Server"
 msgstr "N_uovo Server delle Cartelle"
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:593
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubruca"
 
-#: addressbook/gui/component/addressbook.c:609
+#: addressbook/gui/component/addressbook.c:598
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -618,19 +791,176 @@ msgstr ""
 "Se si desidera usare LDAP, č necessario scaricare e \n"
 "installare OpenLDAP, ricompilare e reinstallare Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:960
-#: addressbook/gui/minicard/e-minicard.c:329
+#: addressbook/gui/component/addressbook.c:938
+#: addressbook/gui/minicard/e-minicard.c:330
 msgid "Save as VCard"
 msgstr "Salva come vCard"
 
-#: addressbook/gui/component/addressbook.c:1059
+#: addressbook/gui/component/addressbook.c:1005
+msgid "* Click here to add a contact *"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:1041
 msgid "As _Minicards"
 msgstr "Come _Minicards"
 
-#: addressbook/gui/component/addressbook.c:1110
+#: addressbook/gui/component/addressbook.c:1092
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI visualizzata dal Browser delle cartelle"
 
+#.
+#. * 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/alphabet.glade.h:7
+msgid "window2"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:8
+msgid "123"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:9
+#, fuzzy
+msgid "a"
+msgstr "am"
+
+#: addressbook/gui/component/alphabet.glade.h:10
+msgid "b"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:11
+msgid "c"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:12
+msgid "d"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:13
+#, fuzzy
+msgid "e"
+msgstr "Me"
+
+#: addressbook/gui/component/alphabet.glade.h:14
+msgid "f"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:15
+msgid "g"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:16
+#: calendar/cal-util/timeutil.c:131
+msgid "h"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:17
+msgid "i"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:18
+msgid "j"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:19
+msgid "k"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:20
+msgid "l"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:21
+#, fuzzy
+msgid "m"
+msgstr "am"
+
+#: addressbook/gui/component/alphabet.glade.h:22
+msgid "n"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:23
+#, fuzzy
+msgid "o"
+msgstr "A"
+
+#: addressbook/gui/component/alphabet.glade.h:24
+msgid "p"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:25
+msgid "q"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:26
+#, fuzzy
+msgid "r"
+msgstr "Ve"
+
+#: addressbook/gui/component/alphabet.glade.h:27
+msgid "s"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:28
+msgid "t"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:29
+#, fuzzy
+msgid "u"
+msgstr "Do"
+
+#: addressbook/gui/component/alphabet.glade.h:30
+msgid "v"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:31
+msgid "w"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:32
+msgid "x"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:33
+msgid "y"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:34
+msgid "z"
+msgstr ""
+
+#.
+#. * 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
+#, fuzzy
+msgid "Description:"
+msgstr "Nessuna descrizione"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#, fuzzy
+msgid "LDAP Server:"
+msgstr "Server:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
+msgstr "Numero Port"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: composer/e-msg-composer-address-dialog.glade.h:8
+msgid "Name:"
+msgstr "Nome:"
+
 #: addressbook/gui/minicard/e-minicard-view.c:110
 msgid ""
 "\n"
@@ -645,19 +975,212 @@ msgstr ""
 "\n"
 "Fare doppio click qui per creare un nuovo contatto."
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
+#.
+#. * 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/printing/e-contact-print.glade.h:7
+#, fuzzy
+msgid "Page Setup:"
+msgstr "Impostazione pagina"
+
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Style name:"
+msgstr "Nome dello stile"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+#, fuzzy
+msgid "Preview:"
+msgstr "Precedente"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+#, fuzzy
+msgid "Options"
+msgstr "Opzioni"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+msgid "Include:"
+msgstr "Allega"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+#, fuzzy
+msgid "Sections:"
+msgstr "Secondi"
+
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Immediately follow each other"
+msgstr "Concatenati l'un l'altro"
+
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Letter tabs on side"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Headings for each letter"
+msgstr "Titolo per ogni lettera"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Start on a new page"
+msgstr "Inizia su una nuova pagina"
+
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Number of columns:"
+msgstr "Numero di colonne:"
+
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Blank forms at end:"
+msgstr "Moduli bianchi alla fine"
+
+#: addressbook/printing/e-contact-print.glade.h:19
+#, fuzzy
+msgid "Fonts"
+msgstr "Mese"
+
+#: 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
+#, fuzzy
+msgid "Font..."
+msgstr "Stampa"
+
+#: addressbook/printing/e-contact-print.glade.h:22
+#, fuzzy
+msgid "Headings"
+msgstr "Titoli"
+
+#: addressbook/printing/e-contact-print.glade.h:23
+msgid "10 pt. Tahoma"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:24
+#, fuzzy
+msgid "Body"
+msgstr "Oggi"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "8 pt. Tahoma"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:26
+msgid "Shading"
+msgstr "Ombreggiatura"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Print using gray shading"
+msgstr "Stampa usando ombreggiatura grigia"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+#, fuzzy
+msgid "Format"
+msgstr "Formato"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:50
+msgid "Paper"
+msgstr "Carta"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Type:"
+msgstr "Tipo"
+
+#: addressbook/printing/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:43
+msgid "label26"
+msgstr "etichetta"
+
+#: addressbook/printing/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:44
+msgid "Dimensions:"
+msgstr "Dimensioni:"
+
+#: addressbook/printing/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:45
+msgid "Width:"
+msgstr "Larghezza:"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:46
+msgid "Height:"
+msgstr "Altezza:"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+#, fuzzy
+msgid "Paper source:"
+msgstr "Fonte della posta"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+#, fuzzy
+msgid "Margins"
+msgstr "Icone _grandi"
+
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Top:"
+msgstr "Superiore:"
+
+#: addressbook/printing/e-contact-print.glade.h:38
+msgid "Bottom:"
+msgstr "Inferiore:"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Left:"
+msgstr "Sinistra:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Right:"
+msgstr "Destra:"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+#, fuzzy
+msgid "Page"
+msgstr "Pagina"
+
+#: addressbook/printing/e-contact-print.glade.h:42
+msgid "Size:"
+msgstr "Dimensione:"
+
+#: addressbook/printing/e-contact-print.glade.h:47
+#, fuzzy
+msgid "Orientation"
+msgstr "Organizzazione"
+
+#: addressbook/printing/e-contact-print.glade.h:48
+#, fuzzy
+msgid "Portrait"
+msgstr "Prioritario"
+
+#: addressbook/printing/e-contact-print.glade.h:49
+msgid "Landscape"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:52
+#, fuzzy
+msgid "Header"
+msgstr "Anno"
+
+#: addressbook/printing/e-contact-print.glade.h:53
+#, fuzzy
+msgid "Footer:"
+msgstr "Filtra"
+
+#: addressbook/printing/e-contact-print.glade.h:55
+msgid "Reverse on even pages"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:56
+msgid "Header/Footer"
+msgstr ""
+
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:544
 #, fuzzy
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:543
 msgid "pm"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:98
-msgid "h"
-msgstr ""
-
 #: calendar/gui/calendar-commands.c:56
 msgid "Outline:"
 msgstr "Linea:"
@@ -721,8 +1244,8 @@ msgstr "Apri calendario"
 msgid "Save calendar"
 msgstr "Salva calendario"
 
-#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:712
-#: calendar/gui/gncal-todo.c:716
+#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:722
+#: calendar/gui/gncal-todo.c:726
 msgid "Day"
 msgstr "Giorno"
 
@@ -739,7 +1262,7 @@ msgstr "5 giorni"
 msgid "Show the working week"
 msgstr "Mostra la settimana lavorativa"
 
-#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:711
+#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:721
 msgid "Week"
 msgstr "Settimana"
 
@@ -765,7 +1288,7 @@ msgstr "Anno"
 msgid "Show 1 year"
 msgstr "Mostra 1 anno"
 
-#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:690
+#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
@@ -830,38 +1353,24 @@ msgstr "Apri un calendario"
 msgid "Save Calendar As"
 msgstr "Salva Calendario come"
 
-#: calendar/gui/calendar-commands.c:673
-#, fuzzy
-msgid "Print..."
-msgstr "Stampa"
-
-#: calendar/gui/calendar-commands.c:679
-#, fuzzy
-msgid "_Close Calendar"
-msgstr "Chiudi il _Calendario"
-
-#: calendar/gui/calendar-commands.c:680
-msgid "Close current calendar"
-msgstr "Chiudi calendario corrente"
-
-#: calendar/gui/calendar-commands.c:690
+#: calendar/gui/calendar-commands.c:682
 #, fuzzy
 msgid "_New appointment..."
 msgstr "_Nuovo Appuntamento..."
 
-#: calendar/gui/calendar-commands.c:695
+#: calendar/gui/calendar-commands.c:687
 msgid "New appointment for _today..."
 msgstr "Nuovo appuntamento per _oggi..."
 
-#: calendar/gui/calendar-commands.c:696
+#: calendar/gui/calendar-commands.c:688
 msgid "Create a new appointment for today"
 msgstr "Crea nuovo appuntamento per oggi..."
 
-#: calendar/gui/calendar-commands.c:704 calendar/gui/prop.c:712
+#: calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: calendar/gui/calendar-commands.c:711 calendar/gui/calendar-commands.c:712
+#: calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704
 #, fuzzy
 msgid "About Calendar"
 msgstr "Riguardo il Calendario"
@@ -869,184 +1378,590 @@ msgstr "Riguardo il Calendario"
 #. i18n: This "%s%s" indicates possession. Languages where the order is
 #. * the inverse should translate it to "%2$s%1$s".
 #.
-#: calendar/gui/calendar-commands.c:754
+#: calendar/gui/calendar-commands.c:746
 #, c-format
 msgid "%s%s"
 msgstr "%2$s%1$s"
 
-#: calendar/gui/calendar-commands.c:754
+#: calendar/gui/calendar-commands.c:746
 #, fuzzy
 msgid "'s calendar"
 msgstr "calendario di"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
+#: calendar/gui/control-factory.c:136
+#, fuzzy
+msgid "The URI that the calendar will display"
+msgstr "La URI che il calendario visualizzerŕ"
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:181
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Avviso alle %A %b %d %Y %H:%M"
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:188
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
 #.
-#: calendar/gui/calendar-conduit-control-applet.c:51
-msgid "Disabled"
-msgstr "Disabilitato"
+#. * 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
+#, fuzzy
+msgid "Close"
+msgstr "Colori"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1070
+#, fuzzy
+msgid "Snooze"
+msgstr "Sonnellino"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#, fuzzy
+msgid "Edit appointment"
+msgstr "_Appuntamenti"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:10
+msgid "Snooze time (minutes)"
+msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:52
-msgid "Synchronize"
-msgstr "Sincronizza"
+#: calendar/gui/e-day-view-time-item.c:391
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisioni per minuto"
 
-#: calendar/gui/calendar-conduit-control-applet.c:53
-msgid "Copy From Pilot"
-msgstr "Copia dal Pilot"
+#: calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324
+#: calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643
+#: calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659
+#, fuzzy
+msgid "New appointment..."
+msgstr "Nuovo appuntamento..."
 
-#: calendar/gui/calendar-conduit-control-applet.c:54
-msgid "Copy To Pilot"
-msgstr "Copia sul Pilot"
+#: calendar/gui/e-day-view.c:2321 calendar/gui/e-day-view.c:2328
+#: calendar/gui/e-week-view.c:2647 calendar/gui/e-week-view.c:2654
+msgid "Edit this appointment..."
+msgstr "Edita questo appuntamento..."
 
-#: calendar/gui/calendar-conduit-control-applet.c:56
-msgid "Merge To Pilot"
-msgstr "Unisci dal Pilot"
+#: calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+#, fuzzy
+msgid "Delete this appointment"
+msgstr "Elimina questo appuntamento"
+
+#: calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
+msgid "Make this appointment movable"
+msgstr "Rendi rimandabile questo appuntamento"
+
+#: calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
+#, fuzzy
+msgid "Delete this occurrence"
+msgstr "Elimina questa ricorrenza"
+
+#: calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
+msgid "Delete all occurrences"
+msgstr "Elimina tutte le ricorrenze"
+
+#: calendar/gui/event-editor.c:291
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "_Appuntamenti"
+
+#: calendar/gui/event-editor.c:296
+msgid "No summary"
+msgstr "Niente riassunto"
+
+#: calendar/gui/event-editor.c:300
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "Appuntamenti -%s"
 
-#: calendar/gui/calendar-conduit-control-applet.c:142
-#: calendar/gui/todo-conduit-control-applet.c:110
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#: calendar/gui/event-editor.c:303
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:144
-msgid "GnomeCalendar Conduit"
+#: calendar/gui/event-editor.c:306
+#, fuzzy, c-format
+msgid "Journal entry - %s"
+msgstr "Ingressi giornalieri -%s"
+
+#. Owner, summary
+#: calendar/gui/event-editor.c:622 calendar/gui/event-editor.c:718
+msgid "?"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:145
-msgid "(C) 1998"
+#: calendar/gui/event-editor.c:1198
+#, fuzzy
+msgid "FIXME: _Delete"
+msgstr "_Elimina"
+
+#: calendar/gui/event-editor.c:1265
+msgid "FIXME: Ca_lendar..."
+msgstr "Cal_endario"
+
+#: calendar/gui/event-editor.c:1300
+msgid "FIXME: Chec_k Names"
+msgstr "_Controlla nomi"
+
+#: calendar/gui/event-editor.c:1301
+msgid "FIXME: Address _Book..."
+msgstr "R_ubrica..."
+
+#: calendar/gui/event-editor.c:1308
+#, fuzzy
+msgid "FIXME: _New Appointment"
+msgstr "Nuovo _appuntamento"
+
+#: calendar/gui/event-editor.c:1310
+msgid "FIXME: Rec_urrence..."
+msgstr "Ric_orrenza..."
+
+#: calendar/gui/event-editor.c:1312
+#, fuzzy
+msgid "FIXME: Invite _Attendees..."
+msgstr "Invita Assistenti"
+
+#: calendar/gui/event-editor.c:1313
+msgid "FIXME: C_ancel Invitation..."
+msgstr "_Annulla Invito..."
+
+#: calendar/gui/event-editor.c:1315
+msgid "FIXME: Forward as v_Calendar"
+msgstr "Inoltra come v_Calrendar"
+
+#: calendar/gui/event-editor.c:1370
+msgid "FIXME: Save and Close"
+msgstr "Salva ed Esci"
+
+#: calendar/gui/event-editor.c:1375
+msgid "FIXME: Print..."
+msgstr "Stampa..."
+
+#: calendar/gui/event-editor.c:1380
+msgid "FIXME: Recurrence..."
+msgstr "Ricorrenza..."
+
+#: calendar/gui/event-editor.c:1381
+msgid "Configure recurrence rules"
+msgstr "Configura regole di ricorrenza"
+
+#: calendar/gui/event-editor.c:1383
+msgid "FIXME: Invite Attendees..."
+msgstr "Invita Assistenti"
+
+#: calendar/gui/event-editor.c:1384
+msgid "Invite attendees to a meeting"
+msgstr "Invita gli assistenti al meeting"
+
+#: calendar/gui/event-editor.c:1386
+#, fuzzy
+msgid "FIXME: Delete"
+msgstr "Elimina"
+
+#: calendar/gui/event-editor.c:1828
+msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:147
-msgid "Configuration utility for the calendar conduit.\n"
-msgstr "Utilitŕ di configurazione per il calendario.\n"
+#: calendar/gui/getdate.y:391
+msgid "january"
+msgstr ""
+
+#: calendar/gui/getdate.y:392
+msgid "february"
+msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:148
-msgid "gnome-calendar-conduit.png"
+#: calendar/gui/getdate.y:393
+msgid "march"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:190
-msgid "Synchronize Action"
-msgstr "Sincronizzazione"
+#: calendar/gui/getdate.y:394
+#, fuzzy
+msgid "april"
+msgstr "Carta"
+
+#: calendar/gui/getdate.y:395
+#, fuzzy
+msgid "may"
+msgstr "Giorno"
 
-#: calendar/gui/calendar-conduit-control-applet.c:261
-#: calendar/gui/todo-conduit-control-applet.c:194
-msgid "Conduit state"
+#: calendar/gui/getdate.y:396
+msgid "june"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:305
-#: calendar/gui/calendar-conduit-control-applet.c:316
-#: calendar/gui/todo-conduit-control-applet.c:235
-#: calendar/gui/todo-conduit-control-applet.c:246
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
+#: calendar/gui/getdate.y:397
+msgid "july"
 msgstr ""
-"Nessun pilot configurato, scegliere  prima\n"
-"le 'Proprietŕ di collegamento del Pilot'.  "
 
-#: calendar/gui/calendar-conduit-control-applet.c:332
-#: calendar/gui/calendar-conduit-control-applet.c:333
-#: calendar/gui/todo-conduit-control-applet.c:265
-#: calendar/gui/todo-conduit-control-applet.c:266
+#: calendar/gui/getdate.y:398
+msgid "august"
+msgstr ""
+
+#: calendar/gui/getdate.y:399
+msgid "september"
+msgstr ""
+
+#: calendar/gui/getdate.y:400
+msgid "sept"
+msgstr ""
+
+#: calendar/gui/getdate.y:401
+msgid "october"
+msgstr ""
+
+#: calendar/gui/getdate.y:402
+msgid "november"
+msgstr ""
+
+#: calendar/gui/getdate.y:403
+msgid "december"
+msgstr ""
+
+#: calendar/gui/getdate.y:404
 #, fuzzy
-msgid "Cannot initialze the GnomePilot Daemon"
-msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
+msgid "sunday"
+msgstr "Domenica"
 
-#: calendar/gui/calendar-conduit-control-applet.c:339
-#: calendar/gui/calendar-conduit-control-applet.c:340
-#: calendar/gui/todo-conduit-control-applet.c:272
-#: calendar/gui/todo-conduit-control-applet.c:273
-msgid "Cannot connect to the GnomePilot Daemon"
-msgstr "Impossibile conettersi al demone GnomePIlot"
-
-#: calendar/gui/calendar-conduit.c:116 calendar/gui/calendar-conduit.c:156
-#: calendar/gui/calendar-conduit.c:239 calendar/gui/calendar-conduit.c:279
-#: calendar/gui/calendar-conduit.c:501 calendar/gui/calendar-conduit.c:542
-#: calendar/gui/calendar-conduit.c:858 calendar/gui/calendar-conduit.c:910
-#: calendar/gui/calendar-conduit.c:1332
-msgid "Error while communicating with calendar server"
-msgstr "Errore durante la comunicazione con il server del calendario"
-
-#: calendar/gui/calendar-conduit.c:546
-#, c-format
-msgid "Calendar holds %d entries"
-msgstr "Il calendario contiene %d dati inseriti"
+#: calendar/gui/getdate.y:405
+#, fuzzy
+msgid "monday"
+msgstr "Lunedě"
 
-#: calendar/gui/calendar-conduit.c:568 calendar/gui/calendar-conduit.c:570
-msgid "Could not start gnomecal server"
-msgstr "Impossibile avviare il server gnomecal"
+#: calendar/gui/getdate.y:406
+#, fuzzy
+msgid "tuesday"
+msgstr "Domenica"
 
-#: calendar/gui/calendar-conduit.c:598 calendar/gui/calendar-conduit.c:601
-msgid "Could not read pilot's DateBook application block"
-msgstr "Impossibile leggere il blocco Datebook del Pilot"
+#: calendar/gui/getdate.y:407
+msgid "tues"
+msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:60
-msgid "Specifies the port on which the Pilot is"
-msgstr "Specifica la porta alla quale č collegato il Pilot"
+#: calendar/gui/getdate.y:408
+msgid "wednesday"
+msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:60
-msgid "PORT"
+#: calendar/gui/getdate.y:409
+msgid "wednes"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:62
-msgid "If you want to debug the attributes on records"
-msgstr "Se si voglioni debuggare gli attibuti sui record"
+#: calendar/gui/getdate.y:410
+msgid "thursday"
+msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:64
-msgid "Only syncs from desktop to pilot"
-msgstr "Sincronizza solamente dal desktop al Pilot"
+#: calendar/gui/getdate.y:411
+#, fuzzy
+msgid "thur"
+msgstr "Altro"
 
-#: calendar/gui/calendar-pilot-sync.c:66
-msgid "Only syncs from pilot to desktop"
-msgstr "Sincronizza solamente dal Pilot al desktop"
+#: calendar/gui/getdate.y:412
+#, fuzzy
+msgid "thurs"
+msgstr "Altro"
 
-#: calendar/gui/calendar-pilot-sync.c:89
-msgid "Can not create Pilot socket\n"
-msgstr "Impossibile creare il connettore per il Pilot\n"
+#: calendar/gui/getdate.y:413
+#, fuzzy
+msgid "friday"
+msgstr "Posta Elettronica"
 
-#: calendar/gui/calendar-pilot-sync.c:96
-#, c-format
-msgid "Can not bind to device %s\n"
-msgstr "Impossibile collegare il dispositivo %s\n"
+#: calendar/gui/getdate.y:414
+msgid "saturday"
+msgstr ""
+
+#: calendar/gui/getdate.y:420
+#, fuzzy
+msgid "year"
+msgstr "Anno"
 
-#: calendar/gui/calendar-pilot-sync.c:99
-msgid "Failed to get a connection from the Pilot device"
-msgstr "Connessione al dispositivo Pilot non riuscita"
+#: calendar/gui/getdate.y:421
+#, fuzzy
+msgid "month"
+msgstr "Mese"
 
-#: calendar/gui/calendar-pilot-sync.c:102
-msgid "pi_accept failed"
+#: calendar/gui/getdate.y:422
+msgid "fortnight"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:167
-msgid "\tObject did not exist, creating a new one\n"
-msgstr "\\tOggetto non esistente, creazione di uno nuovo\n"
+#: calendar/gui/getdate.y:423
+#, fuzzy
+msgid "week"
+msgstr "Settimana"
 
-#: calendar/gui/calendar-pilot-sync.c:174
-msgid ""
-"\tObject has been modified on desktop and on the pilot, desktop takes "
-"precedence\n"
-msgstr "\\tOggetto č stato modificato sul desktop e sul Pilot, il descktop ha la precedenza\n"
+#: calendar/gui/getdate.y:424
+#, fuzzy
+msgid "day"
+msgstr "Oggi"
 
-#: calendar/gui/calendar-pilot-sync.c:475
+#: calendar/gui/getdate.y:425
 #, fuzzy
-msgid "No description"
-msgstr "Nessuna descrizione"
+msgid "hour"
+msgstr "Ora"
+
+#: calendar/gui/getdate.y:426
+#, fuzzy
+msgid "minute"
+msgstr "Minuto"
+
+#: calendar/gui/getdate.y:427
+msgid "min"
+msgstr ""
+
+#: calendar/gui/getdate.y:428
+#, fuzzy
+msgid "second"
+msgstr "secondi"
+
+#: calendar/gui/getdate.y:429
+msgid "sec"
+msgstr ""
+
+#: calendar/gui/getdate.y:435
+msgid "tomorrow"
+msgstr ""
+
+#: calendar/gui/getdate.y:436
+msgid "yesterday"
+msgstr ""
+
+#: calendar/gui/getdate.y:437
+#, fuzzy
+msgid "today"
+msgstr "Oggi"
+
+#: calendar/gui/getdate.y:438
+msgid "now"
+msgstr ""
+
+#: calendar/gui/getdate.y:439
+#, fuzzy
+msgid "last"
+msgstr "Incolla"
+
+#: calendar/gui/getdate.y:440
+msgid "this"
+msgstr ""
+
+#: calendar/gui/getdate.y:441
+#, fuzzy
+msgid "next"
+msgstr "Successivo"
 
-#: calendar/gui/calendar-pilot-sync.c:547
-msgid "Syncing with the pilot..."
-msgstr "Sincronizzazione con il Pilot..."
+#: calendar/gui/getdate.y:442
+msgid "first"
+msgstr ""
+
+#. { N_("second"),		tUNUMBER,	2 },
+#: calendar/gui/getdate.y:444
+#, fuzzy
+msgid "third"
+msgstr "Altro"
+
+#: calendar/gui/getdate.y:445
+#, fuzzy
+msgid "fourth"
+msgstr "Ora"
+
+#: calendar/gui/getdate.y:446
+msgid "fifth"
+msgstr ""
+
+#: calendar/gui/getdate.y:447
+msgid "sixth"
+msgstr ""
+
+#: calendar/gui/getdate.y:448
+msgid "seventh"
+msgstr ""
+
+#: calendar/gui/getdate.y:449
+#, fuzzy
+msgid "eighth"
+msgstr "Altezza:"
+
+#: calendar/gui/getdate.y:450
+#, fuzzy
+msgid "ninth"
+msgstr "Stampa"
+
+#: calendar/gui/getdate.y:451
+#, fuzzy
+msgid "tenth"
+msgstr "Mese"
+
+#: calendar/gui/getdate.y:452
+msgid "eleventh"
+msgstr ""
+
+#: calendar/gui/getdate.y:453
+msgid "twelfth"
+msgstr ""
+
+#: calendar/gui/getdate.y:454
+msgid "ago"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:140
+msgid "Create to-do item"
+msgstr "Crea una cosa da fare"
+
+#: calendar/gui/gncal-todo.c:140
+msgid "Edit to-do item"
+msgstr "Modifica cosa da fare"
+
+#: calendar/gui/gncal-todo.c:176
+msgid "Summary:"
+msgstr "Riassunto:"
+
+#: calendar/gui/gncal-todo.c:186
+#, fuzzy
+msgid "Due Date:"
+msgstr "Scadenza"
+
+#: calendar/gui/gncal-todo.c:195
+#, fuzzy
+msgid "Priority:"
+msgstr "Prioritario"
+
+#: calendar/gui/gncal-todo.c:212
+msgid "Item Comments:"
+msgstr "Commenti"
 
-#: calendar/gui/calendar-pilot-sync.c:554
-msgid "Could not open DatebookDB on the Pilot"
-msgstr "Impossibile aprire DateBookDB sul Pilot"
+#: calendar/gui/gncal-todo.c:334
+msgid "Add to-do item..."
+msgstr "Aggiungi..."
+
+#: calendar/gui/gncal-todo.c:335
+msgid "Edit this item..."
+msgstr "Modifica..."
+
+#: calendar/gui/gncal-todo.c:434
+msgid "Summary"
+msgstr "Riassunto"
+
+#: calendar/gui/gncal-todo.c:435 calendar/gui/prop.c:604
+#, fuzzy
+msgid "Due Date"
+msgstr "Data"
 
-#: calendar/gui/calendar-pilot-sync.c:555
-msgid "Unable to open DatebookDB"
-msgstr "Impossibile aprire DateBookDB"
+#: calendar/gui/gncal-todo.c:436 calendar/gui/prop.c:605
+#: mail/message-list.c:474
+msgid "Priority"
+msgstr "Prioritario"
+
+#: calendar/gui/gncal-todo.c:437
+msgid "Time Left"
+msgstr "Tempo rimasto"
 
-#: calendar/gui/calendar-pilot-sync.c:617
-msgid "Synced DateBook from Pilot to GnomeCal"
-msgstr "DateBook del Pilot sincronizzato con GnomeCal"
+#. Label
+#: calendar/gui/gncal-todo.c:449
+#, fuzzy
+msgid "To-do list"
+msgstr "S_trumenti"
+
+#. Add
+#: calendar/gui/gncal-todo.c:488
+#: composer/e-msg-composer-address-dialog.glade.h:13
+msgid "Add..."
+msgstr "Aggiungi..."
+
+#. Edit
+#: calendar/gui/gncal-todo.c:497
+#, fuzzy
+msgid "Edit..."
+msgstr "Aggiungi..."
+
+#: calendar/gui/gncal-todo.c:721
+msgid "Weeks"
+msgstr "Settimane"
+
+#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
+msgid "Days"
+msgstr "Giorni"
+
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
+msgid "Hours"
+msgstr "Ore"
+
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
+msgid "Hour"
+msgstr "Ora"
+
+#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
+msgid "Minutes"
+msgstr "Minuti"
+
+#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
+msgid "Minute"
+msgstr "Minuto"
+
+#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
+#, fuzzy
+msgid "Seconds"
+msgstr "Secondi"
+
+#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
+#, fuzzy
+msgid "Second"
+msgstr "Secondi"
+
+#: calendar/gui/gnome-cal.c:461 calendar/gui/gnome-cal.c:1078
+#: calendar/gui/gnome-cal.c:1134
+msgid "Reminder of your appointment at "
+msgstr "Promemoria dell'appuntamento alle"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/gnome-cal.c:1083 calendar/gui/gnome-cal.c:1138
+msgid "Ok"
+msgstr ""
+
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Dom"
+
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Lun"
+
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Mar"
+
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Mer"
+
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Gio"
+
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Ven"
+
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Sab"
+
+#: calendar/gui/goto.c:82
+msgid "Year:"
+msgstr "Anno:"
+
+#: calendar/gui/goto.c:264
+msgid "Go to date"
+msgstr "Vai alla data"
+
+#. Instructions
+#: calendar/gui/goto.c:275
+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 ""
+"Selezionare la data in cui si vuole andare.\n"
+"Clickando su un giorno, si viene spostati\n"
+"su quella data."
+
+#: calendar/gui/goto.c:312
+msgid "Go to today"
+msgstr "Vai a oggi"
 
 #: calendar/gui/print.c:265
 msgid "1st"
@@ -1224,7 +2139,7 @@ msgstr ""
 #: calendar/gui/print.c:1004
 #, c-format
 msgid "Current week (%s %s %d - %s %d %d)"
-msgstr "Settimana corrente (%s %s %d - %s %s %d %d) "
+msgstr "Settimana corrente (%s %s %d - %s %d %d) "
 
 #: calendar/gui/print.c:1021
 #, c-format
@@ -1234,7 +2149,7 @@ msgstr "Settimana corrente (%s %s %d - %s %s %d %d)"
 #: calendar/gui/print.c:1027
 #, c-format
 msgid "Current week (%s %s %d %d - %s %s %d %d)"
-msgstr "Settimana in corso (%s %s %d - %s %s %d %d)"
+msgstr "Settimana in corso (%s %s %d %d - %s %s %d %d)"
 
 #. Month
 #: calendar/gui/print.c:1040
@@ -1256,217 +2171,6 @@ msgstr "Usare il _Calendario"
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
-#: calendar/gui/e-day-view-time-item.c:391
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisioni per minuto"
-
-#: calendar/gui/e-day-view.c:2271 calendar/gui/e-day-view.c:2278
-#: calendar/gui/e-day-view.c:2287 calendar/gui/e-week-view.c:2629
-#: calendar/gui/e-week-view.c:2636 calendar/gui/e-week-view.c:2645
-#, fuzzy
-msgid "New appointment..."
-msgstr "Nuovo appuntamento..."
-
-#: calendar/gui/e-day-view.c:2275 calendar/gui/e-day-view.c:2282
-#: calendar/gui/e-week-view.c:2633 calendar/gui/e-week-view.c:2640
-msgid "Edit this appointment..."
-msgstr "Edita questo appuntamento..."
-
-#: calendar/gui/e-day-view.c:2276 calendar/gui/e-week-view.c:2634
-#, fuzzy
-msgid "Delete this appointment"
-msgstr "Elimina questo appuntamento"
-
-#: calendar/gui/e-day-view.c:2283 calendar/gui/e-week-view.c:2641
-msgid "Make this appointment movable"
-msgstr "Rendi rimandabile questo appuntamento"
-
-#: calendar/gui/e-day-view.c:2284 calendar/gui/e-week-view.c:2642
-#, fuzzy
-msgid "Delete this occurrence"
-msgstr "Elimina questa ricorrenza"
-
-#: calendar/gui/e-day-view.c:2285 calendar/gui/e-week-view.c:2643
-msgid "Delete all occurrences"
-msgstr "Elimina tutte le ricorrenze"
-
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Anno:"
-
-#: calendar/gui/goto.c:264
-msgid "Go to date"
-msgstr "Vai alla data"
-
-#. Instructions
-#: calendar/gui/goto.c:275
-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 ""
-"Selezionare la data in cui si vuole andare.\n"
-"Clickando su un giorno, si viene spostati\n"
-"su quella data."
-
-#: calendar/gui/goto.c:312
-msgid "Go to today"
-msgstr "Vai a oggi"
-
-#: calendar/gui/control-factory.c:136
-#: calendar/gui/evolution-calendar-control.c:131
-#, fuzzy
-msgid "The URI that the calendar will display"
-msgstr "La URI che il calendario visualizzerŕ"
-
-#: calendar/gui/gncal-todo.c:137
-msgid "Create to-do item"
-msgstr "Crea una cosa da fare"
-
-#: calendar/gui/gncal-todo.c:137
-msgid "Edit to-do item"
-msgstr "Modifica cosa da fare"
-
-#: calendar/gui/gncal-todo.c:171
-msgid "Summary:"
-msgstr "Riassunto:"
-
-#: calendar/gui/gncal-todo.c:181
-#, fuzzy
-msgid "Due Date:"
-msgstr "Scadenza"
-
-#: calendar/gui/gncal-todo.c:190
-#, fuzzy
-msgid "Priority:"
-msgstr "Prioritario"
-
-#: calendar/gui/gncal-todo.c:206
-msgid "Item Comments:"
-msgstr "Commenti"
-
-#: calendar/gui/gncal-todo.c:324
-msgid "Add to-do item..."
-msgstr "Aggiungi..."
-
-#: calendar/gui/gncal-todo.c:325
-msgid "Edit this item..."
-msgstr "Modifica..."
-
-#: calendar/gui/gncal-todo.c:424
-msgid "Summary"
-msgstr "Riassunto"
-
-#: calendar/gui/gncal-todo.c:425 calendar/gui/prop.c:604
-#, fuzzy
-msgid "Due Date"
-msgstr "Data"
-
-#: calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:605
-#: mail/message-list.c:589
-msgid "Priority"
-msgstr "Prioritario"
-
-#: calendar/gui/gncal-todo.c:427
-msgid "Time Left"
-msgstr "Tempo rimasto"
-
-#. Label
-#: calendar/gui/gncal-todo.c:439
-#, fuzzy
-msgid "To-do list"
-msgstr "S_trumenti"
-
-#. Add
-#: calendar/gui/gncal-todo.c:478
-msgid "Add..."
-msgstr "Aggiungi..."
-
-#. Edit
-#: calendar/gui/gncal-todo.c:487
-#, fuzzy
-msgid "Edit..."
-msgstr "Aggiungi..."
-
-#: calendar/gui/gncal-todo.c:711
-msgid "Weeks"
-msgstr "Settimane"
-
-#: calendar/gui/gncal-todo.c:712 calendar/gui/gncal-todo.c:716
-msgid "Days"
-msgstr "Giorni"
-
-#: calendar/gui/gncal-todo.c:717 calendar/gui/gncal-todo.c:721
-msgid "Hours"
-msgstr "Ore"
-
-#: calendar/gui/gncal-todo.c:717 calendar/gui/gncal-todo.c:721
-msgid "Hour"
-msgstr "Ora"
-
-#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
-msgid "Minutes"
-msgstr "Minuti"
-
-#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
-msgid "Minute"
-msgstr "Minuto"
-
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
-#, fuzzy
-msgid "Seconds"
-msgstr "Secondi"
-
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
-#, fuzzy
-msgid "Second"
-msgstr "Secondi"
-
-#: calendar/gui/gnome-cal.c:452 calendar/gui/gnome-cal.c:1063
-#: calendar/gui/gnome-cal.c:1119
-msgid "Reminder of your appointment at "
-msgstr "Promemoria dell'appuntamento alle"
-
-#: calendar/gui/gnome-cal.c:1055
-#, fuzzy
-msgid "Snooze"
-msgstr "Sonnellino"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1068 calendar/gui/gnome-cal.c:1123
-msgid "Ok"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Mar"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Mer"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Gio"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Ven"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Sab"
-
 #: calendar/gui/prop.c:330
 msgid "Time display"
 msgstr "Visualizza ora"
@@ -1595,101 +2299,7 @@ msgstr "Abilita suoneria per"
 msgid "Defaults"
 msgstr "Predefinito"
 
-#: calendar/gui/todo-conduit-control-applet.c:112
-msgid "Gpilotd todo conduit"
-msgstr ""
-
-#: calendar/gui/todo-conduit-control-applet.c:113
-msgid "(C) 1998 the Free Software Foundation"
-msgstr ""
-
-#: calendar/gui/todo-conduit-control-applet.c:115
-msgid "Configuration utility for the todo conduit.\n"
-msgstr "Utilitŕ di confugurazione per FIXME\n"
-
-#: calendar/gui/todo-conduit-control-applet.c:116
-msgid "gnome-unknown.xpm"
-msgstr ""
-
-#: calendar/gui/todo-conduit-control-applet.c:141
-msgid "Enabled"
-msgstr "Abilitato"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:181
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Avviso alle %A %b %d %Y %H:%M"
-
-#: calendar/gui/dialogs/alarm-notify-dialog.c:188
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
-
-#: calendar/gui/event-editor.c:289
-#, fuzzy
-msgid "Edit Appointment"
-msgstr "_Appuntamenti"
-
-#: calendar/gui/event-editor.c:294
-msgid "No summary"
-msgstr "Niente riassunto"
-
-#: calendar/gui/event-editor.c:298
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "Appuntamenti -%s"
-
-#: calendar/gui/event-editor.c:301
-#, c-format
-msgid "Task - %s"
-msgstr ""
-
-#: calendar/gui/event-editor.c:304
-#, fuzzy, c-format
-msgid "Journal entry - %s"
-msgstr "Ingressi giornalieri -%s"
-
-#. Owner, summary
-#: calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688
-msgid "?"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1215
-msgid "FIXME: Ca_lendar..."
-msgstr "Cal_endario"
-
-#: calendar/gui/event-editor.c:1250
-msgid "FIXME: Chec_k Names"
-msgstr "_Controlla nomi"
-
-#: calendar/gui/event-editor.c:1251
-msgid "FIXME: Address _Book..."
-msgstr "R_ubrica..."
-
-#: calendar/gui/event-editor.c:1258
-#, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "Nuovo _appuntamento"
-
-#: calendar/gui/event-editor.c:1260
-msgid "FIXME: Rec_urrence..."
-msgstr "Ric_orrenza..."
-
-#: calendar/gui/event-editor.c:1262
-msgid "FIXME: Intive _Attendees..."
-msgstr ""
-
-#: calendar/gui/event-editor.c:1263
-msgid "FIXME: C_ancel Invitation..."
-msgstr "_Annulla Invito..."
-
-#: calendar/gui/event-editor.c:1265
-msgid "FIXME: Forward as v_Calendar"
-msgstr "Inoltra come v_Calrendar"
-
-#: calendar/gui/event-editor.c:1745
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:690
+#: composer/e-msg-composer-address-dialog.c:183
 msgid "Cut"
 msgstr "Taglia"
 
@@ -1697,7 +2307,7 @@ msgstr "Taglia"
 msgid "Cut selected item into clipboard"
 msgstr "Taglia l'oggetto selezionato nella clipboard"
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:691
+#: composer/e-msg-composer-address-dialog.c:187
 msgid "Copy"
 msgstr "Copia"
 
@@ -1706,7 +2316,7 @@ msgid "Copy selected item into clipboard"
 msgstr "Copia gli oggetti selezionati sulla clipboard"
 
 #: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:692
+#: composer/e-msg-composer-address-dialog.c:199
 msgid "Paste"
 msgstr "Incolla"
 
@@ -1719,6 +2329,60 @@ msgstr "Incolla un oggetto dalla clipboard"
 msgid "Select recipients' addresses"
 msgstr "Seleziona gli indirizzi dei destinatari"
 
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: composer/e-msg-composer-address-dialog.glade.h:7
+msgid "Recipient list:"
+msgstr "Elenco dei destinatari:"
+
+#: composer/e-msg-composer-address-dialog.glade.h:9
+msgid "Search..."
+msgstr "Cerca..."
+
+#: composer/e-msg-composer-address-dialog.glade.h:10
+msgid "Name"
+msgstr "Nome"
+
+#: composer/e-msg-composer-address-dialog.glade.h:11
+msgid "Address"
+msgstr "Indirizzo"
+
+#: composer/e-msg-composer-address-dialog.glade.h:12
+msgid "Properties..."
+msgstr "Proprietŕ..."
+
+#: composer/e-msg-composer-address-dialog.glade.h:14
+msgid "To: >>"
+msgstr "A: >>"
+
+#: composer/e-msg-composer-address-dialog.glade.h:15
+#, fuzzy
+msgid "Cc: >>"
+msgstr "A: >>"
+
+#: composer/e-msg-composer-address-dialog.glade.h:16
+#, fuzzy
+msgid "Bcc: >>"
+msgstr "A: >>"
+
+#: composer/e-msg-composer-address-dialog.glade.h:17
+#, fuzzy
+msgid "label9"
+msgstr "etichetta"
+
+#: composer/e-msg-composer-address-dialog.glade.h:18
+#, fuzzy
+msgid "label7"
+msgstr "etichetta"
+
+#: composer/e-msg-composer-address-dialog.glade.h:19
+#, fuzzy
+msgid "label8"
+msgstr "etichetta"
+
 #: composer/e-msg-composer-attachment-bar.c:76
 msgid "1 byte"
 msgstr ""
@@ -1747,7 +2411,7 @@ msgstr ""
 msgid "Add attachment"
 msgstr "Aggiungere allegato"
 
-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:332
+#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
 msgid "Remove"
 msgstr "Rimuovere"
 
@@ -1763,32 +2427,51 @@ msgstr "Aggiungere allegato..."
 msgid "Attach a file to the message"
 msgstr "Allegare un file al messaggio"
 
-#: composer/e-msg-composer-hdrs.c:89
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: composer/e-msg-composer-attachment.glade.h:7
+#, fuzzy
+msgid "Attachment properties"
+msgstr "Proprietŕ dell'avviso sonoro"
+
+#: composer/e-msg-composer-attachment.glade.h:8
+msgid "MIME type:"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:10
+#, fuzzy
+msgid "File name:"
+msgstr "Nome e cognome"
+
+#: composer/e-msg-composer-hdrs.c:174
 msgid "Click here for the address book"
 msgstr "Fare clic qui per la rubrica"
 
-#: composer/e-msg-composer-hdrs.c:124
+#: composer/e-msg-composer-hdrs.c:216
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:125
+#: composer/e-msg-composer-hdrs.c:217
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:129
+#: composer/e-msg-composer-hdrs.c:221
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:130
+#: composer/e-msg-composer-hdrs.c:222
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:135
+#: composer/e-msg-composer-hdrs.c:227
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:136
+#: composer/e-msg-composer-hdrs.c:228
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -1796,159 +2479,284 @@ msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio "
 "senza apparire nell'elenco dei destinatari del messaggio."
 
-#: composer/e-msg-composer-hdrs.c:142
+#: composer/e-msg-composer-hdrs.c:234
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:143
+#: composer/e-msg-composer-hdrs.c:235
 msgid "Enter the subject of the mail"
 msgstr "Inserire il titolo dell'email"
 
-#: composer/e-msg-composer.c:492
-msgid "Open file"
-msgstr "Apri file"
+#: composer/e-msg-composer.c:444
+#, fuzzy
+msgid "Save as..."
+msgstr "Cerca..."
+
+#: composer/e-msg-composer.c:455
+#, fuzzy, c-format
+msgid "Error saving file: %s"
+msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:502
+#: composer/e-msg-composer.c:475
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:543
+#: composer/e-msg-composer.c:494
 #, fuzzy
 msgid "Discard this message?"
 msgstr "Inoltra questo messaggio"
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:511
+msgid "Open file"
+msgstr "Apri file"
+
+#: composer/e-msg-composer.c:623
+msgid "That file does not exist."
+msgstr ""
+
+#: composer/e-msg-composer.c:633
+msgid "That is not a regular file."
+msgstr ""
+
+#: composer/e-msg-composer.c:643
+msgid "That file exists but is not readable."
+msgstr ""
+
+#: composer/e-msg-composer.c:653
+msgid "That file appeared accesible but open(2) failed."
+msgstr ""
+
+#: composer/e-msg-composer.c:675
+msgid ""
+"The file is very large (more than 100K).\n"
+"Are you sure you wish to insert it?"
+msgstr ""
+
+#: composer/e-msg-composer.c:696
+msgid "An error occurred while reading the file."
+msgstr ""
+
+#: composer/e-msg-composer.c:792 shell/e-shell-view-menu.c:438
+#, fuzzy
+msgid "_File"
+msgstr "Filtra"
+
+#: composer/e-msg-composer.c:798
+#, fuzzy
+msgid "_Open..."
+msgstr "_Apri"
+
+#: composer/e-msg-composer.c:799
+msgid "Load a previously saved message"
+msgstr ""
+
+#: composer/e-msg-composer.c:807
+msgid "_Save..."
+msgstr ""
+
+#: composer/e-msg-composer.c:808
+#, fuzzy
+msgid "Save message"
+msgstr "Invia un nuovo messaggio"
+
+#: composer/e-msg-composer.c:816
+#, fuzzy
+msgid "_Save as..."
+msgstr "Cerca..."
+
+#: composer/e-msg-composer.c:817
+#, fuzzy
+msgid "Save message with a different name"
+msgstr "Salva il messaggio in una cartella specificata"
+
+#: composer/e-msg-composer.c:825
 msgid "Save in _folder..."
 msgstr "Salva nella _cartella..."
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:826
 msgid "Save the message in a specified folder"
 msgstr "Salva il messaggio in una cartella specificata"
 
-#: composer/e-msg-composer.c:651 composer/e-msg-composer.c:688
-#: mail/folder-browser-factory.c:36
-msgid "Send"
+#: composer/e-msg-composer.c:835
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: composer/e-msg-composer.c:836
+#, fuzzy
+msgid "Insert a file as text into the message"
+msgstr "Allegare un file al messaggio"
+
+#: composer/e-msg-composer.c:845
+#, fuzzy
+msgid "_Send"
 msgstr "Invia"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:846
 msgid "Send the message"
 msgstr "Invia il messaggio"
 
-#: composer/e-msg-composer.c:659
-msgid "View _attachments"
-msgstr "Mostra _allegati"
+#: composer/e-msg-composer.c:856
+#, fuzzy
+msgid "_Close..."
+msgstr "Sfoglia..."
 
-#: composer/e-msg-composer.c:659
-msgid "View/hide attachments"
-msgstr "Mostra/nascondi allegati"
+#: composer/e-msg-composer.c:857
+msgid "Quit the message composer"
+msgstr ""
 
-#: composer/e-msg-composer.c:688
-msgid "Send this message"
-msgstr "Invia questo messaggio"
+#: composer/e-msg-composer.c:870 shell/e-shell-view-menu.c:480
+#, fuzzy
+msgid "_Edit"
+msgstr "Modifica"
 
-#: composer/e-msg-composer.c:690
-msgid "Cut selected region into the clipboard"
-msgstr "Taglia la regione selezionata nella clipboard "
+#: composer/e-msg-composer.c:881
+#, fuzzy
+msgid "_Format"
+msgstr "Formato"
 
-#: composer/e-msg-composer.c:691
-msgid "Copy selected region into the clipboard"
-msgstr "Copia la regione selezionata nella clipboard"
+#: composer/e-msg-composer.c:887
+msgid "HTML"
+msgstr ""
 
-#: composer/e-msg-composer.c:692
-msgid "Paste selected region into the clipboard"
-msgstr "Incolla la regione selezionata nella clipboar"
+#: composer/e-msg-composer.c:888
+#, fuzzy
+msgid "Send the mail in HTML format"
+msgstr "Invia posta in formato HTML"
 
-#: composer/e-msg-composer.c:693
-msgid "Undo"
-msgstr "Annulla"
+#: composer/e-msg-composer.c:901 shell/e-shell-view-menu.c:387
+#: shell/e-shell-view-menu.c:491
+#, fuzzy
+msgid "_View"
+msgstr "_Nuovo"
+
+#: composer/e-msg-composer.c:907
+#, fuzzy
+msgid "Show _attachments"
+msgstr "Mostra _allegati"
 
-#: composer/e-msg-composer.c:693
-msgid "Undo last operation"
-msgstr "Annulla ultima operazione"
+#: composer/e-msg-composer.c:908
+#, fuzzy
+msgid "Show/hide attachments"
+msgstr "Mostra/nascondi allegati"
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:941
+msgid "Send"
+msgstr "Invia"
+
+#: composer/e-msg-composer.c:942
+msgid "Send this message"
+msgstr "Invia questo messaggio"
+
+#: composer/e-msg-composer.c:951
 msgid "Attach"
 msgstr "Allega"
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:952
 msgid "Attach a file"
 msgstr "Allega un file"
 
-#: composer/e-msg-composer.c:857
+#: composer/e-msg-composer.c:1139
 #, fuzzy
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: mail/folder-browser-factory.c:35
+#: mail/component-factory.c:188
+#, fuzzy
+msgid "Cannot initialize Evolution's mail component."
+msgstr "Impossibile inizializzare il componente della posta di Evolution."
+
+#: mail/folder-browser-factory.c:23
 msgid "Get mail"
 msgstr "Ricevi posta"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:23
 msgid "Check for new mail"
 msgstr "Controlla nuova posta"
 
-#: mail/folder-browser-factory.c:36
-msgid "Send a new message"
-msgstr "Invia un nuovo messaggio"
+#: mail/folder-browser-factory.c:24
+#, fuzzy
+msgid "Compose"
+msgstr "Colori"
 
-#: mail/folder-browser-factory.c:37
-msgid "Find messages"
-msgstr "Trova messaggio"
+#: mail/folder-browser-factory.c:24
+#, fuzzy
+msgid "Compose a new message"
+msgstr "Componi un nuovo messaggio"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:28
 msgid "Reply"
 msgstr "Rispondi"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:28
 msgid "Reply to the sender of this message"
 msgstr "Rispondi all'autore di questo messaggio"
 
-#: mail/folder-browser-factory.c:42
+#: mail/folder-browser-factory.c:29
 msgid "Reply to All"
 msgstr "Rispondi a Tutti"
 
-#: mail/folder-browser-factory.c:42
+#: mail/folder-browser-factory.c:29
 msgid "Reply to all recipients of this message"
 msgstr "Rispondi a tutti i destinatari di questo messaggio"
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser-factory.c:31
 msgid "Forward"
 msgstr "Inoltra"
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser-factory.c:31
 msgid "Forward this message"
 msgstr "Inoltra questo messaggio"
 
-#: mail/folder-browser-factory.c:48
+#: mail/folder-browser-factory.c:35
+#, fuzzy
+msgid "Move"
+msgstr "Lu"
+
+#: mail/folder-browser-factory.c:35
+#, fuzzy
+msgid "Move message to a new folder"
+msgstr "Salva il messaggio in una cartella specificata"
+
+#: mail/folder-browser-factory.c:37
 msgid "Print the selected message"
 msgstr "Stampa il messaggio selezionato"
 
-#: mail/folder-browser-factory.c:50
+#: mail/folder-browser-factory.c:39
 msgid "Delete this message"
 msgstr "Elimina questo messaggio"
 
-#: mail/folder-browser-factory.c:69
+#: mail/folder-browser-factory.c:59
+msgid "_Threaded Message List"
+msgstr ""
+
+#: mail/folder-browser-factory.c:72
+#, fuzzy
+msgid "_Mark all messages seen"
+msgstr "Invia un _Messaggio"
+
+#: mail/folder-browser-factory.c:78
 msgid "_Expunge"
 msgstr "Canc_ella"
 
-#: mail/folder-browser-factory.c:75
-msgid "_Filter Druid ..."
-msgstr ""
+#: mail/folder-browser-factory.c:84
+#, fuzzy
+msgid "Mail _Filters ..."
+msgstr "_File..."
 
-#: mail/folder-browser-factory.c:81
-msgid "_Virtual Folder Druid ..."
+#: mail/folder-browser-factory.c:90
+msgid "_vFolder Editor ..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:87
+#: mail/folder-browser-factory.c:96
 msgid "_Mail Configuration ..."
 msgstr "_Configurazione della Posta"
 
-#: mail/folder-browser-factory.c:93
+#: mail/folder-browser-factory.c:102
 msgid "Forget _Passwords"
 msgstr "Dimentica _Password"
 
-#: mail/mail-config.c:258
+#: mail/mail-config.c:688
 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 "
@@ -1958,58 +2766,58 @@ msgstr ""
 "posta in uscita.  Č possibile, eventualmente, inserire il nome\n"
 "dell'organizzazione, e il nome di un file dal quale leggere la firma."
 
-#: mail/mail-config.c:273
+#: mail/mail-config.c:701
 #, fuzzy
 msgid "Full name:"
 msgstr "Nome e cognome"
 
-#: mail/mail-config.c:301
+#: mail/mail-config.c:725
 #, fuzzy
 msgid "Email address:"
 msgstr "Indirizzo email:"
 
-#: mail/mail-config.c:324
+#: mail/mail-config.c:740
 #, fuzzy
 msgid "Organization:"
 msgstr "Organizzazione"
 
-#: mail/mail-config.c:336
+#: mail/mail-config.c:751
 msgid "Signature file:"
 msgstr "File firma:"
 
-#: mail/mail-config.c:341
+#: mail/mail-config.c:756
 msgid "Signature File"
 msgstr "File firma"
 
-#: mail/mail-config.c:698 mail/mail-config.c:789
+#: mail/mail-config.c:1167
 #, fuzzy
 msgid "Server:"
 msgstr "Server:"
 
-#: mail/mail-config.c:704
-#, fuzzy
+#: mail/mail-config.c:1173
 msgid "Username:"
 msgstr ""
 
-#: mail/mail-config.c:710
+#: mail/mail-config.c:1179
 #, fuzzy
 msgid "Path:"
 msgstr "Percorso:"
 
-#: mail/mail-config.c:716 mail/mail-config.c:795
+#: mail/mail-config.c:1187
 #, fuzzy
 msgid "Authentication:"
 msgstr "Autenticazione:"
 
-#: mail/mail-config.c:728 mail/mail-config.c:807
+#: mail/mail-config.c:1199
 msgid "Detect supported types..."
 msgstr "Trova i tipi supportati..."
 
-#: mail/mail-config.c:754 mail/mail-config.c:829
-msgid "Test these values before continuing"
-msgstr "Provare questi valori prima di continuare"
+#: mail/mail-config.c:1222
+#, fuzzy
+msgid "Test Settings"
+msgstr "Verifica i Nomi Selezionati"
 
-#: mail/mail-config.c:936
+#: mail/mail-config.c:1344 mail/mail-config.c:1392
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -2017,196 +2825,122 @@ msgid ""
 "If the server requires authentication, you can click the \"Detect supported "
 "types...\" button after entering the other information."
 msgstr ""
-"Selezionare il tipo di server della posta e inserirne le informazioni rilevanti. \n"
+"Selezionare il tipo di server della posta e inserirne le informazioni "
+"rilevanti. \n"
 "\n"
 "Se il server richiede un'autenticazione, č possibile cliccare il\n"
 "bottone \\\"Trova i tipi supportati...\\\" dopo aver inserito le altre\n"
 "informazioni. "
 
-#: mail/mail-config.c:954
-msgid "Select the method you would like to use to deliver your mail."
-msgstr "Selezionare il metodo che si desidera utilizzare per inviare la posta."
-
-#: mail/mail-config.c:1128 mail/mail-config.c:1207
+#: mail/mail-config.c:1368
 #, fuzzy
-msgid "Mail Configuration"
-msgstr "_Configurazione della Posta"
-
-#. Identity page
-#: mail/mail-config.c:1145 mail/mail-config.c:1874
-msgid "Identity"
-msgstr "Identitŕ"
-
-#. Source page
-#: mail/mail-config.c:1164
-msgid "Mail Source"
-msgstr "Sorgente della Posta"
-
-#. Transport page
-#: mail/mail-config.c:1185
-msgid "Mail Transport"
-msgstr "Trasporto della Posta"
+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 ""
+"Selezionare il tipo di server della posta e inserirne le informazioni "
+"rilevanti. \n"
+"\n"
+"Se il server richiede un'autenticazione, č possibile cliccare il\n"
+"bottone \\\"Trova i tipi supportati...\\\" dopo aver inserito le altre\n"
+"informazioni. "
 
-#: mail/mail-config.c:1307
+#: mail/mail-config.c:1434
 msgid "Edit Identity"
 msgstr "Modifica Identitŕ"
 
-#: mail/mail-config.c:1309
+#: mail/mail-config.c:1436
 msgid "Add Identity"
 msgstr "Aggiungi Identitŕ"
 
-#: mail/mail-config.c:1452
+#: mail/mail-config.c:1515
 msgid "Edit Source"
 msgstr "Modifica Sorgente"
 
-#: mail/mail-config.c:1454
+#: mail/mail-config.c:1517
 msgid "Add Source"
 msgstr "Aggiungi Sorgente"
 
-#: mail/mail-config.c:1716
-msgid "Name"
-msgstr "Nome"
-
-#: mail/mail-config.c:1716
-msgid "Address"
-msgstr "Indirizzo"
-
-#: mail/mail-config.c:1716
-#, fuzzy
-msgid "Organization"
-msgstr "Organizzazione"
+#: mail/mail-config.c:1598
+msgid "Edit News Server"
+msgstr ""
 
-#: mail/mail-config.c:1716
-msgid "Signature file"
-msgstr "File firma"
+#: mail/mail-config.c:1600
+msgid "Add News Server"
+msgstr ""
 
-#: mail/mail-config.c:1742
+#: mail/mail-ops.c:393
 #, fuzzy
-msgid "Camel Providers Configuration"
-msgstr "Configurazione del Provider Camel"
+msgid "Fetching mail"
+msgstr "Ricevi posta"
 
-#: mail/mail-config.c:1831
-msgid "Identities"
-msgstr "Identitŕ"
+#: mail/mail-ops.c:405
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
 
-#: mail/mail-config.c:1847 mail/mail-config.c:1943
-msgid "Add"
-msgstr "Aggiungi"
+#: mail/mail-ops.c:791
+msgid "Move message(s) to"
+msgstr ""
 
-#: mail/mail-config.c:1856 mail/mail-config.c:1952
-msgid "Edit"
-msgstr "Modifica"
+#: mail/mail-threads.c:483
+msgid "Currently pending operations:"
+msgstr ""
 
-#: mail/mail-config.c:1927
-#, fuzzy
-msgid "Mail sources"
-msgstr "Fonte della posta"
+#: mail/mail-threads.c:621
+msgid "Incomplete message written on pipe!"
+msgstr ""
 
-#: mail/mail-config.c:1970
-msgid "Sources"
-msgstr "Sorgenti"
+#: mail/mail-threads.c:623
+msgid "Error reading commands from dispatching thread."
+msgstr ""
 
-#: mail/mail-config.c:2009
-msgid "Transports"
-msgstr "Trasporti"
+#: mail/mail-threads.c:712
+msgid "Corrupted message from dispatching thread?"
+msgstr ""
 
-#: mail/mail-config.c:2030
-msgid "Send messages in HTML format"
-msgstr "Invia posta in formato HTML"
+#: mail/mail-threads.c:814
+#, fuzzy
+msgid "Could not create dialog box."
+msgstr "Impossibile creare il connettore per il Pilot\n"
 
-#: mail/main.c:58
-msgid "Mail Component: I could not initialize Bonobo"
-msgstr "Componente della Posta: impossibile inizializzare Bonobo"
+#: mail/mail-threads.c:849
+msgid "User cancelled query."
+msgstr ""
 
-#: mail/message-list.c:575
+#: mail/message-list.c:456
 msgid "Online Status"
 msgstr "In linea"
 
-#: mail/message-list.c:610
+#: mail/message-list.c:492
+msgid "From"
+msgstr "Da"
+
+#: mail/message-list.c:499
 msgid "Subject"
 msgstr ""
 
-#: mail/message-list.c:617
+#: mail/message-list.c:506
 msgid "Date"
 msgstr "Data"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:513
 #, fuzzy
 msgid "Received"
 msgstr "Ricevuto"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:520
+msgid "To"
+msgstr "A"
+
+#: mail/message-list.c:527
 msgid "Size"
 msgstr "Dimensioni"
 
-#: mail/component-factory.c:173
-#, fuzzy
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Impossibile inizializzare il componente della posta di Evolution."
-
-#: shell/main.c:99
-#, fuzzy
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release of\n"
-"the Evolution groupware suite.\n"
-"\n"
-"The Evolution team has worked hard to make Evolution as robust,\n"
-"extensible, pretty, fast and well-suited to heavy internet users as\n"
-"possible.  And we're very tired.  But we're not done -- not yet.\n"
-"\n"
-"As you explore Evolution, please understand that most of our work has\n"
-"been focused on the backend engine which drives the entire system and\n"
-"not on the user interface.  We are just cresting the hill now, though,\n"
-"and will be pouring most of our love and attention into the UI from\n"
-"here out.  But at least you know that you're not using demoware.\n"
-"\n"
-"So, time for the nerdy disclaimer.  Evolution will: crash, lose your\n"
-"mail, leave stray processes running, consume 100% CPU, race, lock,\n"
-"send HTML mail to random mailing lists, and embarass you in front of\n"
-"your friends and co-workers.  Use at your own risk.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
-msgstr ""
-"Buongiorno.  Grazie per aver trovato il tempo di scaricare questa\n"
-"prima versione-prototipo del groupware suite Evolution.\n"
-"\n"
-"La squadra di evolution ha lavorato sodo per rendere Evolution il piů\n"
-"robusto, estensibile, gradevole, veloce ed adatto possibile ad un uso\n"
-"intenso di internet.  Siamo stanchi.  Ma non abbiamo ancora finito.\n"
-"\n"
-"Mentre espolorate Evolution, vogliate tenere presente che la maggior\n"
-"parte del nostro lavoro č stato indirizzato sul motore di fondo che\n"
-"gestisce l'intero sistema e non sull'interfaccia utente.  Stiamo\n"
-"appena raggiungendo il nostro obiettivo, da quel momento in poi, ci\n"
-"dedicheremo con passione e attenzione all'interfaccia utente.  Almeno\n"
-"sappiate che state utilizzando una versione dimostrativa.  \n"
-"\n"
-"Ora č il momento della liberatoria da nerd.  Evolution farŕ impallare\n"
-"il vostro computer, perderŕ la vostra posta, lascerŕ processi attivi,\n"
-"consumerŕ il 100% del tempo di CPU, si bloccherŕ, manderŕ posta in\n"
-"HTML a liste di indirizzi scelti a caso mettendovi in imbarazzo di\n"
-"fronte ad amici e colleghi.  Usatelo a vostro rischio e pericolo.\n"
-"\n"
-"Ci auguriamo che apprezziate il risultato del nostro duro lavoro,\n"
-"e aspettiamo ansiosamente il vostro contributo\n"
-
-#: shell/main.c:128
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Grazie\n"
-"il team di Evolution.\n"
-
-#: shell/main.c:169
-msgid "Cannot initialize the Evolution shell."
-msgstr "Impossibile inizializzare la shell di Evolution."
-
-#: shell/main.c:204
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
-
 #: shell/e-setup.c:47
 msgid "Evolution installation"
 msgstr "Installazione di Evolution"
@@ -2228,7 +2962,7 @@ msgid ""
 msgstr ""
 "Impossibile creare la cartella\n"
 "%s\n"
-"Errore: %S"
+"Errore: %s"
 
 #: shell/e-setup.c:84
 #, c-format
@@ -2254,96 +2988,61 @@ msgstr ""
 "Rinmuoverlo per permettere l'installazione\n"
 "dei file utente di Evolution."
 
-#: shell/e-shell-view.c:112
-msgid "(No folder displayed)"
-msgstr "(Nessuna cartella mostrata)"
+#: shell/e-shell-folder-creation-dialog.c:81
+#, fuzzy, c-format
+msgid ""
+"Cannot create the specified folder:\n"
+"%s"
+msgstr ""
+"Impossibile creare la cartella\n"
+"%s\n"
+"Errore: %s"
 
-#: shell/e-shell-view.c:207
-#, fuzzy
-msgid "Folders"
-msgstr "Cartelle"
+#: shell/e-shell-folder-creation-dialog.c:133
+msgid "The specified folder name is not valid."
+msgstr ""
 
-#: shell/e-shell-view.c:575
+#: shell/e-shell-folder-creation-dialog.c:223
 #, fuzzy
-msgid "None"
-msgstr "Nessuno "
+msgid "Evolution - Create new folder"
+msgstr "Evolution non riesce a creare le sue cartelle locali"
 
-#: shell/e-shell-view.c:579
-#, c-format
-msgid "Evolution - %s"
+#: shell/e-shell-folder-selection-dialog.c:95
+msgid ""
+"The type of the selected folder is not valid for\n"
+"the requested operation."
 msgstr ""
 
-#: shell/e-shell-view.c:647
-#, fuzzy, c-format
-msgid "Cannot open location: %s"
-msgstr "Impossibile impostare location: %s"
-
-#: shell/e-shell.c:250
-#, fuzzy, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Impossibile impostare il local storage --%s"
+#: shell/e-shell-folder-selection-dialog.c:236
+#, fuzzy
+msgid "New..."
+msgstr "_Nuovo"
 
-#: shell/e-shell-folder-title-bar.c:353
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(Senza nome)"
 
-#: shell/e-shortcut.c:469
-msgid "New group"
-msgstr "Nuovo gruppo"
-
-#: shell/e-shortcuts-view.c:235
-msgid "_Small icons"
-msgstr "Icone _piccole"
-
-#: shell/e-shortcuts-view.c:236
-#, fuzzy
-msgid "Show the shortcuts as small icons"
-msgstr "Mostra i collegamenti come icone piccole "
-
-#: shell/e-shortcuts-view.c:238
-#, fuzzy
-msgid "_Large icons"
-msgstr "Icone _grandi"
-
-#: shell/e-shortcuts-view.c:239
-#, fuzzy
-msgid "Show the shortcuts as large icons"
-msgstr "Mostra i collegamenti come icone grandi"
-
-#: shell/e-shortcuts-view.c:329
-msgid "Activate"
-msgstr "Attiva"
-
-#: shell/e-shortcuts-view.c:329
-msgid "Activate this shortcut"
-msgstr "Attiva questo collegamento"
-
-#: shell/e-shortcuts-view.c:332
-#, fuzzy
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Rimuovi il collegamenti dalla barra dei collegamenti"
-
 #. you might have to call gnome_dialog_run() on the
 #. * dialog returned here, I don't remember...
 #.
-#: shell/e-shell-view-menu.c:110
+#: shell/e-shell-view-menu.c:113
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
 
 #. same as above
-#: shell/e-shell-view-menu.c:116
+#: shell/e-shell-view-menu.c:119
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non puň essere eseguito."
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:164
 msgid "Evolution"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:161
+#: shell/e-shell-view-menu.c:166
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:163
+#: shell/e-shell-view-menu.c:168
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -2353,135 +3052,385 @@ msgstr ""
 "per posta, calendario e gestione dei contatti\n"
 "nell'ambito dell'ambiente GNOME desktop.  "
 
-#: shell/e-shell-view-menu.c:302 shell/e-shell-view-menu.c:399
+#: shell/e-shell-view-menu.c:324
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Vai  nella cartella..."
 
-#: shell/e-shell-view-menu.c:343
+#: shell/e-shell-view-menu.c:381
+msgid "_New"
+msgstr "_Nuovo"
+
+#: shell/e-shell-view-menu.c:393
 msgid "_Folder"
 msgstr "_Cartella"
 
-#: shell/e-shell-view-menu.c:347
-msgid "Evolution _Bar Shortcut"
+#: shell/e-shell-view-menu.c:399
+#, fuzzy
+msgid "Evolution bar _shortcut"
 msgstr "_Collegamento"
 
-#: shell/e-shell-view-menu.c:353
-msgid "_Mail message"
+#: shell/e-shell-view-menu.c:408
+#, fuzzy
+msgid "_Mail message (FIXME)"
 msgstr "Invia un _Messaggio"
 
-#: shell/e-shell-view-menu.c:354 shell/e-shell-view-menu.c:357
-msgid "Composes a new mail message"
-msgstr "Componei un nuovo messaggio"
-
-#: shell/e-shell-view-menu.c:356
-msgid "_Appointment"
+#: shell/e-shell-view-menu.c:414
+#, fuzzy
+msgid "_Appointment (FIXME)"
 msgstr "_Appuntamenti"
 
-#: shell/e-shell-view-menu.c:359
-msgid "Meeting Re_quest"
-msgstr "_Richieste di appuntamenti"
-
-#: shell/e-shell-view-menu.c:362
-msgid "_Contact"
+#: shell/e-shell-view-menu.c:420
+#, fuzzy
+msgid "_Contact (FIXME)"
 msgstr "_Contatti"
 
-#: shell/e-shell-view-menu.c:365
-msgid "_Task"
-msgstr "_Obiettivi"
-
-#: shell/e-shell-view-menu.c:368
-msgid "Task _Request"
-msgstr "_Richiesta Obiettivi"
-
-#: shell/e-shell-view-menu.c:371
-msgid "_Journal Entry"
-msgstr "_Ingressi giornalieri"
-
-#: shell/e-shell-view-menu.c:374
-msgid "_Note"
-msgstr "_Appunti"
-
-#: shell/e-shell-view-menu.c:384
-msgid "_Selected Items"
-msgstr "_Oggetti selezionati"
+#: shell/e-shell-view-menu.c:426
+msgid "_Task (FIXME)"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:392
-msgid "_New"
-msgstr "_Nuovo"
+#: shell/e-shell-view-menu.c:448
+#, fuzzy
+msgid "_Go to folder..."
+msgstr "Vai  nella cartella..."
 
-#: shell/e-shell-view-menu.c:393
-msgid "_Open"
-msgstr "_Apri"
+#: shell/e-shell-view-menu.c:449
+msgid "Display a different folder"
+msgstr "Mostra un'altra cartella"
 
-#: shell/e-shell-view-menu.c:395
-msgid "Clos_e All Items"
-msgstr "Chiudi _Tutti"
+#: shell/e-shell-view-menu.c:456
+#, fuzzy
+msgid "_Create new folder..."
+msgstr "Salva nella _cartella..."
 
-#: shell/e-shell-view-menu.c:395
-msgid "Closes all the open items"
-msgstr "Chiude tutti gli oggetti aperti"
+#: shell/e-shell-view-menu.c:457 shell/e-shell-view-menu.c:467
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Crea un nuovo _Calendario"
 
-#: shell/e-shell-view-menu.c:399
-msgid "Display a different folder"
-msgstr "Mostra un'altra cartella"
+#: shell/e-shell-view-menu.c:466
+#, fuzzy
+msgid "E_xit..."
+msgstr "Aggiungi..."
 
-#: shell/e-shell-view-menu.c:414
+#: shell/e-shell-view-menu.c:497
 msgid "Show _shortcut bar"
 msgstr "Mo_stra la barra dei collegamenti"
 
-#: shell/e-shell-view-menu.c:415
+#: shell/e-shell-view-menu.c:498
 msgid "Show the shortcut bar"
 msgstr "Mostra la barra dei collegamenti"
 
-#: shell/e-shell-view-menu.c:417
+#: shell/e-shell-view-menu.c:503
 msgid "Show _folder bar"
 msgstr "Mostra la _barra delle cartelle"
 
-#: shell/e-shell-view-menu.c:418
+#: shell/e-shell-view-menu.c:504
 msgid "Show the folder bar"
 msgstr "Mostra la barra delle cartelle"
 
-#: shell/e-shell-view-menu.c:435
-msgid "Help _Index"
-msgstr "Indice degli Aiuti"
+#: shell/e-shell-view-menu.c:526
+msgid "_Actions"
+msgstr "_Azioni"
 
-#: shell/e-shell-view-menu.c:438
-msgid "Getting _Started"
+#: shell/e-shell-view-menu.c:537
+msgid "_Help"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:441
-msgid "Using the _Mailer"
+#: shell/e-shell-view-menu.c:543
+#, fuzzy
+msgid "Help _index"
+msgstr "Indice degli Aiuti"
+
+#: shell/e-shell-view-menu.c:550
+#, fuzzy
+msgid "Getting _started"
+msgstr "Ora di inizio appuntamento:"
+
+#: shell/e-shell-view-menu.c:557
+#, fuzzy
+msgid "Using the _mailer"
 msgstr "Usare il programma di posta"
 
-#: shell/e-shell-view-menu.c:444
-msgid "Using the _Calendar"
+#: shell/e-shell-view-menu.c:564
+#, fuzzy
+msgid "Using the _calendar"
 msgstr "Usare il _Calendario"
 
-#: shell/e-shell-view-menu.c:447
-msgid "Using the Cont_act Manager"
+#: shell/e-shell-view-menu.c:571
+#, fuzzy
+msgid "Using the c_ontact manager"
 msgstr "Usare il _Gestore dei Contatti"
 
-#: shell/e-shell-view-menu.c:452
+#: shell/e-shell-view-menu.c:581
 msgid "_Submit bug report"
 msgstr "_Inoltra un bug report"
 
-#: shell/e-shell-view-menu.c:453
-msgid "Submit bug-report via bug-buddy"
+#: shell/e-shell-view-menu.c:582
+#, fuzzy
+msgid "Submit bug report using Bug Buddy"
 msgstr "Inoltra un bug-report con bug-buddy"
 
-#: shell/e-shell-view-menu.c:469
-msgid "_Actions"
-msgstr "_Azioni"
+#: shell/e-shell-view-menu.c:591
+msgid "_About Evolution..."
+msgstr ""
 
-#: shell/e-init.c:25
-msgid "Evolution can not create its local folders"
-msgstr "Evolution non riesce a creare le sue cartelle locali"
+#: shell/e-shell-view-menu.c:592
+msgid "Show information about Evolution"
+msgstr ""
+
+#: shell/e-shell-view.c:114
+msgid "(No folder displayed)"
+msgstr "(Nessuna cartella mostrata)"
+
+#: shell/e-shell-view.c:342
+#, fuzzy
+msgid "Folders"
+msgstr "Cartelle"
+
+#: shell/e-shell-view.c:734
+#, fuzzy
+msgid "None"
+msgstr "Nessuno "
+
+#: shell/e-shell-view.c:738
+#, c-format
+msgid "Evolution - %s"
+msgstr ""
+
+#: shell/e-shell.c:293
+#, fuzzy, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Impossibile impostare il local storage --%s"
+
+#: shell/e-shortcuts-view.c:235
+msgid "_Small icons"
+msgstr "Icone _piccole"
+
+#: shell/e-shortcuts-view.c:236
+#, fuzzy
+msgid "Show the shortcuts as small icons"
+msgstr "Mostra i collegamenti come icone piccole "
+
+#: shell/e-shortcuts-view.c:238
+#, fuzzy
+msgid "_Large icons"
+msgstr "Icone _grandi"
+
+#: shell/e-shortcuts-view.c:239
+#, fuzzy
+msgid "Show the shortcuts as large icons"
+msgstr "Mostra i collegamenti come icone grandi"
+
+#: shell/e-shortcuts-view.c:330
+msgid "Activate"
+msgstr "Attiva"
+
+#: shell/e-shortcuts-view.c:330
+msgid "Activate this shortcut"
+msgstr "Attiva questo collegamento"
+
+#: shell/e-shortcuts-view.c:333
+#, fuzzy
+msgid "Remove this shortcut from the shortcut bar"
+msgstr "Rimuovi il collegamenti dalla barra dei collegamenti"
 
 #: shell/e-shortcuts.c:358
 msgid "Error saving shortcuts."
 msgstr "Errore di salvataggio dei collegamenti."
 
+#: shell/e-storage.c:217
+#, fuzzy
+msgid "(No name)"
+msgstr "Nome"
+
+#: shell/e-storage.c:412
+msgid "No error"
+msgstr ""
+
+#: shell/e-storage.c:414
+msgid "Generic error"
+msgstr ""
+
+#: shell/e-storage.c:416
+msgid "A folder with the same name already exists"
+msgstr ""
+
+#: shell/e-storage.c:418
+msgid "The specified folder type is not valid"
+msgstr ""
+
+#: shell/e-storage.c:420
+msgid "I/O error"
+msgstr ""
+
+#: shell/e-storage.c:422
+msgid "Not enough space to create the folder"
+msgstr ""
+
+#: shell/e-storage.c:424
+msgid "The specified folder was not found"
+msgstr ""
+
+#: shell/e-storage.c:426
+msgid "Function not implemented in this storage"
+msgstr ""
+
+#: shell/e-storage.c:428
+msgid "Permission denied"
+msgstr ""
+
+#: shell/e-storage.c:430
+msgid "Operation not supported"
+msgstr ""
+
+#: shell/e-storage.c:432
+msgid "The specified type is not supported in this storage"
+msgstr ""
+
+#: shell/e-storage.c:434
+msgid "Unknown error"
+msgstr ""
+
+#: shell/main.c:66
+#, fuzzy
+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"
+"Evolution to read their mail full time. You could too. (Just\n"
+"be sure to keep a backup.)\n"
+"\n"
+"But while we have fixed many bugs affecting its stability and\n"
+"security, you still get the disclaimer:  Evolution will: crash,\n"
+"lose your mail when you don't want it to, refuse to delete your\n"
+"mail when you do want it to, leave stray processes running,\n"
+"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
+"lists, and embarass you in front of your friends and co-workers.\n"
+"Use only as directed.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we eagerly\n"
+"await your contributions!\n"
+msgstr ""
+"Buongiorno.  Grazie per aver trovato il tempo di scaricare questa\n"
+"prima versione-prototipo del groupware suite Evolution.\n"
+"\n"
+"La squadra di evolution ha lavorato sodo per rendere Evolution il piů\n"
+"robusto, estensibile, gradevole, veloce ed adatto possibile ad un uso\n"
+"intenso di internet.  Siamo stanchi.  Ma non abbiamo ancora finito.\n"
+"\n"
+"Mentre espolorate Evolution, vogliate tenere presente che la maggior\n"
+"parte del nostro lavoro č stato indirizzato sul motore di fondo che\n"
+"gestisce l'intero sistema e non sull'interfaccia utente.  Stiamo\n"
+"appena raggiungendo il nostro obiettivo, da quel momento in poi, ci\n"
+"dedicheremo con passione e attenzione all'interfaccia utente.  Almeno\n"
+"sappiate che state utilizzando una versione dimostrativa.  \n"
+"\n"
+"Ora č il momento della liberatoria da nerd.  Evolution farŕ impallare\n"
+"il vostro computer, perderŕ la vostra posta, lascerŕ processi attivi,\n"
+"consumerŕ il 100% del tempo di CPU, si bloccherŕ, manderŕ posta in\n"
+"HTML a liste di indirizzi scelti a caso mettendovi in imbarazzo di\n"
+"fronte ad amici e colleghi.  Usatelo a vostro rischio e pericolo.\n"
+"\n"
+"Ci auguriamo che apprezziate il risultato del nostro duro lavoro,\n"
+"e aspettiamo ansiosamente il vostro contributo\n"
+
+#: shell/main.c:93
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"Grazie\n"
+"il team di Evolution.\n"
+
+#: shell/main.c:128
+msgid "Cannot initialize the Evolution shell."
+msgstr "Impossibile inizializzare la shell di Evolution."
+
+#: shell/main.c:166
+#, fuzzy
+msgid "Cannot initialize the configuration system."
+msgstr "Impossibile inizializzare la shell di Evolution."
+
+#: shell/main.c:172
+msgid "Cannot initialize the Bonobo component system."
+msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: widgets/e-table/e-table-config.glade.h:7
+msgid "Fields"
+msgstr "Campi"
+
+#: widgets/e-table/e-table-config.glade.h:8
+#, fuzzy
+msgid "Grouping"
+msgstr "Gruppi %i"
+
+#: widgets/e-table/e-table-config.glade.h:9
+msgid "Sort"
+msgstr "Ordina"
+
+#: widgets/e-table/e-table-config.glade.h:10
+msgid "Filter"
+msgstr "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.
+#.
+#: widgets/e-table/e-table-field-chooser.glade.h:7
+#, fuzzy
+msgid "Field Chooser"
+msgstr "Campi"
+
+#: widgets/e-table/e-table-field-chooser.glade.h:8
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: widgets/e-table/e-table-group.glade.h:7
+msgid "window1"
+msgstr ""
+
+#: widgets/e-table/e-table-group.glade.h:8
+msgid "Available fields"
+msgstr "Campi disponibili"
+
+#: widgets/e-table/e-table-group.glade.h:9
+#, fuzzy
+msgid "label1"
+msgstr "etichetta"
+
+#: widgets/e-table/e-table-group.glade.h:10
+msgid "Show in this order"
+msgstr "Mostra in questo ordine"
+
+#: widgets/e-table/e-table-group.glade.h:11
+#, fuzzy
+msgid "label2"
+msgstr "etichetta"
+
+#: widgets/e-table/e-table-group.glade.h:12
+msgid "Add >>"
+msgstr "Aggiungi >>"
+
+#: widgets/e-table/e-table-group.glade.h:13
+msgid "<< Remove"
+msgstr "<< Rimuovi"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 #, fuzzy
 msgid "Tentative"
@@ -2562,205 +3511,211 @@ msgstr "Ora di termine dell' appuntamento:"
 msgid "All Attendees"
 msgstr "Tutti i partecipanti"
 
-#: widgets/shortcut-bar/e-group-bar.c:631
-#, fuzzy, c-format
-msgid "Group %i"
-msgstr "Gruppi %i"
-
 #: widgets/misc/e-clipped-label.c:106
 #, fuzzy
 msgid "..."
 msgstr "Aggiungi..."
 
-#~ msgid "Contact Editor"
-#~ msgstr "Editor dei Contatti"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, fuzzy, c-format
+msgid "Group %i"
+msgstr "Gruppi %i"
 
-#~ msgid "_Full Name..."
-#~ msgstr "Nome e Cognome"
+#, fuzzy
+#~ msgid "_Close Calendar"
+#~ msgstr "Chiudi il _Calendario"
 
-#~ msgid "File As:"
-#~ msgstr "Memorizza come:"
+#~ msgid "Close current calendar"
+#~ msgstr "Chiudi calendario corrente"
 
-#~ msgid "Wants to receive _HTML mail"
-#~ msgstr "Vuole ricevere messaggi in _HTML"
+#~ msgid "Disabled"
+#~ msgstr "Disabilitato"
 
-#~ msgid "Address:"
-#~ msgstr "Indirizzo"
+#~ msgid "Synchronize"
+#~ msgstr "Sincronizza"
 
-#~ msgid "B_usiness"
-#~ msgstr "_Ufficio"
+#~ msgid "Copy From Pilot"
+#~ msgstr "Copia dal Pilot"
 
-#~ msgid "_This is the mailing address"
-#~ msgstr "Indirizzo a cui _spedire"
+#~ msgid "Copy To Pilot"
+#~ msgstr "Copia sul Pilot"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "C_ontatti"
+#~ msgid "Merge To Pilot"
+#~ msgstr "Unisci dal Pilot"
 
-#~ msgid "Ca_tegories..."
-#~ msgstr "Ca_tegorie"
+#~ msgid "Configuration utility for the calendar conduit.\n"
+#~ msgstr "Utilitŕ di configurazione per il calendario.\n"
 
-#~ msgid "General"
-#~ msgstr "Generale"
+#~ msgid "Synchronize Action"
+#~ msgstr "Sincronizzazione"
 
-#~ msgid "_Department:"
-#~ msgstr "_Dipartimento"
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Nessun pilot configurato, scegliere  prima\n"
+#~ "le 'Proprietŕ di collegamento del Pilot'.  "
 
-#~ msgid "_Office:"
-#~ msgstr "_Ufficio"
+#, fuzzy
+#~ msgid "Cannot initialze the GnomePilot Daemon"
+#~ msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
-#~ msgid "_Profession:"
-#~ msgstr "_Professione"
+#~ msgid "Cannot connect to the GnomePilot Daemon"
+#~ msgstr "Impossibile conettersi al demone GnomePIlot"
 
-#~ msgid "_Nickname:"
-#~ msgstr "_Nickname"
+#~ msgid "Error while communicating with calendar server"
+#~ msgstr "Errore durante la comunicazione con il server del calendario"
 
-#~ msgid "_Spouse:"
-#~ msgstr "Coniuge"
+#~ msgid "Calendar holds %d entries"
+#~ msgstr "Il calendario contiene %d dati inseriti"
 
-#~ msgid "_Birthday:"
-#~ msgstr "Co_mpleanno"
+#~ msgid "Could not start gnomecal server"
+#~ msgstr "Impossibile avviare il server gnomecal"
 
-#~ msgid "_Manager's Name:"
-#~ msgstr "Nome del _Manager"
+#~ msgid "Could not read pilot's DateBook application block"
+#~ msgstr "Impossibile leggere il blocco Datebook del Pilot"
 
-#~ msgid "Anni_versary:"
-#~ msgstr "Anni_versario"
+#~ msgid "Specifies the port on which the Pilot is"
+#~ msgstr "Specifica la porta alla quale č collegato il Pilot"
 
-#~ msgid "No_tes:"
-#~ msgstr "No_te"
+#~ msgid "If you want to debug the attributes on records"
+#~ msgstr "Se si voglioni debuggare gli attibuti sui record"
 
-#~ msgid "_Add"
-#~ msgstr "_Aggiungi"
+#~ msgid "Only syncs from desktop to pilot"
+#~ msgstr "Sincronizza solamente dal desktop al Pilot"
 
-#~ msgid "Phone Types"
-#~ msgstr "Tipi di Telefono"
+#~ msgid "Only syncs from pilot to desktop"
+#~ msgstr "Sincronizza solamente dal Pilot al desktop"
 
-#~ msgid "New phone type"
-#~ msgstr "Nuovo tipo di telefono"
+#~ msgid "Can not bind to device %s\n"
+#~ msgstr "Impossibile collegare il dispositivo %s\n"
 
-#~ msgid "Check Full Name"
-#~ msgstr "Verifiare Nome e Cognome"
+#~ msgid "Failed to get a connection from the Pilot device"
+#~ msgstr "Connessione al dispositivo Pilot non riuscita"
 
-#~ msgid "_Title:"
-#~ msgstr "_Titolo"
+#~ msgid "\tObject did not exist, creating a new one\n"
+#~ msgstr "\\tOggetto non esistente, creazione di uno nuovo\n"
 
 #~ msgid ""
-#~ "\n"
-#~ "Mr.\n"
-#~ "Mrs.\n"
-#~ "Dr.\n"
+#~ "\tObject has been modified on desktop and on the pilot, desktop takes "
+#~ "precedence\n"
 #~ msgstr ""
-#~ "\n"
-#~ "Sig.\n"
-#~ "Sig.ra\n"
-#~ "Dott.\n"
+#~ "\\tOggetto č stato modificato sul desktop e sul Pilot, il descktop ha la "
+#~ "precedenza\n"
 
-#~ msgid "Port Number:"
-#~ msgstr "Numero Port"
+#~ msgid "Syncing with the pilot..."
+#~ msgstr "Sincronizzazione con il Pilot..."
 
-#~ msgid "Style name:"
-#~ msgstr "Nome dello stile"
+#~ msgid "Could not open DatebookDB on the Pilot"
+#~ msgstr "Impossibile aprire DateBookDB sul Pilot"
 
-#~ msgid "Include:"
-#~ msgstr "Allega"
+#~ msgid "Unable to open DatebookDB"
+#~ msgstr "Impossibile aprire DateBookDB"
 
-#~ msgid "Immediately follow each other"
-#~ msgstr "Concatenati l'un l'altro"
+#~ msgid "Synced DateBook from Pilot to GnomeCal"
+#~ msgstr "DateBook del Pilot sincronizzato con GnomeCal"
 
-#~ msgid "Headings for each letter"
-#~ msgstr "Titolo per ogni lettera"
+#~ msgid "Configuration utility for the todo conduit.\n"
+#~ msgstr "Utilitŕ di confugurazione per FIXME\n"
 
-#~ msgid "Start on a new page"
-#~ msgstr "Inizia su una nuova pagina"
+#~ msgid "Enabled"
+#~ msgstr "Abilitato"
 
-#~ msgid "Number of columns:"
-#~ msgstr "Numero di colonne:"
+#~ msgid "Cut selected region into the clipboard"
+#~ msgstr "Taglia la regione selezionata nella clipboard "
 
-#~ msgid "Blank forms at end:"
-#~ msgstr "Moduli bianchi alla fine"
+#~ msgid "Copy selected region into the clipboard"
+#~ msgstr "Copia la regione selezionata nella clipboard"
 
-#~ msgid "Shading"
-#~ msgstr "Ombreggiatura"
+#~ msgid "Paste selected region into the clipboard"
+#~ msgstr "Incolla la regione selezionata nella clipboar"
 
-#~ msgid "Print using gray shading"
-#~ msgstr "Stampa usando ombreggiatura grigia"
+#~ msgid "Undo"
+#~ msgstr "Annulla"
 
-#~ msgid "Paper"
-#~ msgstr "Carta"
+#~ msgid "Undo last operation"
+#~ msgstr "Annulla ultima operazione"
 
-#~ msgid "Type:"
-#~ msgstr "Tipo"
+#~ msgid "Find messages"
+#~ msgstr "Trova messaggio"
 
-#~ msgid "label26"
-#~ msgstr "etichetta"
+#~ msgid "Test these values before continuing"
+#~ msgstr "Provare questi valori prima di continuare"
 
-#~ msgid "Dimensions:"
-#~ msgstr "Dimensioni:"
+#~ msgid "Select the method you would like to use to deliver your mail."
+#~ msgstr ""
+#~ "Selezionare il metodo che si desidera utilizzare per inviare la posta."
 
-#~ msgid "Width:"
-#~ msgstr "Larghezza:"
+#, fuzzy
+#~ msgid "Mail Configuration"
+#~ msgstr "_Configurazione della Posta"
 
-#~ msgid "Height:"
-#~ msgstr "Altezza:"
+#~ msgid "Identity"
+#~ msgstr "Identitŕ"
 
-#~ msgid "Top:"
-#~ msgstr "Superiore:"
+#~ msgid "Mail Source"
+#~ msgstr "Sorgente della Posta"
 
-#~ msgid "Bottom:"
-#~ msgstr "Inferiore:"
+#~ msgid "Mail Transport"
+#~ msgstr "Trasporto della Posta"
 
-#~ msgid "Left:"
-#~ msgstr "Sinistra:"
+#~ msgid "Signature file"
+#~ msgstr "File firma"
 
-#~ msgid "Right:"
-#~ msgstr "Destra:"
+#, fuzzy
+#~ msgid "Camel Providers Configuration"
+#~ msgstr "Configurazione del Provider Camel"
 
-#~ msgid "Size:"
-#~ msgstr "Dimensione:"
+#~ msgid "Identities"
+#~ msgstr "Identitŕ"
 
-#~ msgid "Recipient list:"
-#~ msgstr "Elenco dei destinatari:"
+#~ msgid "Sources"
+#~ msgstr "Sorgenti"
 
-#~ msgid "Name:"
-#~ msgstr "Nome:"
+#~ msgid "Transports"
+#~ msgstr "Trasporti"
 
-#~ msgid "Search..."
-#~ msgstr "Cerca..."
+#~ msgid "Mail Component: I could not initialize Bonobo"
+#~ msgstr "Componente della Posta: impossibile inizializzare Bonobo"
 
-#~ msgid "Properties..."
-#~ msgstr "Proprietŕ..."
+#, fuzzy
+#~ msgid "Cannot open location: %s"
+#~ msgstr "Impossibile impostare location: %s"
 
-#~ msgid "To: >>"
-#~ msgstr "A: >>"
+#~ msgid "New group"
+#~ msgstr "Nuovo gruppo"
 
-#~ msgid "Browse..."
-#~ msgstr "Sfoglia..."
+#~ msgid "Composes a new mail message"
+#~ msgstr "Componei un nuovo messaggio"
 
-#~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
-#~ msgstr ""
-#~ "Spiacenti, il Browser delle cartelle di Evolution non puň essere "
-#~ "inizializzato"
+#~ msgid "Meeting Re_quest"
+#~ msgstr "_Richieste di appuntamenti"
 
-#~ msgid "Whether a message preview should be shown"
-#~ msgstr "Se un'anteprima del mesaggio dovrebbe essere mostrata"
+#~ msgid "_Task"
+#~ msgstr "_Obiettivi"
 
-#~ msgid "Fields"
-#~ msgstr "Campi"
+#~ msgid "Task _Request"
+#~ msgstr "_Richiesta Obiettivi"
 
-#~ msgid "Sort"
-#~ msgstr "Ordina"
+#~ msgid "_Journal Entry"
+#~ msgstr "_Ingressi giornalieri"
 
-#~ msgid "Filter"
-#~ msgstr "Filtra"
+#~ msgid "_Note"
+#~ msgstr "_Appunti"
 
-#~ msgid "Available fields"
-#~ msgstr "Campi disponibili"
+#~ msgid "_Selected Items"
+#~ msgstr "_Oggetti selezionati"
 
-#~ msgid "Show in this order"
-#~ msgstr "Mostra in questo ordine"
+#~ msgid "Clos_e All Items"
+#~ msgstr "Chiudi _Tutti"
 
-#~ msgid "Add >>"
-#~ msgstr "Aggiungi >>"
+#~ msgid "Closes all the open items"
+#~ msgstr "Chiude tutti gli oggetti aperti"
 
-#~ msgid "<< Remove"
-#~ msgstr "<< Rimuovi"
+#~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
+#~ msgstr ""
+#~ "Spiacenti, il Browser delle cartelle di Evolution non puň essere "
+#~ "inizializzato"
+
+#~ msgid "Whether a message preview should be shown"
+#~ msgstr "Se un'anteprima del mesaggio dovrebbe essere mostrata"
diff --git a/po/sl.po b/po/sl.po
index 4b97413cc3..36356dca60 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2000-06-04 15:25+0200\n"
+"POT-Creation-Date: 2000-08-02 16:38+0200\n"
 "PO-Revision-Date: 2000-05-13 20:56+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,148 +13,647 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8599-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/load-pine-addressbook.c:41
+#: addressbook/gui/component/addressbook-factory.c:59 calendar/gui/main.c:68
+#, fuzzy
+msgid "Could not initialize Bonobo"
+msgstr "Komponenta Pošta: Ne morem initializirati Bonoba"
+
+#.
+#. * 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/categories-strings.h:7
+#, fuzzy
+msgid "categories"
+msgstr "Ka_tegorije..."
+
+#: addressbook/contact-editor/categories-strings.h:8
+msgid "Item(s) belong to these categories:"
+msgstr ""
+
+#: addressbook/contact-editor/categories-strings.h:9
+#, fuzzy
+msgid "Available Categories:"
+msgstr "Polja na voljo"
+
+#: addressbook/contact-editor/e-contact-editor.c:643
+#: calendar/gui/event-editor.c:1168
+#, fuzzy
+msgid "FIXME: _Appointment"
+msgstr "_Zmenek"
+
+#: addressbook/contact-editor/e-contact-editor.c:644
+#: calendar/gui/event-editor.c:1169
+#, fuzzy
+msgid "FIXME: Meeting Re_quest"
+msgstr "Za_hteva po sestanku"
+
+#: addressbook/contact-editor/e-contact-editor.c:646
+#: calendar/gui/event-editor.c:1171
+#, fuzzy
+msgid "FIXME: _Mail Message"
+msgstr "_Pošlji sporočilo"
+
+#: addressbook/contact-editor/e-contact-editor.c:647
+#: calendar/gui/event-editor.c:1172
+#, fuzzy
+msgid "FIXME: _Contact"
+msgstr "_Stik"
+
+#: addressbook/contact-editor/e-contact-editor.c:648
+#: calendar/gui/event-editor.c:1173
+msgid "FIXME: _Task"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:649
+#: calendar/gui/event-editor.c:1174
+#, fuzzy
+msgid "FIXME: Task _Request"
+msgstr "Zahteva po _Nalogi"
+
+#: addressbook/contact-editor/e-contact-editor.c:650
+#: calendar/gui/event-editor.c:1175
+#, fuzzy
+msgid "FIXME: _Journal Entry"
+msgstr "_Vpis v dnevnik"
+
+#: addressbook/contact-editor/e-contact-editor.c:651
+#: calendar/gui/event-editor.c:1176
+msgid "FIXME: _Note"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:653
+#: addressbook/contact-editor/e-contact-editor.c:758
+#: calendar/gui/event-editor.c:1178 calendar/gui/event-editor.c:1285
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:658
+#: calendar/gui/event-editor.c:1183
+msgid "FIXME: _Memo Style"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:660
+#: calendar/gui/event-editor.c:1185
+msgid "FIXME: Define Print _Styles..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:667
+#: calendar/gui/event-editor.c:1192
+msgid "FIXME: S_end"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:671
+#: calendar/gui/event-editor.c:1196
+#, fuzzy
+msgid "FIXME: Save Attac_hments..."
+msgstr "Dodaj prilogo..."
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: addressbook/contact-editor/e-contact-editor.c:673
+msgid "_Delete"
+msgstr "_Izbriši"
+
+#: addressbook/contact-editor/e-contact-editor.c:674
+#: calendar/gui/event-editor.c:1199
+msgid "FIXME: _Move to Folder..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:675
+#: calendar/gui/event-editor.c:1200
+msgid "FIXME: Cop_y to Folder..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:677
+#: calendar/gui/event-editor.c:1202
+#, fuzzy
+msgid "Page Set_up"
+msgstr "Nastavitev Strani:"
+
+#: addressbook/contact-editor/e-contact-editor.c:678
+#: calendar/gui/event-editor.c:1203
+msgid "FIXME: Print Pre_view"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:699
+#: calendar/gui/event-editor.c:1224
+msgid "FIXME: Paste _Special..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:704
+#: calendar/gui/event-editor.c:1229
+msgid "FIXME: Mark as U_nread"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:708
+#: calendar/gui/event-editor.c:1233
+#, fuzzy
+msgid "_Object"
+msgstr "Zadeva"
+
+#: addressbook/contact-editor/e-contact-editor.c:713
+#: addressbook/contact-editor/e-contact-editor.c:720
+#: calendar/gui/event-editor.c:1238 calendar/gui/event-editor.c:1245
+msgid "FIXME: _Item"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:714
+#: addressbook/contact-editor/e-contact-editor.c:721
+#: calendar/gui/event-editor.c:1239 calendar/gui/event-editor.c:1246
+msgid "FIXME: _Unread Item"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:715
+#: calendar/gui/event-editor.c:1240
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:722
+#: calendar/gui/event-editor.c:1247
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:727
+#: calendar/gui/event-editor.c:1252
+msgid "FIXME: _Standard"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:729
+#: calendar/gui/event-editor.c:1254
+msgid "FIXME: __Formatting"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:732
+#: calendar/gui/event-editor.c:1257
+msgid "FIXME: _Customize..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:737
+#: calendar/gui/event-editor.c:1262
+msgid "Pre_vious"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:738
+#: calendar/gui/event-editor.c:1263
+msgid "Ne_xt"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:740
+#: calendar/gui/event-editor.c:1267
+#, fuzzy
+msgid "_Toolbars"
+msgstr "_Orodja"
+
+#: addressbook/contact-editor/e-contact-editor.c:745
+#: calendar/gui/event-editor.c:1272
+msgid "FIXME: _File..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:746
+#: calendar/gui/event-editor.c:1273
+msgid "FIXME: It_em..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:747
+#: calendar/gui/event-editor.c:1274
+msgid "FIXME: _Object..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:752
+#: calendar/gui/event-editor.c:1279
+#, fuzzy
+msgid "FIXME: _Font..."
+msgstr "Pisava..."
+
+#: addressbook/contact-editor/e-contact-editor.c:753
+#: calendar/gui/event-editor.c:1280
+msgid "FIXME: _Paragraph..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:760
+#: calendar/gui/event-editor.c:1287
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:761
+#: calendar/gui/event-editor.c:1288
+msgid "FIXME: D_esign a Form..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:763
+#: calendar/gui/event-editor.c:1290
+msgid "FIXME: Publish _Form..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:764
+#: calendar/gui/event-editor.c:1291
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:766
+#: calendar/gui/event-editor.c:1293
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:771
+#: calendar/gui/event-editor.c:1298
+msgid "FIXME: _Spelling..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:773
+#: calendar/gui/event-editor.c:1303
+#, fuzzy
+msgid "_Forms"
+msgstr "Način Izpisa"
+
+#: addressbook/contact-editor/e-contact-editor.c:778
+msgid "FIXME: _New Contact"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:779
+msgid "FIXME: New _Contact from Same Company"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:781
+msgid "FIXME: New _Letter to Contact"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:782
+msgid "FIXME: New _Message to Contact"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:783
+msgid "FIXME: New Meetin_g with Contact"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:784
+msgid "FIXME: _Plan a Meeting..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:785
+msgid "FIXME: New _Task for Contact"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:786
+msgid "FIXME: New _Journal Entry for Contact"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:788
+msgid "FIXME: _Flag for Follow Up..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:789
+msgid "FIXME: _Display Map of Address"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:790
+msgid "FIXME: _Open Web Page"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:792
+msgid "FIXME: Forward as _vCard"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:793
+#: calendar/gui/event-editor.c:1316
+#, fuzzy
+msgid "FIXME: For_ward"
+msgstr "Posreduj naprej"
+
+#: addressbook/contact-editor/e-contact-editor.c:805
+#: calendar/gui/event-editor.c:1329
+msgid "_Insert"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:806
+#: calendar/gui/event-editor.c:1330
+#, fuzzy
+msgid "F_ormat"
+msgstr "Način Izpisa"
+
+#: addressbook/contact-editor/e-contact-editor.c:807
+#: calendar/gui/event-editor.c:1331 shell/e-shell-view-menu.c:515
+msgid "_Tools"
+msgstr "_Orodja"
+
+#: addressbook/contact-editor/e-contact-editor.c:808
+#: calendar/gui/event-editor.c:1332
+#, fuzzy
+msgid "Actio_ns"
+msgstr "_Dejanja"
+
+#: addressbook/contact-editor/e-contact-editor.c:839
+msgid "Save and Close"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:840
+#: calendar/gui/event-editor.c:1371
+msgid "Save the appointment and close the dialog box"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:844
+#: calendar/gui/calendar-commands.c:673
+#, fuzzy
+msgid "Print..."
+msgstr "Natisni"
+
+#: addressbook/contact-editor/e-contact-editor.c:845
+#: calendar/gui/event-editor.c:1376
+msgid "Print this item"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:848
+#: calendar/gui/event-editor.c:1377
+msgid "FIXME: Insert File..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:849
+#: calendar/gui/event-editor.c:1378
+msgid "Insert a file as an attachment"
+msgstr ""
+
+#. Delete
+#: addressbook/contact-editor/e-contact-editor.c:852
+#: addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:508
+#: mail/folder-browser-factory.c:39
+msgid "Delete"
+msgstr "Izbriši"
+
+#: addressbook/contact-editor/e-contact-editor.c:853
+#: calendar/gui/event-editor.c:1387 calendar/gui/gncal-todo.c:336
+#, fuzzy
+msgid "Delete this item"
+msgstr "Zbriši to sporčilo"
+
+#: addressbook/contact-editor/e-contact-editor.c:856
+#: calendar/gui/event-editor.c:1389
+msgid "FIXME: Previous"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:857
+#: calendar/gui/event-editor.c:1390
+msgid "Go to the previous item"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:859
+#: calendar/gui/event-editor.c:1391
+msgid "FIXME: Next"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:860
+#: calendar/gui/event-editor.c:1392
+msgid "Go to the next item"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:862
+#: calendar/gui/event-editor.c:1393
+msgid "FIXME: Help"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:863
+#: calendar/gui/event-editor.c:1394
+msgid "See online help"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#, fuzzy
+msgid "Assistant"
+msgstr "_Ime pomočnika:"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1383
+#, fuzzy
+msgid "Business"
+msgstr "_V službi"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+#, fuzzy
+msgid "Business 2"
+msgstr "_V službi"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+#, fuzzy
+msgid "Business Fax"
+msgstr "Poslovni _faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Callback"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Car"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+#, fuzzy
+msgid "Company"
+msgstr "_Podjetje:"
+
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/contact-editor/e-contact-editor.c:1384
+#, fuzzy
+msgid "Home"
+msgstr "_Doma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#, fuzzy
+msgid "Home 2"
+msgstr "_Doma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1287
+#, fuzzy
+msgid "Home Fax"
+msgstr "_Doma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1288
+msgid "ISDN"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1289
+#, fuzzy
+msgid "Mobile"
+msgstr "_Mobilni telefon"
+
+#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1385
+msgid "Other"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1291
+msgid "Other Fax"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1292
+#, fuzzy
+msgid "Pager"
+msgstr "Stran"
+
+#: addressbook/contact-editor/e-contact-editor.c:1293
+#, fuzzy
+msgid "Primary"
+msgstr "Glavna eposta"
+
+#: addressbook/contact-editor/e-contact-editor.c:1294
+msgid "Radio"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1295
+msgid "Telex"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1296
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
+#: addressbook/contact-editor/e-contact-editor.c:1340
+msgid "Primary Email"
+msgstr "Glavna eposta"
+
+#: addressbook/contact-editor/e-contact-editor.c:1341
+msgid "Email 2"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1342
+msgid "Email 3"
+msgstr ""
+
 #.
 #. * 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-strings.h:7
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:9
+msgid "Phone Types"
+msgstr "Tipi telefona"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:10
+#: addressbook/contact-editor/e-contact-editor-strings.h:12
+msgid "New phone type"
+msgstr "Nov tip telefona"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:11
+msgid "Add"
+msgstr "Dodaj"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:13
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: addressbook/contact-editor/e-contact-editor-strings.h:14
 msgid "_Full Name..."
 msgstr "_Polno Ime..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
+#: addressbook/contact-editor/e-contact-editor-strings.h:15
 msgid "File As:"
 msgstr "Zavedemo Kot:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
+#: addressbook/contact-editor/e-contact-editor-strings.h:16
 msgid "Web page address:"
 msgstr "Naslov spletne strani:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
+#: addressbook/contact-editor/e-contact-editor-strings.h:17
 msgid "Wants to receive _HTML mail"
 msgstr "Želi dobivati _HTML epošto"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
+#: addressbook/contact-editor/e-contact-editor-strings.h:18
 msgid "Address:"
 msgstr "Naslov:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Business"
 msgstr "_V službi"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
 msgid "_Home"
 msgstr "_Doma"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
 msgid "Business _Fax"
 msgstr "Poslovni _faks"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
 msgid "_Mobile"
 msgstr "_Mobilni telefon"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Primary Email"
-msgstr "Glavna eposta"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
 msgid "B_usiness"
 msgstr "_Poslovna"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
 msgid "_This is the mailing address"
 msgstr "_To je poštni naslov"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
+#: addressbook/contact-editor/e-contact-editor-strings.h:26
 msgid "C_ontacts..."
 msgstr "_Stiki..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
 msgid "_Job title:"
 msgstr "Službeni _naziv:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
 msgid "_Company:"
 msgstr "_Podjetje:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
+#: addressbook/contact-editor/e-contact-editor-strings.h:30
 msgid "General"
 msgstr "Splošno"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#: addressbook/contact-editor/e-contact-editor-strings.h:31
 msgid "_Department:"
 msgstr "O_ddelek:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: addressbook/contact-editor/e-contact-editor-strings.h:32
 msgid "_Office:"
 msgstr "Pi_sarna:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
+#: addressbook/contact-editor/e-contact-editor-strings.h:33
 msgid "_Profession:"
 msgstr "_Poklic:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/e-contact-editor-strings.h:34
 msgid "_Nickname:"
 msgstr "_Vzdevek:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#: addressbook/contact-editor/e-contact-editor-strings.h:35
 msgid "_Spouse:"
 msgstr "_Partner:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
+#: addressbook/contact-editor/e-contact-editor-strings.h:36
 msgid "_Birthday:"
 msgstr "_Rojstni dan:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
+#: addressbook/contact-editor/e-contact-editor-strings.h:37
 msgid "_Assistant's name:"
 msgstr "_Ime pomočnika:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
+#: addressbook/contact-editor/e-contact-editor-strings.h:38
 msgid "_Manager's Name:"
 msgstr "Ime _upravnika:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
+#: addressbook/contact-editor/e-contact-editor-strings.h:39
 msgid "Anni_versary:"
 msgstr "Ob_letnica:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
+#: addressbook/contact-editor/e-contact-editor-strings.h:40
 msgid "No_tes:"
 msgstr "Opom_be:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
+#: addressbook/contact-editor/e-contact-editor-strings.h:41
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Delete"
-msgstr "_Izbriši"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "Phone Types"
-msgstr "Tipi telefona"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "New phone type"
-msgstr "Nov tip telefona"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "Add"
-msgstr "Dodaj"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -214,13 +713,214 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
+#: addressbook/gui/component/addressbook.c:420
+#: calendar/gui/calendar-commands.c:544
+#, fuzzy
+msgid "New"
+msgstr "_Nova"
+
+#: addressbook/gui/component/addressbook.c:420
+msgid "Create a new contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:424
+msgid "Find"
+msgstr "Poišči"
+
+#: addressbook/gui/component/addressbook.c:424
+msgid "Find a contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:492
+#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:37
+msgid "Print"
+msgstr "Natisni"
+
+#: addressbook/gui/component/addressbook.c:425
+msgid "Print contacts"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:426
+#, fuzzy
+msgid "Delete a contact"
+msgstr "Izberi prilogo"
+
+#: addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook.c:1034
+msgid "As _Table"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:506
+#, fuzzy
+msgid "_New Contact"
+msgstr "_Stik"
+
+#: addressbook/gui/component/addressbook.c:514
+msgid "N_ew Directory Server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:593
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Kliknite tu za adresar"
+
+#: addressbook/gui/component/addressbook.c:598
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or have tried\n"
+"to access an LDAP server and don't have LDAP support\n"
+"compiled in.  If you've entered a URI, check the URI for\n"
+"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"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:938
+#: addressbook/gui/minicard/e-minicard.c:330
+msgid "Save as VCard"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:1005
+msgid "* Click here to add a contact *"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:1041
+msgid "As _Minicards"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:1092
+msgid "The URI that the Folder Browser will display"
+msgstr "URI, ki naj ga prikaže Brskalnik po Mapah"
+
+#.
+#. * 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/alphabet.glade.h:7
+#, fuzzy
+msgid "window2"
+msgstr "okno1"
+
+#: addressbook/gui/component/alphabet.glade.h:8
+msgid "123"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:9
+msgid "a"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:10
+msgid "b"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:11
+msgid "c"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:12
+msgid "d"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:13
+msgid "e"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:14
+msgid "f"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:15
+msgid "g"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:16
+#: calendar/cal-util/timeutil.c:131
+msgid "h"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:17
+msgid "i"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:18
+msgid "j"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:19
+msgid "k"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:20
+msgid "l"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:21
+msgid "m"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:22
+msgid "n"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:23
+#, fuzzy
+msgid "o"
+msgstr "Za"
+
+#: addressbook/gui/component/alphabet.glade.h:24
+msgid "p"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:25
+msgid "q"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:26
+msgid "r"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:27
+msgid "s"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:28
+msgid "t"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:29
+msgid "u"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:30
+msgid "v"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:31
+msgid "w"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:32
+msgid "x"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:33
+msgid "y"
+msgstr ""
+
+#: addressbook/gui/component/alphabet.glade.h:34
+msgid "z"
+msgstr ""
+
 #.
 #. * 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:8
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "Description:"
 msgstr "Opis:"
 
@@ -236,6 +936,20 @@ msgstr "Številka vrat:"
 msgid "Root DN:"
 msgstr "Korenski DN:"
 
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: composer/e-msg-composer-address-dialog.glade.h:8
+msgid "Name:"
+msgstr "Ime:"
+
+#: addressbook/gui/minicard/e-minicard-view.c:110
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -417,7 +1131,1117 @@ msgstr "Obratno na sodih straneh"
 msgid "Header/Footer"
 msgstr "Glava/noge"
 
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:635
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:544
+#, fuzzy
+msgid "am"
+msgstr "Ime"
+
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:543
+msgid "pm"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:56
+msgid "Outline:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:57
+#, fuzzy
+msgid "Headings:"
+msgstr "Glave"
+
+#: calendar/gui/calendar-commands.c:58
+msgid "Empty days:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:59
+#, fuzzy
+msgid "Appointments:"
+msgstr "_Zmenek"
+
+#: calendar/gui/calendar-commands.c:60
+msgid "Highlighted day:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:61
+msgid "Day numbers:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:62
+msgid "Current day's number:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:63
+msgid "To-Do item that is not yet due:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:64
+msgid "To-Do item that is due today:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:65
+msgid "To-Do item that is overdue:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:175
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Uporaba _Koledarja"
+
+#: calendar/gui/calendar-commands.c:178
+msgid "The GNOME personal calendar and schedule manager."
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:434
+msgid "File not found"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:456
+msgid "Open calendar"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:495
+msgid "Save calendar"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:722
+#: calendar/gui/gncal-todo.c:726
+msgid "Day"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:522
+msgid "Show 1 day"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:525
+msgid "5 Days"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:525
+#, fuzzy
+msgid "Show the working week"
+msgstr "Pokaže vrstico z mapami"
+
+#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:721
+msgid "Week"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:528
+msgid "Show 1 week"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:531
+#, fuzzy
+msgid "Month"
+msgstr "Pisave"
+
+#: calendar/gui/calendar-commands.c:531
+msgid "Show 1 month"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:535
+#, fuzzy
+msgid "Year"
+msgstr "Glava"
+
+#: calendar/gui/calendar-commands.c:535
+#, fuzzy
+msgid "Show 1 year"
+msgstr "Pokaže vrstico z mapami"
+
+#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+msgid "Create a new appointment"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
+#, fuzzy
+msgid "Print this calendar"
+msgstr "Uporaba _Koledarja"
+
+#: calendar/gui/calendar-commands.c:552
+#, fuzzy
+msgid "Prev"
+msgstr "Predogled:"
+
+#: calendar/gui/calendar-commands.c:552
+msgid "Go back in time"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:553
+#, fuzzy
+msgid "Today"
+msgstr "Telo"
+
+#: calendar/gui/calendar-commands.c:553
+msgid "Go to present time"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:554
+msgid "Next"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:554
+msgid "Go forward in time"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:558
+msgid "Go to"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:558
+msgid "Go to a specific date"
+msgstr ""
+
+#. file menu
+#: calendar/gui/calendar-commands.c:659
+#, fuzzy
+msgid "New Ca_lendar"
+msgstr "Uporaba _Koledarja"
+
+#: calendar/gui/calendar-commands.c:660
+msgid "Create a new calendar"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:663
+#, fuzzy
+msgid "Open Ca_lendar"
+msgstr "Uporaba _Koledarja"
+
+#: calendar/gui/calendar-commands.c:664
+msgid "Open a calendar"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
+msgid "Save Calendar As"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:682
+#, fuzzy
+msgid "_New appointment..."
+msgstr "_Zmenek"
+
+#: calendar/gui/calendar-commands.c:687
+msgid "New appointment for _today..."
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:688
+msgid "Create a new appointment for today"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
+msgid "Preferences"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704
+#, fuzzy
+msgid "About Calendar"
+msgstr "Uporaba _Koledarja"
+
+#. i18n: This "%s%s" indicates possession. Languages where the order is
+#. * the inverse should translate it to "%2$s%1$s".
+#.
+#: calendar/gui/calendar-commands.c:746
+#, c-format
+msgid "%s%s"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:746
+#, fuzzy
+msgid "'s calendar"
+msgstr "Uporaba _Koledarja"
+
+#: calendar/gui/control-factory.c:136
+#, fuzzy
+msgid "The URI that the calendar will display"
+msgstr "URI, ki naj ga prikaže Brskalnik po Mapah"
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:181
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:188
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+msgstr ""
+
+#.
+#. * 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
+msgid "Close"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1070
+#, fuzzy
+msgid "Snooze"
+msgstr "Velikost"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#, fuzzy
+msgid "Edit appointment"
+msgstr "_Zmenek"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:10
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/e-day-view-time-item.c:391
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324
+#: calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643
+#: calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659
+#, fuzzy
+msgid "New appointment..."
+msgstr "_Zmenek"
+
+#: calendar/gui/e-day-view.c:2321 calendar/gui/e-day-view.c:2328
+#: calendar/gui/e-week-view.c:2647 calendar/gui/e-week-view.c:2654
+msgid "Edit this appointment..."
+msgstr ""
+
+#: calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+#, fuzzy
+msgid "Delete this appointment"
+msgstr "Zbriši to sporčilo"
+
+#: calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
+msgid "Make this appointment movable"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
+#, fuzzy
+msgid "Delete this occurrence"
+msgstr "Zbriši to sporčilo"
+
+#: calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
+msgid "Delete all occurrences"
+msgstr ""
+
+#: calendar/gui/event-editor.c:291
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "_Zmenek"
+
+#: calendar/gui/event-editor.c:296
+msgid "No summary"
+msgstr ""
+
+#: calendar/gui/event-editor.c:300
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "_Zmenek"
+
+#: calendar/gui/event-editor.c:303
+#, c-format
+msgid "Task - %s"
+msgstr ""
+
+#: calendar/gui/event-editor.c:306
+#, fuzzy, c-format
+msgid "Journal entry - %s"
+msgstr "_Vpis v dnevnik"
+
+#. Owner, summary
+#: calendar/gui/event-editor.c:622 calendar/gui/event-editor.c:718
+msgid "?"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1198
+#, fuzzy
+msgid "FIXME: _Delete"
+msgstr "_Izbriši"
+
+#: calendar/gui/event-editor.c:1265
+msgid "FIXME: Ca_lendar..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1300
+msgid "FIXME: Chec_k Names"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1301
+msgid "FIXME: Address _Book..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1308
+#, fuzzy
+msgid "FIXME: _New Appointment"
+msgstr "_Zmenek"
+
+#: calendar/gui/event-editor.c:1310
+msgid "FIXME: Rec_urrence..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1312
+msgid "FIXME: Invite _Attendees..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1313
+msgid "FIXME: C_ancel Invitation..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1315
+msgid "FIXME: Forward as v_Calendar"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1370
+msgid "FIXME: Save and Close"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1375
+msgid "FIXME: Print..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1380
+msgid "FIXME: Recurrence..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1381
+msgid "Configure recurrence rules"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1383
+msgid "FIXME: Invite Attendees..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1384
+msgid "Invite attendees to a meeting"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1386
+#, fuzzy
+msgid "FIXME: Delete"
+msgstr "Izbriši"
+
+#: calendar/gui/event-editor.c:1828
+msgid "%a %b %d %Y"
+msgstr ""
+
+#: calendar/gui/getdate.y:391
+msgid "january"
+msgstr ""
+
+#: calendar/gui/getdate.y:392
+msgid "february"
+msgstr ""
+
+#: calendar/gui/getdate.y:393
+msgid "march"
+msgstr ""
+
+#: calendar/gui/getdate.y:394
+#, fuzzy
+msgid "april"
+msgstr "Papir"
+
+#: calendar/gui/getdate.y:395
+msgid "may"
+msgstr ""
+
+#: calendar/gui/getdate.y:396
+msgid "june"
+msgstr ""
+
+#: calendar/gui/getdate.y:397
+msgid "july"
+msgstr ""
+
+#: calendar/gui/getdate.y:398
+msgid "august"
+msgstr ""
+
+#: calendar/gui/getdate.y:399
+msgid "september"
+msgstr ""
+
+#: calendar/gui/getdate.y:400
+msgid "sept"
+msgstr ""
+
+#: calendar/gui/getdate.y:401
+msgid "october"
+msgstr ""
+
+#: calendar/gui/getdate.y:402
+msgid "november"
+msgstr ""
+
+#: calendar/gui/getdate.y:403
+msgid "december"
+msgstr ""
+
+#: calendar/gui/getdate.y:404
+msgid "sunday"
+msgstr ""
+
+#: calendar/gui/getdate.y:405
+#, fuzzy
+msgid "monday"
+msgstr "Telo"
+
+#: calendar/gui/getdate.y:406
+msgid "tuesday"
+msgstr ""
+
+#: calendar/gui/getdate.y:407
+msgid "tues"
+msgstr ""
+
+#: calendar/gui/getdate.y:408
+msgid "wednesday"
+msgstr ""
+
+#: calendar/gui/getdate.y:409
+msgid "wednes"
+msgstr ""
+
+#: calendar/gui/getdate.y:410
+msgid "thursday"
+msgstr ""
+
+#: calendar/gui/getdate.y:411
+msgid "thur"
+msgstr ""
+
+#: calendar/gui/getdate.y:412
+msgid "thurs"
+msgstr ""
+
+#: calendar/gui/getdate.y:413
+msgid "friday"
+msgstr ""
+
+#: calendar/gui/getdate.y:414
+msgid "saturday"
+msgstr ""
+
+#: calendar/gui/getdate.y:420
+#, fuzzy
+msgid "year"
+msgstr "Glava"
+
+#: calendar/gui/getdate.y:421
+#, fuzzy
+msgid "month"
+msgstr "Pisave"
+
+#: calendar/gui/getdate.y:422
+msgid "fortnight"
+msgstr ""
+
+#: calendar/gui/getdate.y:423
+msgid "week"
+msgstr ""
+
+#: calendar/gui/getdate.y:424
+msgid "day"
+msgstr ""
+
+#: calendar/gui/getdate.y:425
+msgid "hour"
+msgstr ""
+
+#: calendar/gui/getdate.y:426
+msgid "minute"
+msgstr ""
+
+#: calendar/gui/getdate.y:427
+msgid "min"
+msgstr ""
+
+#: calendar/gui/getdate.y:428
+#, fuzzy
+msgid "second"
+msgstr "Pošlji"
+
+#: calendar/gui/getdate.y:429
+msgid "sec"
+msgstr ""
+
+#: calendar/gui/getdate.y:435
+msgid "tomorrow"
+msgstr ""
+
+#: calendar/gui/getdate.y:436
+msgid "yesterday"
+msgstr ""
+
+#: calendar/gui/getdate.y:437
+#, fuzzy
+msgid "today"
+msgstr "Telo"
+
+#: calendar/gui/getdate.y:438
+#, fuzzy
+msgid "now"
+msgstr "okno1"
+
+#: calendar/gui/getdate.y:439
+#, fuzzy
+msgid "last"
+msgstr "Prilepi"
+
+#: calendar/gui/getdate.y:440
+msgid "this"
+msgstr ""
+
+#: calendar/gui/getdate.y:441
+msgid "next"
+msgstr ""
+
+#: calendar/gui/getdate.y:442
+#, fuzzy
+msgid "first"
+msgstr "_Ime:"
+
+#. { N_("second"),		tUNUMBER,	2 },
+#: calendar/gui/getdate.y:444
+msgid "third"
+msgstr ""
+
+#: calendar/gui/getdate.y:445
+#, fuzzy
+msgid "fourth"
+msgstr "Uredi"
+
+#: calendar/gui/getdate.y:446
+msgid "fifth"
+msgstr ""
+
+#: calendar/gui/getdate.y:447
+msgid "sixth"
+msgstr ""
+
+#: calendar/gui/getdate.y:448
+msgid "seventh"
+msgstr ""
+
+#: calendar/gui/getdate.y:449
+#, fuzzy
+msgid "eighth"
+msgstr "Višina:"
+
+#: calendar/gui/getdate.y:450
+#, fuzzy
+msgid "ninth"
+msgstr "Natisni"
+
+#: calendar/gui/getdate.y:451
+#, fuzzy
+msgid "tenth"
+msgstr "Poslano"
+
+#: calendar/gui/getdate.y:452
+msgid "eleventh"
+msgstr ""
+
+#: calendar/gui/getdate.y:453
+msgid "twelfth"
+msgstr ""
+
+#: calendar/gui/getdate.y:454
+msgid "ago"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:140
+msgid "Create to-do item"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:140
+msgid "Edit to-do item"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:176
+msgid "Summary:"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:186
+#, fuzzy
+msgid "Due Date:"
+msgstr "Datum"
+
+#: calendar/gui/gncal-todo.c:195
+#, fuzzy
+msgid "Priority:"
+msgstr "Prioriteta"
+
+#: calendar/gui/gncal-todo.c:212
+msgid "Item Comments:"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:334
+msgid "Add to-do item..."
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:335
+msgid "Edit this item..."
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:434
+msgid "Summary"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:435 calendar/gui/prop.c:604
+#, fuzzy
+msgid "Due Date"
+msgstr "Datum"
+
+#: calendar/gui/gncal-todo.c:436 calendar/gui/prop.c:605
+#: mail/message-list.c:474
+msgid "Priority"
+msgstr "Prioriteta"
+
+#: calendar/gui/gncal-todo.c:437
+msgid "Time Left"
+msgstr ""
+
+#. Label
+#: calendar/gui/gncal-todo.c:449
+#, fuzzy
+msgid "To-do list"
+msgstr "_Orodja"
+
+#. Add
+#: calendar/gui/gncal-todo.c:488
+#: composer/e-msg-composer-address-dialog.glade.h:13
+msgid "Add..."
+msgstr "Dodaj..."
+
+#. Edit
+#: calendar/gui/gncal-todo.c:497
+#, fuzzy
+msgid "Edit..."
+msgstr "Dodaj..."
+
+#: calendar/gui/gncal-todo.c:721
+msgid "Weeks"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
+msgid "Days"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
+msgid "Hours"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
+msgid "Hour"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
+msgid "Minutes"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
+msgid "Minute"
+msgstr ""
+
+#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
+#, fuzzy
+msgid "Seconds"
+msgstr "Sekcije:"
+
+#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
+#, fuzzy
+msgid "Second"
+msgstr "Pošlji"
+
+#: calendar/gui/gnome-cal.c:461 calendar/gui/gnome-cal.c:1078
+#: calendar/gui/gnome-cal.c:1134
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/gnome-cal.c:1083 calendar/gui/gnome-cal.c:1138
+msgid "Ok"
+msgstr ""
+
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr ""
+
+#: calendar/gui/goto.c:82
+msgid "Year:"
+msgstr ""
+
+#: calendar/gui/goto.c:264
+msgid "Go to date"
+msgstr ""
+
+#. Instructions
+#: calendar/gui/goto.c:275
+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 ""
+
+#: calendar/gui/goto.c:312
+msgid "Go to today"
+msgstr ""
+
+#: calendar/gui/print.c:265
+msgid "1st"
+msgstr ""
+
+#: calendar/gui/print.c:265
+msgid "2nd"
+msgstr ""
+
+#: calendar/gui/print.c:265
+msgid "3rd"
+msgstr ""
+
+#: calendar/gui/print.c:265
+msgid "4th"
+msgstr ""
+
+#: calendar/gui/print.c:265
+msgid "5th"
+msgstr ""
+
+#: calendar/gui/print.c:266
+msgid "6th"
+msgstr ""
+
+#: calendar/gui/print.c:266
+msgid "7th"
+msgstr ""
+
+#: calendar/gui/print.c:266
+msgid "8th"
+msgstr ""
+
+#: calendar/gui/print.c:266
+msgid "9th"
+msgstr ""
+
+#: calendar/gui/print.c:266
+msgid "10th"
+msgstr ""
+
+#: calendar/gui/print.c:267
+msgid "11th"
+msgstr ""
+
+#: calendar/gui/print.c:267
+msgid "12th"
+msgstr ""
+
+#: calendar/gui/print.c:267
+msgid "13th"
+msgstr ""
+
+#: calendar/gui/print.c:267
+msgid "14th"
+msgstr ""
+
+#: calendar/gui/print.c:267
+msgid "15th"
+msgstr ""
+
+#: calendar/gui/print.c:268
+msgid "16th"
+msgstr ""
+
+#: calendar/gui/print.c:268
+msgid "17th"
+msgstr ""
+
+#: calendar/gui/print.c:268
+msgid "18th"
+msgstr ""
+
+#: calendar/gui/print.c:268
+msgid "19th"
+msgstr ""
+
+#: calendar/gui/print.c:268
+msgid "20th"
+msgstr ""
+
+#: calendar/gui/print.c:269
+msgid "21st"
+msgstr ""
+
+#: calendar/gui/print.c:269
+msgid "22nd"
+msgstr ""
+
+#: calendar/gui/print.c:269
+msgid "23rd"
+msgstr ""
+
+#: calendar/gui/print.c:269
+msgid "24th"
+msgstr ""
+
+#: calendar/gui/print.c:269
+msgid "25th"
+msgstr ""
+
+#: calendar/gui/print.c:270
+msgid "26th"
+msgstr ""
+
+#: calendar/gui/print.c:270
+msgid "27th"
+msgstr ""
+
+#: calendar/gui/print.c:270
+msgid "28th"
+msgstr ""
+
+#: calendar/gui/print.c:270
+msgid "29th"
+msgstr ""
+
+#: calendar/gui/print.c:270
+msgid "30th"
+msgstr ""
+
+#: calendar/gui/print.c:271
+msgid "31st"
+msgstr ""
+
+#: calendar/gui/print.c:326
+msgid "Su"
+msgstr ""
+
+#: calendar/gui/print.c:326
+msgid "Mo"
+msgstr ""
+
+#: calendar/gui/print.c:326
+msgid "Tu"
+msgstr ""
+
+#: calendar/gui/print.c:326
+msgid "We"
+msgstr ""
+
+#: calendar/gui/print.c:326
+msgid "Th"
+msgstr ""
+
+#: calendar/gui/print.c:326
+#, fuzzy
+msgid "Fr"
+msgstr "Od"
+
+#: calendar/gui/print.c:326
+msgid "Sa"
+msgstr ""
+
+#: calendar/gui/print.c:868
+msgid "TODO Items"
+msgstr ""
+
+#. Day
+#: calendar/gui/print.c:980
+msgid "Current day (%a %b %d %Y)"
+msgstr ""
+
+#: calendar/gui/print.c:1000 calendar/gui/print.c:1014
+#: calendar/gui/print.c:1015
+msgid "%a"
+msgstr ""
+
+#: calendar/gui/print.c:1001 calendar/gui/print.c:1002
+#: calendar/gui/print.c:1016 calendar/gui/print.c:1017
+msgid "%b"
+msgstr ""
+
+#: calendar/gui/print.c:1004
+#, c-format
+msgid "Current week (%s %s %d - %s %d %d)"
+msgstr ""
+
+#: calendar/gui/print.c:1021
+#, c-format
+msgid "Current week (%s %s %d - %s %s %d %d)"
+msgstr ""
+
+#: calendar/gui/print.c:1027
+#, c-format
+msgid "Current week (%s %s %d %d - %s %s %d %d)"
+msgstr ""
+
+#. Month
+#: calendar/gui/print.c:1040
+msgid "Current month (%a %Y)"
+msgstr ""
+
+#. Year
+#: calendar/gui/print.c:1047
+msgid "Current year (%Y)"
+msgstr ""
+
+#: calendar/gui/print.c:1084
+#, fuzzy
+msgid "Print Calendar"
+msgstr "Uporaba _Koledarja"
+
+#: calendar/gui/print.c:1249
+#, fuzzy
+msgid "Print Preview"
+msgstr "Predogled:"
+
+#: calendar/gui/prop.c:330
+msgid "Time display"
+msgstr ""
+
+#. Time format
+#: calendar/gui/prop.c:334
+msgid "Time format"
+msgstr ""
+
+#: calendar/gui/prop.c:335
+msgid "12-hour (AM/PM)"
+msgstr ""
+
+#: calendar/gui/prop.c:336
+msgid "24-hour"
+msgstr ""
+
+#. Weeks start on
+#: calendar/gui/prop.c:346
+msgid "Weeks start on"
+msgstr ""
+
+#: calendar/gui/prop.c:347
+#, fuzzy
+msgid "Sunday"
+msgstr "Pošlji"
+
+#: calendar/gui/prop.c:348
+#, fuzzy
+msgid "Monday"
+msgstr "Telo"
+
+#. Day range
+#: calendar/gui/prop.c:358
+msgid "Day range"
+msgstr ""
+
+#: calendar/gui/prop.c:369
+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 ""
+
+#: calendar/gui/prop.c:385
+msgid "Day start:"
+msgstr ""
+
+#: calendar/gui/prop.c:396
+msgid "Day end:"
+msgstr ""
+
+#: calendar/gui/prop.c:519
+msgid "Colors for display"
+msgstr ""
+
+#: calendar/gui/prop.c:522
+msgid "Colors"
+msgstr ""
+
+#: calendar/gui/prop.c:599
+msgid "Show on TODO List:"
+msgstr ""
+
+#: calendar/gui/prop.c:606
+msgid "Time Until Due"
+msgstr ""
+
+#: calendar/gui/prop.c:637
+msgid "To Do List style options:"
+msgstr ""
+
+#: calendar/gui/prop.c:642
+msgid "Highlight overdue items"
+msgstr ""
+
+#: calendar/gui/prop.c:645
+msgid "Highlight not yet due items"
+msgstr ""
+
+#: calendar/gui/prop.c:648
+msgid "Highlight items due today"
+msgstr ""
+
+#: calendar/gui/prop.c:678
+msgid "To Do List Properties"
+msgstr ""
+
+#: calendar/gui/prop.c:681
+msgid "To Do List"
+msgstr ""
+
+#: calendar/gui/prop.c:780
+msgid "Alarms"
+msgstr ""
+
+#. build miscellaneous box
+#: calendar/gui/prop.c:783
+#, fuzzy
+msgid "Alarm Properties"
+msgstr "Lastnosti priloge"
+
+#: calendar/gui/prop.c:793
+msgid "Beep on display alarms"
+msgstr ""
+
+#: calendar/gui/prop.c:803
+msgid "Audio alarms timeout after"
+msgstr ""
+
+#: calendar/gui/prop.c:814 calendar/gui/prop.c:831
+msgid " seconds"
+msgstr ""
+
+#: calendar/gui/prop.c:820
+msgid "Enable snoozing for "
+msgstr ""
+
+#. populate default frame/box
+#: calendar/gui/prop.c:836
+#, fuzzy
+msgid "Defaults"
+msgstr "Podrobnosti"
+
+#: composer/e-msg-composer-address-dialog.c:183
 msgid "Cut"
 msgstr "Izreži"
 
@@ -425,7 +2249,7 @@ msgstr "Izreži"
 msgid "Cut selected item into clipboard"
 msgstr "Izreži izbran predmet na odložišče"
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:636
+#: composer/e-msg-composer-address-dialog.c:187
 msgid "Copy"
 msgstr "Kopiraj"
 
@@ -434,7 +2258,7 @@ msgid "Copy selected item into clipboard"
 msgstr "Kopiraj izbran predmet na odložišče"
 
 #: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:637
+#: composer/e-msg-composer-address-dialog.c:199
 msgid "Paste"
 msgstr "Prilepi"
 
@@ -456,10 +2280,6 @@ msgstr "Izberi naslov prejemnika"
 msgid "Recipient list:"
 msgstr "Seznam Prejemnikov:"
 
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-msgstr "Ime:"
-
 #: composer/e-msg-composer-address-dialog.glade.h:9
 msgid "Search..."
 msgstr "Iskanje..."
@@ -476,10 +2296,6 @@ msgstr "Naslov"
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr "Dodaj..."
-
 #: composer/e-msg-composer-address-dialog.glade.h:14
 msgid "To: >>"
 msgstr "Za: >>"
@@ -516,7 +2332,7 @@ msgstr "%u bajtov"
 #: composer/e-msg-composer-attachment-bar.c:85
 #, c-format
 msgid "%.1fK"
-msgstr "%.1F"
+msgstr "%.1fK"
 
 #: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
@@ -528,30 +2344,26 @@ msgstr "%.1fM"
 msgid "%.1fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:307
+#: composer/e-msg-composer-attachment-bar.c:299
 msgid "Add attachment"
 msgstr "Dodaj prilogo"
 
-#: composer/e-msg-composer-attachment-bar.c:364
+#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
 msgid "Remove"
 msgstr "Odstrani"
 
-#: composer/e-msg-composer-attachment-bar.c:365
+#: composer/e-msg-composer-attachment-bar.c:363
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:396
+#: composer/e-msg-composer-attachment-bar.c:394
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:397
+#: composer/e-msg-composer-attachment-bar.c:395
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
-#: composer/e-msg-composer-attachment.c:259
-msgid "Select attachment"
-msgstr "Izberi prilogo"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -561,7 +2373,7 @@ msgstr "Izberi prilogo"
 msgid "Attachment properties"
 msgstr "Lastnosti priloge"
 
-#: composer/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "MIME type:"
 msgstr "MIME tip:"
 
@@ -569,35 +2381,31 @@ msgstr "MIME tip:"
 msgid "File name:"
 msgstr "Ime datoteke:"
 
-#: composer/e-msg-composer-attachment.glade.h:11
-msgid "Browse..."
-msgstr "Brskaj..."
-
-#: composer/e-msg-composer-hdrs.c:89
+#: composer/e-msg-composer-hdrs.c:174
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
-#: composer/e-msg-composer-hdrs.c:124
+#: composer/e-msg-composer-hdrs.c:216
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:125
+#: composer/e-msg-composer-hdrs.c:217
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: composer/e-msg-composer-hdrs.c:129
+#: composer/e-msg-composer-hdrs.c:221
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:130
+#: composer/e-msg-composer-hdrs.c:222
 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:135
+#: composer/e-msg-composer-hdrs.c:227
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:136
+#: composer/e-msg-composer-hdrs.c:228
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -605,216 +2413,539 @@ 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:142
+#: composer/e-msg-composer-hdrs.c:234
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:143
+#: composer/e-msg-composer-hdrs.c:235
 msgid "Enter the subject of the mail"
 msgstr "Vnesite zadevo spročila"
 
-#: composer/e-msg-composer.c:593
+#: composer/e-msg-composer.c:444
+#, fuzzy
+msgid "Save as..."
+msgstr "Iskanje..."
+
+#: composer/e-msg-composer.c:455
+#, c-format
+msgid "Error saving file: %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:475
+#, c-format
+msgid "Error loading file: %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:494
+#, fuzzy
+msgid "Discard this message?"
+msgstr "Poreduj to sporočilo"
+
+#: composer/e-msg-composer.c:511
+msgid "Open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:623
+msgid "That file does not exist."
+msgstr ""
+
+#: composer/e-msg-composer.c:633
+msgid "That is not a regular file."
+msgstr ""
+
+#: composer/e-msg-composer.c:643
+msgid "That file exists but is not readable."
+msgstr ""
+
+#: composer/e-msg-composer.c:653
+msgid "That file appeared accesible but open(2) failed."
+msgstr ""
+
+#: composer/e-msg-composer.c:675
+msgid ""
+"The file is very large (more than 100K).\n"
+"Are you sure you wish to insert it?"
+msgstr ""
+
+#: composer/e-msg-composer.c:696
+msgid "An error occurred while reading the file."
+msgstr ""
+
+#: composer/e-msg-composer.c:792 shell/e-shell-view-menu.c:438
+#, fuzzy
+msgid "_File"
+msgstr "Filter"
+
+#: composer/e-msg-composer.c:798
+#, fuzzy
+msgid "_Open..."
+msgstr "_Odpri"
+
+#: composer/e-msg-composer.c:799
+msgid "Load a previously saved message"
+msgstr ""
+
+#: composer/e-msg-composer.c:807
+msgid "_Save..."
+msgstr ""
+
+#: composer/e-msg-composer.c:808
+#, fuzzy
+msgid "Save message"
+msgstr "Pošlji sporočilo"
+
+#: composer/e-msg-composer.c:816
+#, fuzzy
+msgid "_Save as..."
+msgstr "Iskanje..."
+
+#: composer/e-msg-composer.c:817
+#, fuzzy
+msgid "Save message with a different name"
+msgstr "Shrani sporočilo v izbrano mapo"
+
+#: composer/e-msg-composer.c:825
 msgid "Save in _folder..."
 msgstr "Shrani v _mapo..."
 
-#: composer/e-msg-composer.c:593
+#: composer/e-msg-composer.c:826
 msgid "Save the message in a specified folder"
 msgstr "Shrani sporočilo v izbrano mapo"
 
-#: composer/e-msg-composer.c:596 composer/e-msg-composer.c:633
-#: mail/folder-browser-factory.c:36
-msgid "Send"
+#: composer/e-msg-composer.c:835
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: composer/e-msg-composer.c:836
+#, fuzzy
+msgid "Insert a file as text into the message"
+msgstr "Priloži datoteko k sporočilu"
+
+#: composer/e-msg-composer.c:845
+#, fuzzy
+msgid "_Send"
 msgstr "Pošlji"
 
-#: composer/e-msg-composer.c:596
+#: composer/e-msg-composer.c:846
 msgid "Send the message"
 msgstr "Pošlji sporočilo"
 
-#: composer/e-msg-composer.c:604
-msgid "View _attachments"
-msgstr "Glej _priloge"
+#: composer/e-msg-composer.c:856
+#, fuzzy
+msgid "_Close..."
+msgstr "Brskaj..."
 
-#: composer/e-msg-composer.c:604
-msgid "View/hide attachments"
-msgstr "Glej/skrij priloge"
+#: composer/e-msg-composer.c:857
+msgid "Quit the message composer"
+msgstr ""
 
-#: composer/e-msg-composer.c:633
-msgid "Send this message"
-msgstr "Pošlji to sporočilo"
+#: composer/e-msg-composer.c:870 shell/e-shell-view-menu.c:480
+msgid "_Edit"
+msgstr ""
+
+#: composer/e-msg-composer.c:881
+#, fuzzy
+msgid "_Format"
+msgstr "Način Izpisa"
+
+#: composer/e-msg-composer.c:887
+msgid "HTML"
+msgstr ""
+
+#: composer/e-msg-composer.c:888
+msgid "Send the mail in HTML format"
+msgstr ""
 
-#: composer/e-msg-composer.c:635
-msgid "Cut selected region into the clipboard"
-msgstr "Izreži izbrano področje na odložišče"
+#: composer/e-msg-composer.c:901 shell/e-shell-view-menu.c:387
+#: shell/e-shell-view-menu.c:491
+#, fuzzy
+msgid "_View"
+msgstr "_Nova"
 
-#: composer/e-msg-composer.c:636
-msgid "Copy selected region into the clipboard"
-msgstr "Kopiraj izbrano področje na odložišče"
+#: composer/e-msg-composer.c:907
+#, fuzzy
+msgid "Show _attachments"
+msgstr "Glej _priloge"
 
-#: composer/e-msg-composer.c:637
-msgid "Paste selected region into the clipboard"
-msgstr "Prilepi izbrano območje z odložišča"
+#: composer/e-msg-composer.c:908
+#, fuzzy
+msgid "Show/hide attachments"
+msgstr "Glej/skrij priloge"
 
-#: composer/e-msg-composer.c:638
-msgid "Undo"
-msgstr "Razveljavi"
+#: composer/e-msg-composer.c:941
+msgid "Send"
+msgstr "Pošlji"
 
-#: composer/e-msg-composer.c:638
-msgid "Undo last operation"
-msgstr "Razveljavi zadnje dejanje"
+#: composer/e-msg-composer.c:942
+msgid "Send this message"
+msgstr "Pošlji to sporočilo"
 
-#: composer/e-msg-composer.c:640
+#: composer/e-msg-composer.c:951
 msgid "Attach"
 msgstr "Priloži"
 
-#: composer/e-msg-composer.c:640
+#: composer/e-msg-composer.c:952
 msgid "Attach a file"
 msgstr "Priloži datoteko"
 
-#: mail/folder-browser-factory.c:35
+#: composer/e-msg-composer.c:1139
+#, fuzzy
+msgid "Compose a message"
+msgstr "Sestavi novo sporočilo"
+
+#: mail/component-factory.c:188
+#, fuzzy
+msgid "Cannot initialize Evolution's mail component."
+msgstr "Ne morem inicializirati lupino Evolution."
+
+#: mail/folder-browser-factory.c:23
 msgid "Get mail"
 msgstr "Dobi pošto"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:23
 msgid "Check for new mail"
 msgstr "Preveri za novo pošto"
 
-#: mail/folder-browser-factory.c:36
-msgid "Send a new message"
-msgstr "Pošlji sporočilo"
-
-#: mail/folder-browser-factory.c:37
-msgid "Find"
-msgstr "Poišči"
+#: mail/folder-browser-factory.c:24
+msgid "Compose"
+msgstr ""
 
-#: mail/folder-browser-factory.c:37
-msgid "Find messages"
-msgstr "Poišči sporočilo"
+#: mail/folder-browser-factory.c:24
+#, fuzzy
+msgid "Compose a new message"
+msgstr "Sestavi novo sporočilo"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:28
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:28
 msgid "Reply to the sender of this message"
 msgstr "Odgovori pošiljatelju tega sporočila"
 
-#: mail/folder-browser-factory.c:42
+#: mail/folder-browser-factory.c:29
 msgid "Reply to All"
 msgstr "Odgovori Vsem"
 
-#: mail/folder-browser-factory.c:42
+#: mail/folder-browser-factory.c:29
 msgid "Reply to all recipients of this message"
 msgstr "Odgovori vsem prejemnikom tega sporočila"
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser-factory.c:31
 msgid "Forward"
 msgstr "Posreduj naprej"
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser-factory.c:31
 msgid "Forward this message"
 msgstr "Poreduj to sporočilo"
 
-#: mail/folder-browser-factory.c:48
-msgid "Print"
-msgstr "Natisni"
+#: mail/folder-browser-factory.c:35
+#, fuzzy
+msgid "Move"
+msgstr "Odstrani"
+
+#: mail/folder-browser-factory.c:35
+#, fuzzy
+msgid "Move message to a new folder"
+msgstr "Shrani sporočilo v izbrano mapo"
 
-#: mail/folder-browser-factory.c:48
+#: mail/folder-browser-factory.c:37
 msgid "Print the selected message"
 msgstr "Natisni izbrano sporočilo"
 
-#: mail/folder-browser-factory.c:50
-msgid "Delete"
-msgstr "Izbriši"
-
-#: mail/folder-browser-factory.c:50
+#: mail/folder-browser-factory.c:39
 msgid "Delete this message"
 msgstr "Zbriši to sporčilo"
 
-#: mail/folder-browser-factory.c:67
+#: mail/folder-browser-factory.c:59
+msgid "_Threaded Message List"
+msgstr ""
+
+#: mail/folder-browser-factory.c:72
+#, fuzzy
+msgid "_Mark all messages seen"
+msgstr "_Pošlji sporočilo"
+
+#: mail/folder-browser-factory.c:78
 msgid "_Expunge"
 msgstr "Izbriši"
 
-#: mail/folder-browser-factory.c:73
-msgid "_Filter Druid ..."
+#: mail/folder-browser-factory.c:84
+#, fuzzy
+msgid "Mail _Filters ..."
 msgstr "Škrat za _Filtre ..."
 
-#: mail/folder-browser-factory.c:79
-msgid "_Virtual Folder Druid ..."
-msgstr "Škrat za _Vmape ..."
+#: mail/folder-browser-factory.c:90
+#, fuzzy
+msgid "_vFolder Editor ..."
+msgstr "Škrat za _Filtre ..."
 
-#: mail/folder-browser-factory.c:85
+#: mail/folder-browser-factory.c:96
 msgid "_Mail Configuration ..."
 msgstr "Nastavitev _Pošte ..."
 
-#: mail/folder-browser-factory.c:207
-msgid "We are sorry, Evolution's Folder Browser can not be initialized."
-msgstr "Evoultion Brskalnik po Mapah se ne more inicializirati."
+#: mail/folder-browser-factory.c:102
+msgid "Forget _Passwords"
+msgstr ""
 
-#: mail/folder-browser.c:249
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, ki naj ga prikaže Brskalnik po Mapah"
+#: mail/mail-config.c:688
+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 ""
 
-#: mail/folder-browser.c:252
-msgid "Whether a message preview should be shown"
-msgstr "Ali naj se kaže predogled sporočila"
+#: mail/mail-config.c:701
+#, fuzzy
+msgid "Full name:"
+msgstr "Ime datoteke:"
 
-#: mail/main.c:58
-msgid "Mail Component: I could not initialize Bonobo"
-msgstr "Komponenta Pošta: Ne morem initializirati Bonoba"
+#: mail/mail-config.c:725
+#, fuzzy
+msgid "Email address:"
+msgstr "Naslov spletne strani:"
 
-#: mail/message-list.c:527
+#: mail/mail-config.c:740
+#, fuzzy
+msgid "Organization:"
+msgstr "Usmerjenost"
+
+#: mail/mail-config.c:751
+msgid "Signature file:"
+msgstr ""
+
+#: mail/mail-config.c:756
+msgid "Signature File"
+msgstr ""
+
+#: mail/mail-config.c:1167
+#, fuzzy
+msgid "Server:"
+msgstr "LDAP Strežnik:"
+
+#: mail/mail-config.c:1173
+#, fuzzy
+msgid "Username:"
+msgstr "Ime datoteke:"
+
+#: mail/mail-config.c:1179
+#, fuzzy
+msgid "Path:"
+msgstr "Prilepi"
+
+#: mail/mail-config.c:1187
+#, fuzzy
+msgid "Authentication:"
+msgstr "Usmerjenost"
+
+#: mail/mail-config.c:1199
+msgid "Detect supported types..."
+msgstr ""
+
+#: mail/mail-config.c:1222
+msgid "Test Settings"
+msgstr ""
+
+#: mail/mail-config.c:1344 mail/mail-config.c:1392
+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 ""
+
+#: mail/mail-config.c:1368
+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 ""
+
+#: mail/mail-config.c:1434
+msgid "Edit Identity"
+msgstr ""
+
+#: mail/mail-config.c:1436
+msgid "Add Identity"
+msgstr ""
+
+#: mail/mail-config.c:1515
+msgid "Edit Source"
+msgstr ""
+
+#: mail/mail-config.c:1517
+msgid "Add Source"
+msgstr ""
+
+#: mail/mail-config.c:1598
+msgid "Edit News Server"
+msgstr ""
+
+#: mail/mail-config.c:1600
+msgid "Add News Server"
+msgstr ""
+
+#: mail/mail-ops.c:393
+#, fuzzy
+msgid "Fetching mail"
+msgstr "Dobi pošto"
+
+#: mail/mail-ops.c:405
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+
+#: mail/mail-ops.c:791
+msgid "Move message(s) to"
+msgstr ""
+
+#: mail/mail-threads.c:483
+msgid "Currently pending operations:"
+msgstr ""
+
+#: mail/mail-threads.c:621
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-threads.c:623
+msgid "Error reading commands from dispatching thread."
+msgstr ""
+
+#: mail/mail-threads.c:712
+msgid "Corrupted message from dispatching thread?"
+msgstr ""
+
+#: mail/mail-threads.c:814
+msgid "Could not create dialog box."
+msgstr ""
+
+#: mail/mail-threads.c:849
+msgid "User cancelled query."
+msgstr ""
+
+#: mail/message-list.c:456
 msgid "Online Status"
 msgstr "Stanje Priklopa"
 
-#: mail/message-list.c:541
-msgid "Priority"
-msgstr "Prioriteta"
-
-#: mail/message-list.c:555
+#: mail/message-list.c:492
 msgid "From"
 msgstr "Od"
 
-#: mail/message-list.c:562
+#: mail/message-list.c:499
 msgid "Subject"
 msgstr "Zadeva"
 
-#: mail/message-list.c:569
+#: mail/message-list.c:506
 msgid "Date"
 msgstr "Datum"
 
-#: mail/message-list.c:576
-msgid "Receive"
+#: mail/message-list.c:513
+#, fuzzy
+msgid "Received"
 msgstr "Sprejeto"
 
-#: mail/message-list.c:583
+#: mail/message-list.c:520
 msgid "To"
 msgstr "Za"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:527
 msgid "Size"
 msgstr "Velikost"
 
+#: shell/e-setup.c:47
+msgid "Evolution installation"
+msgstr ""
+
+#: shell/e-setup.c:51
+msgid "This seems to be the first time you run Evolution."
+msgstr ""
+
+#: shell/e-setup.c:52
+msgid "Please click \"OK\" to install the Evolution user files under"
+msgstr ""
+
+#: shell/e-setup.c:69
+#, c-format
+msgid ""
+"Cannot create the directory\n"
+"%s\n"
+"Error: %s"
+msgstr ""
+
+#: shell/e-setup.c:84
+#, c-format
+msgid ""
+"Cannot copy files into\n"
+"`%s'."
+msgstr ""
+
+#: shell/e-setup.c:88
+msgid "Evolution files successfully installed."
+msgstr ""
+
+#: shell/e-setup.c:108
+#, c-format
+msgid ""
+"The file `%s' is not a directory.\n"
+"Please remove it in order to allow installation\n"
+"of the Evolution user files."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:81
+#, fuzzy, c-format
+msgid ""
+"Cannot create the specified folder:\n"
+"%s"
+msgstr "Shrani sporočilo v izbrano mapo"
+
+#: shell/e-shell-folder-creation-dialog.c:133
+msgid "The specified folder name is not valid."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:223
+msgid "Evolution - Create new folder"
+msgstr ""
+
+#: shell/e-shell-folder-selection-dialog.c:95
+msgid ""
+"The type of the selected folder is not valid for\n"
+"the requested operation."
+msgstr ""
+
+#: shell/e-shell-folder-selection-dialog.c:236
+#, fuzzy
+msgid "New..."
+msgstr "_Nova"
+
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+msgid "(Untitled)"
+msgstr ""
+
 #. you might have to call gnome_dialog_run() on the
 #. * dialog returned here, I don't remember...
 #.
-#: shell/e-shell-view-menu.c:106
+#: shell/e-shell-view-menu.c:113
 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:112
+#: shell/e-shell-view-menu.c:119
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:155
+#: shell/e-shell-view-menu.c:164
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:157
+#: shell/e-shell-view-menu.c:166
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Avtorske pravice pridržane 1999,2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:168
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -824,157 +2955,269 @@ msgstr ""
 "za pošto, koledar in urejanje stikov\n"
 "znotraj namizja GNOME."
 
-#: shell/e-shell-view-menu.c:254 shell/e-shell-view-menu.c:320
+#: shell/e-shell-view-menu.c:324
+#, fuzzy
+msgid "Go to folder..."
+msgstr "Shrani v _mapo..."
+
+#: shell/e-shell-view-menu.c:381
+msgid "_New"
+msgstr "_Nova"
+
+#: shell/e-shell-view-menu.c:393
 msgid "_Folder"
 msgstr "_Mapa"
 
-#: shell/e-shell-view-menu.c:258
-msgid "Evolution _Bar Shortcut"
+#: shell/e-shell-view-menu.c:399
+#, fuzzy
+msgid "Evolution bar _shortcut"
 msgstr "Evolution _Vrstica z Bljižnicami"
 
-#: shell/e-shell-view-menu.c:264
-msgid "_Mail message"
+#: shell/e-shell-view-menu.c:408
+#, fuzzy
+msgid "_Mail message (FIXME)"
 msgstr "_Pošlji sporočilo"
 
-#: shell/e-shell-view-menu.c:265 shell/e-shell-view-menu.c:268
-msgid "Composes a new mail message"
-msgstr "Sestavi novo sporočilo"
-
-#: shell/e-shell-view-menu.c:267
-msgid "_Appointment"
+#: shell/e-shell-view-menu.c:414
+#, fuzzy
+msgid "_Appointment (FIXME)"
 msgstr "_Zmenek"
 
-#: shell/e-shell-view-menu.c:270
-msgid "Meeting Re_quest"
-msgstr "Za_hteva po sestanku"
-
-#: shell/e-shell-view-menu.c:273
-msgid "_Contact"
+#: shell/e-shell-view-menu.c:420
+#, fuzzy
+msgid "_Contact (FIXME)"
 msgstr "_Stik"
 
-#: shell/e-shell-view-menu.c:276
-msgid "_Task"
-msgstr "N_aloga"
-
-#: shell/e-shell-view-menu.c:279
-msgid "Task _Request"
-msgstr "Zahteva po _Nalogi"
-
-#: shell/e-shell-view-menu.c:282
-msgid "_Journal Entry"
-msgstr "_Vpis v dnevnik"
-
-#: shell/e-shell-view-menu.c:285
-msgid "_Note"
-msgstr "_Opomba"
-
-#: shell/e-shell-view-menu.c:295
-msgid "_Selected Items"
-msgstr "_Izbrani Predmeti"
+#: shell/e-shell-view-menu.c:426
+msgid "_Task (FIXME)"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:303
-msgid "_New Folder"
-msgstr "_Nova Mapa"
+#: shell/e-shell-view-menu.c:448
+#, fuzzy
+msgid "_Go to folder..."
+msgstr "Shrani v _mapo..."
 
-#: shell/e-shell-view-menu.c:311
-msgid "_New"
-msgstr "_Nova"
+#: shell/e-shell-view-menu.c:449
+msgid "Display a different folder"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:312
-msgid "_Open"
-msgstr "_Odpri"
+#: shell/e-shell-view-menu.c:456
+#, fuzzy
+msgid "_Create new folder..."
+msgstr "Shrani v _mapo..."
 
-#: shell/e-shell-view-menu.c:313
-msgid "Clos_e All Items"
-msgstr "Zapri _Vse Predmete"
+#: shell/e-shell-view-menu.c:457 shell/e-shell-view-menu.c:467
+msgid "Create a new folder"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:313
-msgid "Closes all the open items"
-msgstr "Zapri vse odprte predmete"
+#: shell/e-shell-view-menu.c:466
+msgid "E_xit..."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:334
+#: shell/e-shell-view-menu.c:497
 msgid "Show _shortcut bar"
 msgstr "Kaži vrstico z _bližnjicami"
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:498
 msgid "Show the shortcut bar"
 msgstr "Pokaže vrstico z bljižnicami"
 
-#: shell/e-shell-view-menu.c:337
+#: shell/e-shell-view-menu.c:503
 msgid "Show _folder bar"
 msgstr "Kaži vrstico z _mapami"
 
-#: shell/e-shell-view-menu.c:338
+#: shell/e-shell-view-menu.c:504
 msgid "Show the folder bar"
 msgstr "Pokaže vrstico z mapami"
 
-#: shell/e-shell-view-menu.c:355
-msgid "Help _Index"
+#: shell/e-shell-view-menu.c:526
+msgid "_Actions"
+msgstr "_Dejanja"
+
+#: shell/e-shell-view-menu.c:537
+#, fuzzy
+msgid "_Help"
+msgstr "_Doma"
+
+#: shell/e-shell-view-menu.c:543
+#, fuzzy
+msgid "Help _index"
 msgstr "Kazalo _Pomoči"
 
-#: shell/e-shell-view-menu.c:358
-msgid "Getting _Started"
+#: shell/e-shell-view-menu.c:550
+#, fuzzy
+msgid "Getting _started"
 msgstr "Kako _Začeti"
 
-#: shell/e-shell-view-menu.c:361
-msgid "Using the _Mailer"
+#: shell/e-shell-view-menu.c:557
+#, fuzzy
+msgid "Using the _mailer"
 msgstr "Uporaba _Pošte"
 
-#: shell/e-shell-view-menu.c:364
-msgid "Using the _Calendar"
+#: shell/e-shell-view-menu.c:564
+#, fuzzy
+msgid "Using the _calendar"
 msgstr "Uporaba _Koledarja"
 
-#: shell/e-shell-view-menu.c:367
-msgid "Using the Cont_act Manager"
+#: shell/e-shell-view-menu.c:571
+#, fuzzy
+msgid "Using the c_ontact manager"
 msgstr "Uporaba upravnika Kont_aktov"
 
-#: shell/e-shell-view-menu.c:372
+#: shell/e-shell-view-menu.c:581
 msgid "_Submit bug report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: shell/e-shell-view-menu.c:373
-msgid "Submit bug-report via bug-buddy"
+#: shell/e-shell-view-menu.c:582
+#, fuzzy
+msgid "Submit bug report using Bug Buddy"
 msgstr "Pošlji sporočilo o hrošču preko programa bug-buddy"
 
-#. FIXME: add Favorites here
-#: shell/e-shell-view-menu.c:388
-msgid "_Tools"
-msgstr "_Orodja"
+#: shell/e-shell-view-menu.c:591
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:389
-msgid "_Actions"
-msgstr "_Dejanja"
+#: shell/e-shell-view-menu.c:592
+msgid "Show information about Evolution"
+msgstr ""
+
+#: shell/e-shell-view.c:114
+msgid "(No folder displayed)"
+msgstr ""
 
-#: shell/e-shell.c:176
+#: shell/e-shell-view.c:342
+#, fuzzy
+msgid "Folders"
+msgstr "_Mapa"
+
+#: shell/e-shell-view.c:734
+#, fuzzy
+msgid "None"
+msgstr "_Opomba"
+
+#: shell/e-shell-view.c:738
+#, fuzzy, c-format
+msgid "Evolution - %s"
+msgstr "Evolution"
+
+#: shell/e-shell.c:293
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega shranjevanja -- %s"
 
-#: shell/main.c:101
+#: shell/e-shortcuts-view.c:235
+msgid "_Small icons"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:236
+#, fuzzy
+msgid "Show the shortcuts as small icons"
+msgstr "Pokaže vrstico z bljižnicami"
+
+#: shell/e-shortcuts-view.c:238
+#, fuzzy
+msgid "_Large icons"
+msgstr "Robovi"
+
+#: shell/e-shortcuts-view.c:239
+#, fuzzy
+msgid "Show the shortcuts as large icons"
+msgstr "Pokaže vrstico z bljižnicami"
+
+#: shell/e-shortcuts-view.c:330
+msgid "Activate"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:330
+msgid "Activate this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:333
+#, fuzzy
+msgid "Remove this shortcut from the shortcut bar"
+msgstr "Pokaže vrstico z bljižnicami"
+
+#: shell/e-shortcuts.c:358
+msgid "Error saving shortcuts."
+msgstr ""
+
+#: shell/e-storage.c:217
+#, fuzzy
+msgid "(No name)"
+msgstr "Ime"
+
+#: shell/e-storage.c:412
+msgid "No error"
+msgstr ""
+
+#: shell/e-storage.c:414
+msgid "Generic error"
+msgstr ""
+
+#: shell/e-storage.c:416
+msgid "A folder with the same name already exists"
+msgstr ""
+
+#: shell/e-storage.c:418
+msgid "The specified folder type is not valid"
+msgstr ""
+
+#: shell/e-storage.c:420
+msgid "I/O error"
+msgstr ""
+
+#: shell/e-storage.c:422
+msgid "Not enough space to create the folder"
+msgstr ""
+
+#: shell/e-storage.c:424
+msgid "The specified folder was not found"
+msgstr ""
+
+#: shell/e-storage.c:426
+msgid "Function not implemented in this storage"
+msgstr ""
+
+#: shell/e-storage.c:428
+msgid "Permission denied"
+msgstr ""
+
+#: shell/e-storage.c:430
+msgid "Operation not supported"
+msgstr ""
+
+#: shell/e-storage.c:432
+msgid "The specified type is not supported in this storage"
+msgstr ""
+
+#: shell/e-storage.c:434
+msgid "Unknown error"
+msgstr ""
+
+#: shell/main.c:66
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release of\n"
-"the Evolution groupware suite.\n"
-"\n"
-"The Evolution team has worked hard to make Evolution as robust,\n"
-"extensible, pretty, fast and well-suited to heavy internet users as\n"
-"possible.  And we're very tired.  But we're not done -- not yet.\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"As you explore Evolution, please understand that most of our work has\n"
-"been focused on the backend engine which drives the entire system and\n"
-"not on the user interface.  We are just cresting the hill now, though,\n"
-"and will be pouring most of our love and attention into the UI from\n"
-"here out.  But at least you know that you're not using demoware.\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"
+"Evolution to read their mail full time. You could too. (Just\n"
+"be sure to keep a backup.)\n"
 "\n"
-"So, time for the nerdy disclaimer.  Evolution will: crash, lose your\n"
-"mail, leave stray processes running, consume 100% CPU, race, lock,\n"
-"send HTML mail to random mailing lists, and embarass you in front of\n"
-"your friends and co-workers.  Use at your own risk.\n"
+"But while we have fixed many bugs affecting its stability and\n"
+"security, you still get the disclaimer:  Evolution will: crash,\n"
+"lose your mail when you don't want it to, refuse to delete your\n"
+"mail when you do want it to, leave stray processes running,\n"
+"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
+"lists, and embarass you in front of your friends and co-workers.\n"
+"Use only as directed.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we eagerly\n"
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:130
+#: shell/main.c:93
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -982,11 +3225,16 @@ msgstr ""
 "Hvala!\n"
 "Skupina Evolution\n"
 
-#: shell/main.c:171
+#: shell/main.c:128
 msgid "Cannot initialize the Evolution shell."
 msgstr "Ne morem inicializirati lupino Evolution."
 
-#: shell/main.c:206
+#: shell/main.c:166
+#, fuzzy
+msgid "Cannot initialize the configuration system."
+msgstr "Ne morem inicializirati lupino Evolution."
+
+#: shell/main.c:172
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonoba."
 
@@ -1016,6 +3264,22 @@ msgstr "Filter"
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
+#: widgets/e-table/e-table-field-chooser.glade.h:7
+#, fuzzy
+msgid "Field Chooser"
+msgstr "Polja"
+
+#: widgets/e-table/e-table-field-chooser.glade.h:8
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
 #: widgets/e-table/e-table-group.glade.h:7
 msgid "window1"
 msgstr "okno1"
@@ -1044,14 +3308,141 @@ msgstr "Dodaj >>"
 msgid "<< Remove"
 msgstr "<< Odstrani"
 
-#~ msgid "Sent"
-#~ msgstr "Poslano"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+#, fuzzy
+msgid "Tentative"
+msgstr "Usmerjenost"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#, fuzzy
+msgid "_Options"
+msgstr "Možnosti"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#, fuzzy
+msgid "_Update Free/Busy"
+msgstr "Internet Prost-Zaseden"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#, fuzzy
+msgid "Meeting _start time:"
+msgstr "Kako _Začeti"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#, fuzzy
+msgid "Meeting _end time:"
+msgstr "Za_hteva po sestanku"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:106
+#, fuzzy
+msgid "..."
+msgstr "Dodaj..."
+
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, fuzzy, c-format
+msgid "Group %i"
+msgstr "Grupiranje"
+
+#~ msgid "Cut selected region into the clipboard"
+#~ msgstr "Izreži izbrano področje na odložišče"
+
+#~ msgid "Copy selected region into the clipboard"
+#~ msgstr "Kopiraj izbrano področje na odložišče"
+
+#~ msgid "Paste selected region into the clipboard"
+#~ msgstr "Prilepi izbrano območje z odložišča"
+
+#~ msgid "Undo"
+#~ msgstr "Razveljavi"
+
+#~ msgid "Undo last operation"
+#~ msgstr "Razveljavi zadnje dejanje"
+
+#~ msgid "Find messages"
+#~ msgstr "Poišči sporočilo"
+
+#~ msgid "_Virtual Folder Druid ..."
+#~ msgstr "Škrat za _Vmape ..."
+
+#~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
+#~ msgstr "Evoultion Brskalnik po Mapah se ne more inicializirati."
+
+#~ msgid "Whether a message preview should be shown"
+#~ msgstr "Ali naj se kaže predogled sporočila"
+
+#~ msgid "_Task"
+#~ msgstr "N_aloga"
+
+#~ msgid "_Selected Items"
+#~ msgstr "_Izbrani Predmeti"
+
+#~ msgid "_New Folder"
+#~ msgstr "_Nova Mapa"
+
+#~ msgid "Clos_e All Items"
+#~ msgstr "Zapri _Vse Predmete"
+
+#~ msgid "Closes all the open items"
+#~ msgstr "Zapri vse odprte predmete"
 
 #~ msgid "Show _Treeview"
 #~ msgstr "Kaži _Drevesni pogled"
 
 #~ msgid "Shows the tree view"
 #~ msgstr "Pokaže drevesni pogled"
-
-#~ msgid "Internet Free-Busy"
-#~ msgstr "Internet Prost-Zaseden"