Added a load of missing files. Updated Norwegian translation.

2000-06-28  Kjartan Maraas  <kmaraas@gnome.org>

	* POTFILES.in: Added a load of missing files.
	* no.po: Updated Norwegian translation.

svn path=/trunk/; revision=3768

3 files changed, 1823 insertions, 487 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 14aa50bb22..396e51950f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-28  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* POTFILES.in: Added a load of missing files.
+	* no.po: Updated Norwegian translation.
+	
 2000-06-27  Valek Filippov  <frob@df.ru>
 
 	* ru.po: Updated russian translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2c25be5f7c..a9fb30930d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,53 +1,76 @@
 addressbook/backend/ebook/load-pine-addressbook.c
+addressbook/contact-editor/categories-strings.h
 addressbook/contact-editor/e-contact-editor.c
-addressbook/gui/component/addressbook.c
+addressbook/contact-editor/e-contact-editor-strings.h
+addressbook/contact-editor/fullname-strings.h
 addressbook/gui/component/addressbook-factory.c
+addressbook/gui/component/addressbook.c
+addressbook/gui/component/alphabet.glade.h
+addressbook/gui/component/ldap-server-dialog.glade.h
 addressbook/gui/component/e-select-names.c
+addressbook/gui/component/select-names.glade.h
 addressbook/gui/minicard/e-minicard-view.c
 addressbook/gui/minicard/e-minicard.c
+addressbook/printing/e-contact-print.glade.h
 calendar/cal-util/timeutil.c
 calendar/gui/calendar-commands.c
 calendar/gui/calendar-conduit-control-applet.c
 calendar/gui/calendar-conduit.c
 calendar/gui/calendar-pilot-sync.c
-calendar/gui/print.c
+calendar/gui/control-factory.c
+calendar/gui/dialogs/alarm-notify-dialog.c
+calendar/gui/dialogs/alarm-notify.glade.h
 calendar/gui/e-day-view-time-item.c
 calendar/gui/e-day-view.c
-calendar/gui/goto.c
 calendar/gui/e-week-view.c
+calendar/gui/event-editor.c
+calendar/gui/event-editor-dialog.glade.h
 calendar/gui/evolution-calendar-control.c
+calendar/gui/getdate.y
 calendar/gui/gncal-todo.c
 calendar/gui/gnome-cal.c
 calendar/gui/gnome-month-item.c
+calendar/gui/goto.c
+calendar/gui/main.c
 calendar/gui/popup-menu.c
+calendar/gui/print.c
 calendar/gui/prop.c
 calendar/gui/todo-conduit-control-applet.c
-calendar/gui/dialogs/alarm-notify-dialog.c
-calendar/gui/main.c
-calendar/gui/event-editor.c
-calendar/gui/control-factory.c
 composer/e-msg-composer-address-dialog.c
+composer/e-msg-composer-address-dialog.glade.h
 composer/e-msg-composer-attachment-bar.c
 composer/e-msg-composer-attachment.c
+composer/e-msg-composer-attachment.glade.h
 composer/e-msg-composer-hdrs.c
 composer/e-msg-composer.c
+filter/filter-editor.c
 libversit/vobject.c
+mail/component-factory.c
 mail/folder-browser-factory.c
 mail/folder-browser.c
 mail/mail-config.c
+mail/mail-ops.c
+mail/mail-threads.c
 mail/main.c
 mail/message-list.c
-mail/component-factory.c
-shell/main.c
+notes/component-factory.c
+notes/main.c
+shell/e-init.c
 shell/e-setup.c
+shell/e-shell-folder-creation-dialog.c
+shell/e-shell-folder-selection-dialog.c
+shell/e-shell-folder-title-bar.c
+shell/e-shell-view-menu.c
 shell/e-shell-view.c
 shell/e-shell.c
-shell/e-shell-folder-title-bar.c
 shell/e-shortcut.c
 shell/e-shortcuts-view.c
-shell/e-shell-view-menu.c
-shell/e-init.c
 shell/e-shortcuts.c
+shell/e-storage.c
+shell/main.c
+widgets/e-table/e-table-config.glade.h
+widgets/e-table/e-table-field-chooser.glade.h
+widgets/e-table/e-table-group.glade.h
 widgets/meeting-time-sel/e-meeting-time-sel.c
-widgets/shortcut-bar/e-group-bar.c
 widgets/misc/e-clipped-label.c
+widgets/shortcut-bar/e-group-bar.c
diff --git a/po/no.po b/po/no.po
index cda0985e2b..37e7162ce9 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2000-06-21 12:05+0200\n"
-"PO-Revision-Date: 2000-06-21 12:07+02:00\n"
+"POT-Creation-Date: 2000-06-28 00:43+0200\n"
+"PO-Revision-Date: 2000-06-28 00:50+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,23 @@ msgstr ""
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere 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.
+#.
+#: addressbook/contact-editor/categories-strings.h:7
+msgid "categories"
+msgstr ""
+
+#: addressbook/contact-editor/categories-strings.h:8
+msgid "Item(s) belong to these categories:"
+msgstr ""
+
+#: addressbook/contact-editor/categories-strings.h:9
+msgid "Available Categories:"
+msgstr ""
+
 #: addressbook/contact-editor/e-contact-editor.c:578
 #: calendar/gui/event-editor.c:1118
 #, fuzzy
@@ -387,7 +404,7 @@ msgid "FIXME: Delete"
 msgstr "Slett"
 
 #: addressbook/contact-editor/e-contact-editor.c:791
-#: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:322
+#: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:326
 msgid "Delete this item"
 msgstr "Slett denne oppføringen"
 
@@ -500,6 +517,7 @@ msgstr "Teleks"
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
 #: addressbook/contact-editor/e-contact-editor.c:1275
 msgid "Primary Email"
 msgstr "Primær e-post"
@@ -512,11 +530,211 @@ msgstr "E-post 2"
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/gui/component/addressbook.c:417 mail/message-list.c:631
+#.
+#. * 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 "_Legg til"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+msgid "_Delete"
+msgstr "_Slett"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:9
+msgid "Phone Types"
+msgstr "Telefontyper"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:10
+#: addressbook/contact-editor/e-contact-editor-strings.h:12
+msgid "New phone type"
+msgstr "Ny telefontype"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:11
+#: calendar/gui/event-editor-dialog.glade.h:91 mail/mail-config.c:1847
+#: mail/mail-config.c:1943
+msgid "Add"
+msgstr "Legg til"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:13
+msgid "Contact Editor"
+msgstr "Kontaktredigering"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:14
+msgid "_Full Name..."
+msgstr ":Fullt navn..."
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:15
+msgid "File As:"
+msgstr "Lagre som:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:16
+msgid "Web page address:"
+msgstr "Hjemmeside-adresse:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:17
+msgid "Wants to receive _HTML mail"
+msgstr "Vil motta _HTML e-post"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:18
+msgid "Address:"
+msgstr "Adresse:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
+msgid "_Business"
+msgstr "Ar_beid"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
+msgid "_Home"
+msgstr "_Hjemme"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
+msgid "Business _Fax"
+msgstr "_Faks på arbeid"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+msgid "_Mobile"
+msgstr "_Mobil"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
+msgid "B_usiness"
+msgstr "A_rbeid"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
+msgid "_This is the mailing address"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:26
+msgid "C_ontacts..."
+msgstr "K_ontakter..."
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
+msgid "Ca_tegories..."
+msgstr "Ka_tegorier..."
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
+msgid "_Job title:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
+msgid "_Company:"
+msgstr "_Firma:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:30
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "General"
+msgstr "Generell"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:31
+msgid "_Department:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:32
+msgid "_Office:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:33
+msgid "_Profession:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:34
+msgid "_Nickname:"
+msgstr "Kalle_navn:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:35
+msgid "_Spouse:"
+msgstr "Ekte_felle:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:36
+msgid "_Birthday:"
+msgstr "Fø_dselsdag:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:37
+msgid "_Assistant's name:"
+msgstr "Assistents navn"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:38
+msgid "_Manager's Name:"
+msgstr "_Leders navn:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:39
+msgid "Anni_versary:"
+msgstr "Br_yllupsdag:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:40
+msgid "No_tes:"
+msgstr "No_tater:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:41
+msgid "Details"
+msgstr "Detaljer"
+
+#.
+#. * 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 "Sjekk fullt navn:"
+
+#: addressbook/contact-editor/fullname-strings.h:8
+msgid "_Title:"
+msgstr "_Tittel:"
+
+#: addressbook/contact-editor/fullname-strings.h:9
+msgid "_First:"
+msgstr "_Fornavn:"
+
+#: addressbook/contact-editor/fullname-strings.h:10
+msgid "_Middle:"
+msgstr "_Mellomnavn:"
+
+#: addressbook/contact-editor/fullname-strings.h:11
+msgid "_Last:"
+msgstr "_Etternavn:"
+
+#: addressbook/contact-editor/fullname-strings.h:12
+msgid "_Suffix:"
+msgstr "_Suffiks:"
+
+#: addressbook/contact-editor/fullname-strings.h:13
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Dr.\n"
+msgstr ""
+"\n"
+"Hr.\n"
+"Fru.\n"
+"Dr.\n"
+
+#: addressbook/contact-editor/fullname-strings.h:18
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq.\n"
+msgstr ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq.\n"
+
+#: addressbook/gui/component/addressbook.c:417 mail/message-list.c:697
 msgid "To"
 msgstr "Til"
 
-#: addressbook/gui/component/addressbook.c:418 mail/message-list.c:603
+#: addressbook/gui/component/addressbook.c:418 mail/message-list.c:669
 msgid "From"
 msgstr "Fra"
 
@@ -525,7 +743,7 @@ msgid "Cc"
 msgstr "Cc"
 
 #: addressbook/gui/component/addressbook.c:424
-#: calendar/gui/calendar-commands.c:544
+#: calendar/gui/calendar-commands.c:544 notes/component-factory.c:27
 msgid "New"
 msgstr "Ny"
 
@@ -553,7 +771,8 @@ msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
 #. Delete
-#: addressbook/gui/component/addressbook.c:430 calendar/gui/gncal-todo.c:494
+#: addressbook/gui/component/addressbook.c:430
+#: calendar/gui/event-editor-dialog.glade.h:93 calendar/gui/gncal-todo.c:498
 #: mail/folder-browser-factory.c:50 mail/mail-config.c:1865
 #: mail/mail-config.c:1961
 msgid "Delete"
@@ -568,7 +787,7 @@ msgid "Test Select Names"
 msgstr "Prøv utvalgte navn"
 
 #: addressbook/gui/component/addressbook.c:510
-#: addressbook/gui/component/addressbook.c:1052
+#: addressbook/gui/component/addressbook.c:1056
 msgid "As _Table"
 msgstr "Som _tabell"
 
@@ -610,14 +829,179 @@ msgstr ""
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
-#: addressbook/gui/component/addressbook.c:1059
+#: addressbook/gui/component/addressbook.c:1027
+msgid "* Click here to add a contact *"
+msgstr "* Klikk her for å legge til en kontakt *"
+
+#: addressbook/gui/component/addressbook.c:1063
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
-#: addressbook/gui/component/addressbook.c:1110
+#: addressbook/gui/component/addressbook.c:1114
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
+#.
+#. * 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 "vindu2"
+
+#: addressbook/gui/component/alphabet.glade.h:8
+msgid "123"
+msgstr "123"
+
+#: addressbook/gui/component/alphabet.glade.h:9
+msgid "a"
+msgstr "a"
+
+#: addressbook/gui/component/alphabet.glade.h:10
+msgid "b"
+msgstr "b"
+
+#: addressbook/gui/component/alphabet.glade.h:11
+msgid "c"
+msgstr "c"
+
+#: addressbook/gui/component/alphabet.glade.h:12
+msgid "d"
+msgstr "d"
+
+#: addressbook/gui/component/alphabet.glade.h:13
+msgid "e"
+msgstr "e"
+
+#: addressbook/gui/component/alphabet.glade.h:14
+msgid "f"
+msgstr "f"
+
+#: addressbook/gui/component/alphabet.glade.h:15
+msgid "g"
+msgstr "g"
+
+#: addressbook/gui/component/alphabet.glade.h:16
+#: calendar/cal-util/timeutil.c:98
+msgid "h"
+msgstr "h"
+
+#: addressbook/gui/component/alphabet.glade.h:17
+msgid "i"
+msgstr "i"
+
+#: addressbook/gui/component/alphabet.glade.h:18
+msgid "j"
+msgstr "j"
+
+#: addressbook/gui/component/alphabet.glade.h:19
+msgid "k"
+msgstr "k"
+
+#: addressbook/gui/component/alphabet.glade.h:20
+msgid "l"
+msgstr "l"
+
+#: addressbook/gui/component/alphabet.glade.h:21
+msgid "m"
+msgstr "m"
+
+#: addressbook/gui/component/alphabet.glade.h:22
+msgid "n"
+msgstr "n"
+
+#: addressbook/gui/component/alphabet.glade.h:23
+msgid "o"
+msgstr "o"
+
+#: addressbook/gui/component/alphabet.glade.h:24
+msgid "p"
+msgstr "p"
+
+#: addressbook/gui/component/alphabet.glade.h:25
+msgid "q"
+msgstr "q"
+
+#: addressbook/gui/component/alphabet.glade.h:26
+msgid "r"
+msgstr "r"
+
+#: addressbook/gui/component/alphabet.glade.h:27
+msgid "s"
+msgstr "s"
+
+#: addressbook/gui/component/alphabet.glade.h:28
+msgid "t"
+msgstr "t"
+
+#: addressbook/gui/component/alphabet.glade.h:29
+msgid "u"
+msgstr "u"
+
+#: addressbook/gui/component/alphabet.glade.h:30
+msgid "v"
+msgstr "v"
+
+#: addressbook/gui/component/alphabet.glade.h:31
+msgid "w"
+msgstr "w"
+
+#: addressbook/gui/component/alphabet.glade.h:32
+msgid "x"
+msgstr "x"
+
+#: addressbook/gui/component/alphabet.glade.h:33
+msgid "y"
+msgstr "y"
+
+#: addressbook/gui/component/alphabet.glade.h:34
+msgid "z"
+msgstr "z"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/gui/component/ldap-server-dialog.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:9
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+msgid "LDAP Server:"
+msgstr "LDAP-tjener:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
+msgstr "Portnummer:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
+msgstr "Rot DN:"
+
+#.
+#. * 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/select-names.glade.h:7
+msgid "Select Names"
+msgstr "Velg navn"
+
+#: addressbook/gui/component/select-names.glade.h:8
+msgid "Find..."
+msgstr "Finn..."
+
+#: addressbook/gui/component/select-names.glade.h:9
+msgid "T_ype name or select from List:"
+msgstr ""
+
+#: addressbook/gui/component/select-names.glade.h:10
+msgid "Message Recipients"
+msgstr "Meldingsmottakere"
+
 #: addressbook/gui/minicard/e-minicard-view.c:110
 msgid ""
 "\n"
@@ -632,6 +1016,188 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
+#.
+#. * 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
+msgid "Page Setup:"
+msgstr "Sideoppsett"
+
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Style name:"
+msgstr "Stilnavn:"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+msgid "Preview:"
+msgstr "Forhåndsvis:"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+msgid "Options"
+msgstr "Alternativer"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+msgid "Include:"
+msgstr "Inkluder:"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Sections:"
+msgstr "Seksjoner:"
+
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Immediately follow each other"
+msgstr "Rett etter hverandre"
+
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Letter tabs on side"
+msgstr "Bokstavfaner på siden"
+
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Headings for each letter"
+msgstr "Topptekst for hver bokstav"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Start on a new page"
+msgstr "Start på en ny side"
+
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Number of columns:"
+msgstr "Antall kolonner:"
+
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Blank forms at end:"
+msgstr "Blanke skjema på slutten:"
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Fonts"
+msgstr "Skrifttyper"
+
+#: addressbook/printing/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:51
+#: addressbook/printing/e-contact-print.glade.h:54
+msgid "Font..."
+msgstr "Skrifttype..."
+
+#: addressbook/printing/e-contact-print.glade.h:22
+msgid "Headings"
+msgstr "Topptekster"
+
+#: addressbook/printing/e-contact-print.glade.h:23
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
+
+#: addressbook/printing/e-contact-print.glade.h:24
+msgid "Body"
+msgstr "Kropp"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+msgid "Shading"
+msgstr "Skyggelegging"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Print using gray shading"
+msgstr "Skriv ut med gråtoner"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+msgid "Format"
+msgstr "Format"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:50
+msgid "Paper"
+msgstr "Papir"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Type:"
+msgstr "Type:"
+
+#: 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 "etikett26"
+
+#: addressbook/printing/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:44
+msgid "Dimensions:"
+msgstr "Dimensjoner:"
+
+#: addressbook/printing/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:45
+msgid "Width:"
+msgstr "Bredde:"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:46
+msgid "Height:"
+msgstr "Høyde:"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Paper source:"
+msgstr "Papirkilde:"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+msgid "Margins"
+msgstr "Marger"
+
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Top:"
+msgstr "Topp:"
+
+#: addressbook/printing/e-contact-print.glade.h:38
+msgid "Bottom:"
+msgstr "Bunn:"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Left:"
+msgstr "Venstre:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Right:"
+msgstr "Høyre:"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Page"
+msgstr "Side"
+
+#: addressbook/printing/e-contact-print.glade.h:42
+msgid "Size:"
+msgstr "Størrelse:"
+
+#: addressbook/printing/e-contact-print.glade.h:47
+msgid "Orientation"
+msgstr "Orientering"
+
+#: addressbook/printing/e-contact-print.glade.h:48
+msgid "Portrait"
+msgstr "Portrett"
+
+#: addressbook/printing/e-contact-print.glade.h:49
+msgid "Landscape"
+msgstr "Landskap"
+
+#: addressbook/printing/e-contact-print.glade.h:52
+msgid "Header"
+msgstr "Topptekst"
+
+#: addressbook/printing/e-contact-print.glade.h:53
+msgid "Footer:"
+msgstr "Bunntekst:"
+
+#: addressbook/printing/e-contact-print.glade.h:55
+msgid "Reverse on even pages"
+msgstr "Motsatt på like sider"
+
+#: addressbook/printing/e-contact-print.glade.h:56
+msgid "Header/Footer"
+msgstr "Topp-/bunntekst"
+
 #: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
 msgid "am"
 msgstr "am"
@@ -640,10 +1206,6 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/cal-util/timeutil.c:98
-msgid "h"
-msgstr "t"
-
 #: calendar/gui/calendar-commands.c:56
 msgid "Outline:"
 msgstr "Omriss:"
@@ -704,8 +1266,8 @@ msgstr "Åpne kalender"
 msgid "Save calendar"
 msgstr "Lagre kalender"
 
-#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:708
-#: calendar/gui/gncal-todo.c:712
+#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:712
+#: calendar/gui/gncal-todo.c:716
 msgid "Day"
 msgstr "Dag"
 
@@ -721,7 +1283,7 @@ msgstr "5 dager"
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:707
+#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:711
 msgid "Week"
 msgstr "Uke"
 
@@ -769,7 +1331,7 @@ msgstr "Idag"
 msgid "Go to present time"
 msgstr "Gå til nåtiden"
 
-#: calendar/gui/calendar-commands.c:554
+#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:213
 msgid "Next"
 msgstr "Neste"
 
@@ -1023,6 +1585,760 @@ msgstr "Kunne ikke åpne DatebookDB"
 msgid "Synced DateBook from Pilot to GnomeCal"
 msgstr "Synkroniserte DateBook fra piloten til GnomeCal"
 
+#: calendar/gui/control-factory.c:136
+#: calendar/gui/evolution-calendar-control.c:131
+msgid "The URI that the calendar will display"
+msgstr "URIen som kalenderen skal vise"
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:181
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarm på %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 "Melding om din avtale på %A %b %d %Y %H:%M"
+
+#.
+#. * 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 "Lukk"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056
+msgid "Snooze"
+msgstr "Utsett"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
+msgid "Edit appointment"
+msgstr "Rediger avtale:"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:10
+msgid "Snooze time (minutes)"
+msgstr "Utsett-tid (minutter)"
+
+#: calendar/gui/e-day-view-time-item.c:391
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutters oppdeling"
+
+#: 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
+msgid "New appointment..."
+msgstr "Ny avtale..."
+
+#: 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 "Redigér denne avtalen..."
+
+#: calendar/gui/e-day-view.c:2276 calendar/gui/e-week-view.c:2634
+msgid "Delete this appointment"
+msgstr "Slett denne avtalen"
+
+#: calendar/gui/e-day-view.c:2283 calendar/gui/e-week-view.c:2641
+msgid "Make this appointment movable"
+msgstr "Gjør denne avtalen flyttbar"
+
+#: calendar/gui/e-day-view.c:2284 calendar/gui/e-week-view.c:2642
+msgid "Delete this occurrence"
+msgstr "Slett denne oppføringen"
+
+#: calendar/gui/e-day-view.c:2285 calendar/gui/e-week-view.c:2643
+msgid "Delete all occurrences"
+msgstr "Slett alle oppføringer"
+
+#: calendar/gui/event-editor.c:289
+msgid "Edit Appointment"
+msgstr "Rediger avtale"
+
+#: calendar/gui/event-editor.c:294
+msgid "No summary"
+msgstr "Ingen sammendrag"
+
+#: calendar/gui/event-editor.c:298
+#, c-format
+msgid "Appointment - %s"
+msgstr "Avtale - %s"
+
+#: calendar/gui/event-editor.c:301
+#, c-format
+msgid "Task - %s"
+msgstr "Oppgave - %s"
+
+#: calendar/gui/event-editor.c:304
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Journaloppføring - %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 ""
+
+#: calendar/gui/event-editor.c:1250
+msgid "FIXME: Chec_k Names"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1251
+msgid "FIXME: Address _Book..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1258
+#, fuzzy
+msgid "FIXME: _New Appointment"
+msgstr "_Avtale"
+
+#: calendar/gui/event-editor.c:1260
+msgid "FIXME: Rec_urrence..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1262
+msgid "FIXME: Intive _Attendees..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1263
+msgid "FIXME: C_ancel Invitation..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1265
+msgid "FIXME: Forward as v_Calendar"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1745
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#. 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 "event-editor-dialog"
+
+#: calendar/gui/event-editor-dialog.glade.h:8
+msgid "_Summary:"
+msgstr "_Sammendrag:"
+
+#: calendar/gui/event-editor-dialog.glade.h:9
+msgid "_Owner:"
+msgstr "_Eier:"
+
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Time"
+msgstr "Tid"
+
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "Start time:"
+msgstr "Starttid:"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+msgid "End time:"
+msgstr "Slutt-tid:"
+
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "A_ll day event"
+msgstr "He_le dagen"
+
+#: calendar/gui/event-editor-dialog.glade.h:14 calendar/gui/prop.c:780
+msgid "Alarms"
+msgstr "Alarmer"
+
+#: 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 ""
+"Minutter\n"
+"Timer\n"
+"Dager\n"
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+msgid "_Display"
+msgstr "_Vis"
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+msgid "_Audio"
+msgstr "_Lyd"
+
+#: calendar/gui/event-editor-dialog.glade.h:33
+msgid "_Program"
+msgstr "_Program"
+
+#: calendar/gui/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "_Send"
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "Mail _to:"
+msgstr "Send _til:"
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "Kjø_r program:"
+
+#: calendar/gui/event-editor-dialog.glade.h:37
+msgid "Classification"
+msgstr "Klassifikasjon"
+
+#: calendar/gui/event-editor-dialog.glade.h:38
+msgid "Pu_blic"
+msgstr "Offe_ntlig"
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+msgid "Pri_vate"
+msgstr "Pri_vat"
+
+#: calendar/gui/event-editor-dialog.glade.h:40
+msgid "_Confidential"
+msgstr "_Konfidensiell"
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+msgid "Recurrence rule"
+msgstr "Regel for gjenintreffelse"
+
+#: calendar/gui/event-editor-dialog.glade.h:43 shell/e-shell-view.c:575
+msgid "None"
+msgstr "Ingen"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "Daily"
+msgstr "Daglig"
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "Weekly"
+msgstr "Ukentlig"
+
+#: calendar/gui/event-editor-dialog.glade.h:46
+msgid "Monthly"
+msgstr "Månedlig"
+
+#: calendar/gui/event-editor-dialog.glade.h:47
+msgid "Yearly"
+msgstr "Årlig"
+
+#: calendar/gui/event-editor-dialog.glade.h:48
+msgid "label23"
+msgstr "etikett23"
+
+#: 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 "Hver"
+
+#: calendar/gui/event-editor-dialog.glade.h:50
+msgid "day(s)"
+msgstr "dag(er)"
+
+#: calendar/gui/event-editor-dialog.glade.h:51
+msgid "label24"
+msgstr "etikett24"
+
+#: calendar/gui/event-editor-dialog.glade.h:53
+msgid "week(s)"
+msgstr "uke(r)"
+
+#: calendar/gui/event-editor-dialog.glade.h:54
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Man"
+
+#: calendar/gui/event-editor-dialog.glade.h:55
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Tir"
+
+#: calendar/gui/event-editor-dialog.glade.h:56
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Ons"
+
+#: calendar/gui/event-editor-dialog.glade.h:57
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Tor"
+
+#: calendar/gui/event-editor-dialog.glade.h:58
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Fre"
+
+#: calendar/gui/event-editor-dialog.glade.h:59
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Lør"
+
+#. 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 "Søn"
+
+#: calendar/gui/event-editor-dialog.glade.h:61
+msgid "label25"
+msgstr "etikett25"
+
+#: calendar/gui/event-editor-dialog.glade.h:62
+#: calendar/gui/event-editor-dialog.glade.h:63
+msgid "Recur on the"
+msgstr "Gjeninntreff den"
+
+#: calendar/gui/event-editor-dialog.glade.h:64
+msgid "th day of the month"
+msgstr "de dagen i måneden"
+
+#: calendar/gui/event-editor-dialog.glade.h:65
+msgid ""
+"1st\n"
+"2nd\n"
+"3rd\n"
+"4th\n"
+"5th\n"
+msgstr ""
+"1ste\n"
+"2dre\n"
+"3dje\n"
+"4de\n"
+"5te\n"
+
+#: calendar/gui/event-editor-dialog.glade.h:71
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday\n"
+msgstr ""
+"Mandag\n"
+"Tirsdag\n"
+"Onsdag\n"
+"Torsdag\n"
+"Fredag\n"
+"Lørdag\n"
+"Søndag\n"
+
+#: calendar/gui/event-editor-dialog.glade.h:79
+msgid "Every"
+msgstr "Hver"
+
+#: calendar/gui/event-editor-dialog.glade.h:80
+msgid "month(s)"
+msgstr "måned(er)"
+
+#: calendar/gui/event-editor-dialog.glade.h:83
+msgid "year(s)"
+msgstr "år"
+
+#: calendar/gui/event-editor-dialog.glade.h:84
+msgid "label27"
+msgstr "etikett27"
+
+#: calendar/gui/event-editor-dialog.glade.h:85
+msgid "Ending date"
+msgstr "Sluttdato"
+
+#: calendar/gui/event-editor-dialog.glade.h:86
+msgid "Repeat forever"
+msgstr "Gjenta for alltid"
+
+#: calendar/gui/event-editor-dialog.glade.h:87
+msgid "End on "
+msgstr "Slutt på "
+
+#: calendar/gui/event-editor-dialog.glade.h:88
+msgid "End after"
+msgstr "Slutt etter"
+
+#: calendar/gui/event-editor-dialog.glade.h:89
+msgid "occurrence(s)"
+msgstr "gjentakelser"
+
+#: calendar/gui/event-editor-dialog.glade.h:90
+msgid "Exceptions"
+msgstr "Unntak"
+
+#: calendar/gui/event-editor-dialog.glade.h:92
+msgid "Change"
+msgstr "Endre"
+
+#: calendar/gui/event-editor-dialog.glade.h:94
+msgid "Recurrence"
+msgstr "Gjeninntreffelse"
+
+#: calendar/gui/getdate.y:391
+msgid "january"
+msgstr "januar"
+
+#: calendar/gui/getdate.y:392
+msgid "february"
+msgstr "februar"
+
+#: calendar/gui/getdate.y:393
+msgid "march"
+msgstr "mars"
+
+#: calendar/gui/getdate.y:394
+msgid "april"
+msgstr "april"
+
+#: calendar/gui/getdate.y:395
+msgid "may"
+msgstr "mai"
+
+#: calendar/gui/getdate.y:396
+msgid "june"
+msgstr "juni"
+
+#: calendar/gui/getdate.y:397
+msgid "july"
+msgstr "juli"
+
+#: calendar/gui/getdate.y:398
+msgid "august"
+msgstr "august"
+
+#: calendar/gui/getdate.y:399
+msgid "september"
+msgstr "september"
+
+#: calendar/gui/getdate.y:400
+msgid "sept"
+msgstr "sept"
+
+#: calendar/gui/getdate.y:401
+msgid "october"
+msgstr "oktober"
+
+#: calendar/gui/getdate.y:402
+msgid "november"
+msgstr "november"
+
+#: calendar/gui/getdate.y:403
+msgid "december"
+msgstr "desember"
+
+#: calendar/gui/getdate.y:404
+msgid "sunday"
+msgstr "søndag"
+
+#: calendar/gui/getdate.y:405
+msgid "monday"
+msgstr "mandag"
+
+#: calendar/gui/getdate.y:406
+msgid "tuesday"
+msgstr "tirsdag"
+
+#: calendar/gui/getdate.y:407
+msgid "tues"
+msgstr "tirs"
+
+#: calendar/gui/getdate.y:408
+msgid "wednesday"
+msgstr "onsdag"
+
+#: calendar/gui/getdate.y:409
+msgid "wednes"
+msgstr "ons"
+
+#: calendar/gui/getdate.y:410
+msgid "thursday"
+msgstr "torsdag"
+
+#: calendar/gui/getdate.y:411
+msgid "thur"
+msgstr "tor"
+
+#: calendar/gui/getdate.y:412
+msgid "thurs"
+msgstr "tors"
+
+#: calendar/gui/getdate.y:413
+msgid "friday"
+msgstr "fredag"
+
+#: calendar/gui/getdate.y:414
+msgid "saturday"
+msgstr "lørdag"
+
+#: calendar/gui/getdate.y:420
+msgid "year"
+msgstr "år"
+
+#: calendar/gui/getdate.y:421
+msgid "month"
+msgstr "måned"
+
+#: calendar/gui/getdate.y:422
+msgid "fortnight"
+msgstr "14-dager"
+
+#: calendar/gui/getdate.y:423
+msgid "week"
+msgstr "uke"
+
+#: calendar/gui/getdate.y:424
+msgid "day"
+msgstr "dag"
+
+#: calendar/gui/getdate.y:425
+msgid "hour"
+msgstr "time"
+
+#: calendar/gui/getdate.y:426
+msgid "minute"
+msgstr "minutt"
+
+#: calendar/gui/getdate.y:427
+msgid "min"
+msgstr "min"
+
+#: calendar/gui/getdate.y:428
+msgid "second"
+msgstr "sekund"
+
+#: calendar/gui/getdate.y:429
+msgid "sec"
+msgstr "sek"
+
+#: calendar/gui/getdate.y:435
+msgid "tomorrow"
+msgstr "imorgen"
+
+#: calendar/gui/getdate.y:436
+msgid "yesterday"
+msgstr "igår"
+
+#: calendar/gui/getdate.y:437
+msgid "today"
+msgstr "idag"
+
+#: calendar/gui/getdate.y:438
+msgid "now"
+msgstr "nå"
+
+#: calendar/gui/getdate.y:439
+msgid "last"
+msgstr "forrige"
+
+#: calendar/gui/getdate.y:440
+msgid "this"
+msgstr "denne"
+
+#: calendar/gui/getdate.y:441
+msgid "next"
+msgstr "neste"
+
+#: calendar/gui/getdate.y:442
+msgid "first"
+msgstr "første"
+
+#. { N_("second"),		tUNUMBER,	2 },
+#: calendar/gui/getdate.y:444
+msgid "third"
+msgstr "tredje"
+
+#: calendar/gui/getdate.y:445
+msgid "fourth"
+msgstr "fjerde"
+
+#: calendar/gui/getdate.y:446
+msgid "fifth"
+msgstr "femte"
+
+#: calendar/gui/getdate.y:447
+msgid "sixth"
+msgstr "sjette"
+
+#: calendar/gui/getdate.y:448
+msgid "seventh"
+msgstr "syvende"
+
+#: calendar/gui/getdate.y:449
+msgid "eighth"
+msgstr "åttende"
+
+#: calendar/gui/getdate.y:450
+msgid "ninth"
+msgstr "niende"
+
+#: calendar/gui/getdate.y:451
+msgid "tenth"
+msgstr "tiende"
+
+#: calendar/gui/getdate.y:452
+msgid "eleventh"
+msgstr "ellevte"
+
+#: calendar/gui/getdate.y:453
+msgid "twelfth"
+msgstr "tolvte"
+
+#: calendar/gui/getdate.y:454
+msgid "ago"
+msgstr "siden"
+
+#: calendar/gui/gncal-todo.c:137
+msgid "Create to-do item"
+msgstr "Opprett opgavelisteoppføring"
+
+#: calendar/gui/gncal-todo.c:137
+msgid "Edit to-do item"
+msgstr "Redigér oppgavelisteoppføring"
+
+#: calendar/gui/gncal-todo.c:171
+msgid "Summary:"
+msgstr "Sammendrag:"
+
+#: calendar/gui/gncal-todo.c:181
+msgid "Due Date:"
+msgstr "Ferdig-dato:"
+
+#: calendar/gui/gncal-todo.c:190
+msgid "Priority:"
+msgstr "Prioritet:"
+
+#: calendar/gui/gncal-todo.c:206
+msgid "Item Comments:"
+msgstr "Kommentarer for oppføring:"
+
+#: calendar/gui/gncal-todo.c:324
+msgid "Add to-do item..."
+msgstr "Legg til oppgavelisteoppføring..."
+
+#: calendar/gui/gncal-todo.c:325
+msgid "Edit this item..."
+msgstr "Redigér denne oppføringen..."
+
+#: calendar/gui/gncal-todo.c:424
+msgid "Summary"
+msgstr "Sammendrag"
+
+#: calendar/gui/gncal-todo.c:425 calendar/gui/prop.c:604
+msgid "Due Date"
+msgstr "Ferdig-dato"
+
+#: calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:605
+#: mail/message-list.c:655
+msgid "Priority"
+msgstr "Prioritet"
+
+#: calendar/gui/gncal-todo.c:427
+msgid "Time Left"
+msgstr "Gjenstående tid"
+
+#. Label
+#: calendar/gui/gncal-todo.c:439
+msgid "To-do list"
+msgstr "Oppgaveliste"
+
+#. Add
+#: calendar/gui/gncal-todo.c:478
+#: composer/e-msg-composer-address-dialog.glade.h:13
+msgid "Add..."
+msgstr "Legg til..."
+
+#. Edit
+#: calendar/gui/gncal-todo.c:487
+msgid "Edit..."
+msgstr "Redigér..."
+
+#: calendar/gui/gncal-todo.c:711
+msgid "Weeks"
+msgstr "Uker"
+
+#: calendar/gui/gncal-todo.c:712 calendar/gui/gncal-todo.c:716
+msgid "Days"
+msgstr "Dager"
+
+#: calendar/gui/gncal-todo.c:717 calendar/gui/gncal-todo.c:721
+msgid "Hours"
+msgstr "Timer"
+
+#: calendar/gui/gncal-todo.c:717 calendar/gui/gncal-todo.c:721
+msgid "Hour"
+msgstr "Time"
+
+#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
+msgid "Minutes"
+msgstr "Minutter"
+
+#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
+msgid "Minute"
+msgstr "Minutt"
+
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
+msgid "Seconds"
+msgstr "Sekunder"
+
+#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
+msgid "Second"
+msgstr "Send"
+
+#: calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
+#: calendar/gui/gnome-cal.c:1120
+msgid "Reminder of your appointment at "
+msgstr "Påminnelse om din avtale "
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/goto.c:82
+msgid "Year:"
+msgstr "År:"
+
+#: calendar/gui/goto.c:264
+msgid "Go to date"
+msgstr "Gå til dato"
+
+#. 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 ""
+"Vennligst velg datoen du vil gå til.\n"
+"Når du klikker på en dag vil du flytte\n"
+"deg til denne datoen."
+
+#: calendar/gui/goto.c:312
+msgid "Go to today"
+msgstr "Gå til idag"
+
 #: calendar/gui/print.c:265
 msgid "1st"
 msgstr "1"
@@ -1227,205 +2543,6 @@ msgstr "Skriv ut kalender"
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: calendar/gui/e-day-view-time-item.c:391
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters oppdeling"
-
-#: 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:2626
-#: calendar/gui/e-week-view.c:2633 calendar/gui/e-week-view.c:2642
-msgid "New appointment..."
-msgstr "Ny avtale..."
-
-#: calendar/gui/e-day-view.c:2275 calendar/gui/e-day-view.c:2282
-#: calendar/gui/e-week-view.c:2630 calendar/gui/e-week-view.c:2637
-msgid "Edit this appointment..."
-msgstr "Redigér denne avtalen..."
-
-#: calendar/gui/e-day-view.c:2276 calendar/gui/e-week-view.c:2631
-msgid "Delete this appointment"
-msgstr "Slett denne avtalen"
-
-#: calendar/gui/e-day-view.c:2283 calendar/gui/e-week-view.c:2638
-msgid "Make this appointment movable"
-msgstr "Gjør denne avtalen flyttbar"
-
-#: calendar/gui/e-day-view.c:2284 calendar/gui/e-week-view.c:2639
-msgid "Delete this occurrence"
-msgstr "Slett denne oppføringen"
-
-#: calendar/gui/e-day-view.c:2285 calendar/gui/e-week-view.c:2640
-msgid "Delete all occurrences"
-msgstr "Slett alle oppføringer"
-
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "År:"
-
-#: calendar/gui/goto.c:264
-msgid "Go to date"
-msgstr "Gå til dato"
-
-#. 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 ""
-"Vennligst velg datoen du vil gå til.\n"
-"Når du klikker på en dag vil du flytte\n"
-"deg til denne datoen."
-
-#: calendar/gui/goto.c:312
-msgid "Go to today"
-msgstr "Gå til idag"
-
-#: calendar/gui/control-factory.c:136
-#: calendar/gui/evolution-calendar-control.c:131
-msgid "The URI that the calendar will display"
-msgstr "URIen som kalenderen skal vise"
-
-#: calendar/gui/gncal-todo.c:135
-msgid "Create to-do item"
-msgstr "Opprett opgavelisteoppføring"
-
-#: calendar/gui/gncal-todo.c:135
-msgid "Edit to-do item"
-msgstr "Redigér oppgavelisteoppføring"
-
-#: calendar/gui/gncal-todo.c:169
-msgid "Summary:"
-msgstr "Sammendrag:"
-
-#: calendar/gui/gncal-todo.c:179
-msgid "Due Date:"
-msgstr "Ferdig-dato:"
-
-#: calendar/gui/gncal-todo.c:188
-msgid "Priority:"
-msgstr "Prioritet:"
-
-#: calendar/gui/gncal-todo.c:204
-msgid "Item Comments:"
-msgstr "Kommentarer for oppføring:"
-
-#: calendar/gui/gncal-todo.c:320
-msgid "Add to-do item..."
-msgstr "Legg til oppgavelisteoppføring..."
-
-#: calendar/gui/gncal-todo.c:321
-msgid "Edit this item..."
-msgstr "Redigér denne oppføringen..."
-
-#: calendar/gui/gncal-todo.c:420
-msgid "Summary"
-msgstr "Sammendrag"
-
-#: calendar/gui/gncal-todo.c:421 calendar/gui/prop.c:604
-msgid "Due Date"
-msgstr "Ferdig-dato"
-
-#: calendar/gui/gncal-todo.c:422 calendar/gui/prop.c:605
-#: mail/message-list.c:589
-msgid "Priority"
-msgstr "Prioritet"
-
-#: calendar/gui/gncal-todo.c:423
-msgid "Time Left"
-msgstr "Gjenstående tid"
-
-#. Label
-#: calendar/gui/gncal-todo.c:435
-msgid "To-do list"
-msgstr "Oppgaveliste"
-
-#. Add
-#: calendar/gui/gncal-todo.c:474
-msgid "Add..."
-msgstr "Legg til..."
-
-#. Edit
-#: calendar/gui/gncal-todo.c:483
-msgid "Edit..."
-msgstr "Redigér..."
-
-#: calendar/gui/gncal-todo.c:707
-msgid "Weeks"
-msgstr "Uker"
-
-#: calendar/gui/gncal-todo.c:708 calendar/gui/gncal-todo.c:712
-msgid "Days"
-msgstr "Dager"
-
-#: calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717
-msgid "Hours"
-msgstr "Timer"
-
-#: calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717
-msgid "Hour"
-msgstr "Time"
-
-#: calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
-msgid "Minutes"
-msgstr "Minutter"
-
-#: calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
-msgid "Minute"
-msgstr "Minutt"
-
-#: calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
-msgid "Seconds"
-msgstr "Sekunder"
-
-#: calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
-msgid "Second"
-msgstr "Send"
-
-#: calendar/gui/gnome-cal.c:452 calendar/gui/gnome-cal.c:1091
-#: calendar/gui/gnome-cal.c:1147
-msgid "Reminder of your appointment at "
-msgstr "Påminnelse om din avtale "
-
-#: calendar/gui/gnome-cal.c:1083
-msgid "Snooze"
-msgstr "Utsett"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1096 calendar/gui/gnome-cal.c:1151
-msgid "Ok"
-msgstr "Ok"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Søn"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Man"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Tir"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Ons"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Tor"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Fre"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Lør"
-
 #: calendar/gui/prop.c:330
 msgid "Time display"
 msgstr "Tidsvisning"
@@ -1521,10 +2638,6 @@ msgstr "Egenskaper for oppgaveliste"
 msgid "To Do List"
 msgstr "Oppgaveliste"
 
-#: calendar/gui/prop.c:780
-msgid "Alarms"
-msgstr "Alarmer"
-
 #. build miscellaneous box
 #: calendar/gui/prop.c:783
 msgid "Alarm Properties"
@@ -1571,80 +2684,7 @@ msgstr "gnome-ukjent.xpm"
 msgid "Enabled"
 msgstr "På"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:181
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm på %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 "Melding om din avtale på %A %b %d %Y %H:%M"
-
-#: calendar/gui/event-editor.c:289
-msgid "Edit Appointment"
-msgstr "Rediger avtale"
-
-#: calendar/gui/event-editor.c:294
-msgid "No summary"
-msgstr "Ingen sammendrag"
-
-#: calendar/gui/event-editor.c:298
-#, c-format
-msgid "Appointment - %s"
-msgstr "Avtale - %s"
-
-#: calendar/gui/event-editor.c:301
-#, c-format
-msgid "Task - %s"
-msgstr "Oppgave - %s"
-
-#: calendar/gui/event-editor.c:304
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Journaloppføring - %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 ""
-
-#: calendar/gui/event-editor.c:1250
-msgid "FIXME: Chec_k Names"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1251
-msgid "FIXME: Address _Book..."
-msgstr ""
-
-#: calendar/gui/event-editor.c:1258
-#, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "_Avtale"
-
-#: calendar/gui/event-editor.c:1260
-msgid "FIXME: Rec_urrence..."
-msgstr ""
-
-#: calendar/gui/event-editor.c:1262
-msgid "FIXME: Intive _Attendees..."
-msgstr ""
-
-#: calendar/gui/event-editor.c:1263
-msgid "FIXME: C_ancel Invitation..."
-msgstr ""
-
-#: calendar/gui/event-editor.c:1265
-msgid "FIXME: Forward as v_Calendar"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1745
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:690
+#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:752
 msgid "Cut"
 msgstr "Klipp ut"
 
@@ -1652,7 +2692,7 @@ msgstr "Klipp ut"
 msgid "Cut selected item into clipboard"
 msgstr "Klipp ut valgt oppføring til utklippstavlen"
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:691
+#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:753
 msgid "Copy"
 msgstr "Kopiér"
 
@@ -1661,7 +2701,7 @@ msgid "Copy selected item into clipboard"
 msgstr "Kopiér valgt oppføring til utklippstavlen"
 
 #: 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 composer/e-msg-composer.c:754
 msgid "Paste"
 msgstr "Lim inn"
 
@@ -1674,6 +2714,59 @@ msgstr "Lim inn fra utklippstavlen"
 msgid "Select recipients' addresses"
 msgstr "Velg mottakerenes adresser"
 
+#.
+#. * 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 "Mottakerliste:"
+
+#: composer/e-msg-composer-address-dialog.glade.h:8
+msgid "Name:"
+msgstr "Navn:"
+
+#: composer/e-msg-composer-address-dialog.glade.h:9
+msgid "Search..."
+msgstr "Søk..."
+
+#: composer/e-msg-composer-address-dialog.glade.h:10 mail/mail-config.c:1716
+msgid "Name"
+msgstr "Navn"
+
+#: composer/e-msg-composer-address-dialog.glade.h:11 mail/mail-config.c:1716
+msgid "Address"
+msgstr "Adresse"
+
+#: composer/e-msg-composer-address-dialog.glade.h:12
+msgid "Properties..."
+msgstr "Egenskaper..."
+
+#: composer/e-msg-composer-address-dialog.glade.h:14
+msgid "To: >>"
+msgstr "Til: >>"
+
+#: composer/e-msg-composer-address-dialog.glade.h:15
+msgid "Cc: >>"
+msgstr "Cc: >>"
+
+#: composer/e-msg-composer-address-dialog.glade.h:16
+msgid "Bcc: >>"
+msgstr "Bcc: >>"
+
+#: composer/e-msg-composer-address-dialog.glade.h:17
+msgid "label9"
+msgstr "etikett9"
+
+#: composer/e-msg-composer-address-dialog.glade.h:18
+msgid "label7"
+msgstr "etikett7"
+
+#: composer/e-msg-composer-address-dialog.glade.h:19
+msgid "label8"
+msgstr "etikett8"
+
 #: composer/e-msg-composer-attachment-bar.c:76
 msgid "1 byte"
 msgstr "1 byte"
@@ -1718,6 +2811,23 @@ msgstr "Legg til vedlegg..."
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
+#.
+#. * 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
+msgid "Attachment properties"
+msgstr "Egenskaper for vedlegg"
+
+#: composer/e-msg-composer-attachment.glade.h:8
+msgid "MIME type:"
+msgstr "MIME-type:"
+
+#: composer/e-msg-composer-attachment.glade.h:10
+msgid "File name:"
+msgstr "Filnavn:"
+
 #: composer/e-msg-composer-hdrs.c:89
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
@@ -1758,80 +2868,123 @@ msgstr "Emne:"
 msgid "Enter the subject of the mail"
 msgstr "Skriv inn emnet for meldingen"
 
-#: composer/e-msg-composer.c:492
-msgid "Open file"
-msgstr "Åpne fil"
+#: composer/e-msg-composer.c:459
+msgid "Save as..."
+msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:502
+#: composer/e-msg-composer.c:470
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Feil under lagring av fil: %s"
+
+#: composer/e-msg-composer.c:490
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:543
+#: composer/e-msg-composer.c:539
+msgid "Open file"
+msgstr "Åpne fil"
+
+#: composer/e-msg-composer.c:605
 msgid "Discard this message?"
 msgstr "Forkast denne meldingen?"
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:710
 msgid "Save in _folder..."
 msgstr "Lagre i _mappe..."
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:710
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: composer/e-msg-composer.c:651 composer/e-msg-composer.c:688
+#: composer/e-msg-composer.c:713 composer/e-msg-composer.c:750
 #: mail/folder-browser-factory.c:36
 msgid "Send"
 msgstr "Send"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:713
 msgid "Send the message"
 msgstr "Send meldingen"
 
-#: composer/e-msg-composer.c:659
+#: composer/e-msg-composer.c:721
 msgid "View _attachments"
 msgstr "Vis _vedlegg"
 
-#: composer/e-msg-composer.c:659
+#: composer/e-msg-composer.c:721
 msgid "View/hide attachments"
 msgstr "Vis/skjul vedlegg"
 
-#: composer/e-msg-composer.c:688
+#: composer/e-msg-composer.c:750
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: composer/e-msg-composer.c:690
+#: composer/e-msg-composer.c:752
 msgid "Cut selected region into the clipboard"
 msgstr "Klipp ut valgt område til utklippstavlen"
 
-#: composer/e-msg-composer.c:691
+#: composer/e-msg-composer.c:753
 msgid "Copy selected region into the clipboard"
 msgstr "Kopiér valgt område til utklippstavlen"
 
-#: composer/e-msg-composer.c:692
+#: composer/e-msg-composer.c:754
 msgid "Paste selected region into the clipboard"
 msgstr "Lim inn valgt område til utklippstavlen"
 
-#: composer/e-msg-composer.c:693
+#: composer/e-msg-composer.c:755
 msgid "Undo"
 msgstr "Angre"
 
-#: composer/e-msg-composer.c:693
+#: composer/e-msg-composer.c:755
 msgid "Undo last operation"
 msgstr "Angre siste operasjon"
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:757
 msgid "Attach"
 msgstr "Legg ved"
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:757
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer.c:857
+#: composer/e-msg-composer.c:919
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
+#: filter/filter-editor.c:201
+msgid "Edit Filter"
+msgstr "Rediger filter"
+
+#: filter/filter-editor.c:201
+msgid "Create filter"
+msgstr "Opprett filter"
+
+#: filter/filter-editor.c:212
+msgid "Back"
+msgstr "Tilbake"
+
+#: filter/filter-editor.c:214
+msgid "Finish"
+msgstr "Fullfør"
+
+#: filter/filter-editor.c:215
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: filter/filter-editor.c:219
+msgid "Apply"
+msgstr "Bruk"
+
+#: filter/filter-editor.c:236
+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:184
+msgid "Cannot initialize Evolution's mail component."
+msgstr "Kan ikke initialisere Evolutions e-postkomponent."
+
 #: mail/folder-browser-factory.c:35
 msgid "Get mail"
 msgstr "Hent e-post"
@@ -2007,14 +3160,6 @@ msgid "Add Source"
 msgstr "Legg til kilde"
 
 #: mail/mail-config.c:1716
-msgid "Name"
-msgstr "Navn"
-
-#: mail/mail-config.c:1716
-msgid "Address"
-msgstr "Adresse"
-
-#: mail/mail-config.c:1716
 msgid "Organization"
 msgstr "Organisasjon"
 
@@ -2030,10 +3175,6 @@ msgstr "Konfigurasjon av Camel tilbyder"
 msgid "Identities"
 msgstr "Identiteter"
 
-#: mail/mail-config.c:1847 mail/mail-config.c:1943
-msgid "Add"
-msgstr "Legg til"
-
 #: mail/mail-config.c:1856 mail/mail-config.c:1952
 msgid "Edit"
 msgstr "Rediger"
@@ -2054,93 +3195,81 @@ msgstr "Transporter"
 msgid "Send messages in HTML format"
 msgstr "Send meldinger i HTML-format"
 
+#: mail/mail-ops.c:334
+msgid "Fetching mail"
+msgstr "Henter e-post"
+
+#: mail/mail-ops.c:346
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Denne meldingen har ikke emne.\n"
+"Send likevel?"
+
+#: 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 "Kan ikke opprette dialogboks."
+
+#: mail/mail-threads.c:849
+msgid "User cancelled query."
+msgstr ""
+
 #: mail/main.c:58
 msgid "Mail Component: I could not initialize Bonobo"
 msgstr "E-post komponent: Kunne ikke initialisere Bonobo"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:641
 msgid "Online Status"
 msgstr "Tilkoblet status"
 
-#: mail/message-list.c:610
+#: mail/message-list.c:676
 msgid "Subject"
 msgstr "Emne"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:683
 msgid "Date"
 msgstr "Dato"
 
-#: mail/message-list.c:624
-msgid "Receive"
-msgstr "Motta"
+#: mail/message-list.c:690
+msgid "Received"
+msgstr "Mottatt"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:704
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/component-factory.c:173
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Kan ikke initialisere Evolutions e-postkomponent."
-
-#: shell/main.c:99
-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 ""
-"Hei. Takk for at du har tatt deg tid til å laste ned denne prøveversjonen\n"
-"av Evolution gruppevare-suiten.\n"
-"\n"
-"Evolution utviklerene har arbeidet hardt for å gjøre Evolution så\n"
-"robust, utvidbart, pent, raskt og passende for tunge internettbrukere\n"
-"som overhodet mulig. Og vi er utslitt. Men vi er ikke ferdig -- ikke ennå.\n"
-"\n"
-"Ettersom du utforsker Evolution, vennligst prøv å forstå at det meste av\n"
-"arbeidet har vært fokusert på fundamentet som ligger under hele systemet\n"
-"og ikke på brukergrensesnittet. Vi er i ferd med å bestige denne høyden \n"
-"nå, og vil bruke det meste av vår tid og kjærlighet på brukergrensesnittet\n"
-"fra nå av. Men du vil i det minste ikke måtte bruke en ren demoversjon.\n"
-"\n"
-"Så, nå det det dags for den nerdete meldingen: Evolution vil: krasje,\n"
-"ødelegge din mail, etterlate seg tapte prosesser, oppta 100% av din CPU,\n"
-"låse seg, sende HTML e-post til tilfeldige e-post lister, og drite deg ut\n"
-"foran dine venner og kolleger. Bruk det på egen risiko.\n"
-"\n"
-"Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
-"spenning på at du tilbyr din hjelp!\n"
+#: notes/component-factory.c:27
+msgid "Create a new note"
+msgstr "Opprett et nytt notat"
 
-#: shell/main.c:128
-msgid ""
-"Thanks\n"
-"The Evolution Team\n"
-msgstr ""
-"Takk\n"
-"Evolution utviklerene\n"
+#: notes/component-factory.c:147
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Kan ikke initialisere Evolutions notatkomponent."
 
-#: shell/main.c:169
-msgid "Cannot initialize the Evolution shell."
-msgstr "Kan ikke initialisere Evolution skallet."
+#: notes/main.c:30
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Notatkomponent: Kunne ikke initialisere Bonobo"
 
-#: shell/main.c:205
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
+#: shell/e-init.c:25
+msgid "Evolution can not create its local folders"
+msgstr "Evolution kan ikke opprette sine lokale mapper"
 
 #: shell/e-setup.c:47
 msgid "Evolution installation"
@@ -2166,7 +3295,7 @@ msgstr ""
 "Feil: %s"
 
 #: shell/e-setup.c:84
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
@@ -2189,69 +3318,31 @@ msgstr ""
 "Venligst fjern denne for å tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-shell-view.c:112
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:207
-msgid "Folders"
-msgstr "Mapper"
-
-#: shell/e-shell-view.c:575
-msgid "None"
-msgstr "Ingen"
-
-#: shell/e-shell-view.c:579
+#: shell/e-shell-folder-creation-dialog.c:81
 #, c-format
-msgid "Evolution - %s"
-msgstr "Evolution - %s"
+msgid ""
+"Cannot create the specified folder:\n"
+"%s"
+msgstr ""
+"Kan ikke opprette spesifisert katalog:\n"
+"%s"
 
-#: shell/e-shell-view.c:647
-#, c-format
-msgid "Cannot open location: %s"
-msgstr "Kan ikke åpne lokasjon: %s"
+#: shell/e-shell-folder-creation-dialog.c:133
+msgid "The specified folder name is not valid."
+msgstr ""
 
-#: shell/e-shell.c:250
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan ikke sette opp lokal lagring -- %s"
+#: shell/e-shell-folder-creation-dialog.c:223
+msgid "Evolution - Create new folder"
+msgstr "Evolution - Lag ny mappe"
+
+#: shell/e-shell-folder-selection-dialog.c:155
+msgid "New..."
+msgstr "Ny..."
 
 #: shell/e-shell-folder-title-bar.c:353
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shortcut.c:469
-msgid "New group"
-msgstr "Ny gruppe"
-
-#: shell/e-shortcuts-view.c:235
-msgid "_Small icons"
-msgstr "_Små ikoner"
-
-#: shell/e-shortcuts-view.c:236
-msgid "Show the shortcuts as small icons"
-msgstr "Vis snarveier som små ikoner"
-
-#: shell/e-shortcuts-view.c:238
-msgid "_Large icons"
-msgstr "Store i_koner"
-
-#: shell/e-shortcuts-view.c:239
-msgid "Show the shortcuts as large icons"
-msgstr "Vis snarveier som store ikoner"
-
-#: shell/e-shortcuts-view.c:329
-msgid "Activate"
-msgstr "Aktiver"
-
-#: shell/e-shortcuts-view.c:329
-msgid "Activate this shortcut"
-msgstr "Aktiver denne snarveien"
-
-#: shell/e-shortcuts-view.c:332
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Fjern denne snarveien fra snarveilinjen"
-
 #. you might have to call gnome_dialog_run() on the
 #. * dialog returned here, I don't remember...
 #.
@@ -2402,14 +3493,246 @@ msgstr "Send feilrapport med bug-buddy"
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: shell/e-init.c:25
-msgid "Evolution can not create its local folders"
-msgstr "Evolution kan ikke opprette sine lokale mapper"
+#: shell/e-shell-view.c:112
+msgid "(No folder displayed)"
+msgstr "(Ingen mappe vist)"
+
+#: shell/e-shell-view.c:207
+msgid "Folders"
+msgstr "Mapper"
+
+#: shell/e-shell-view.c:579
+#, c-format
+msgid "Evolution - %s"
+msgstr "Evolution - %s"
+
+#: shell/e-shell-view.c:647
+#, c-format
+msgid "Cannot open location: %s"
+msgstr "Kan ikke åpne lokasjon: %s"
+
+#: shell/e-shell.c:256
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan ikke sette opp lokal lagring -- %s"
+
+#: shell/e-shortcut.c:469
+msgid "New group"
+msgstr "Ny gruppe"
+
+#: shell/e-shortcuts-view.c:235
+msgid "_Small icons"
+msgstr "_Små ikoner"
+
+#: shell/e-shortcuts-view.c:236
+msgid "Show the shortcuts as small icons"
+msgstr "Vis snarveier som små ikoner"
+
+#: shell/e-shortcuts-view.c:238
+msgid "_Large icons"
+msgstr "Store i_koner"
+
+#: shell/e-shortcuts-view.c:239
+msgid "Show the shortcuts as large icons"
+msgstr "Vis snarveier som store ikoner"
+
+#: shell/e-shortcuts-view.c:329
+msgid "Activate"
+msgstr "Aktiver"
+
+#: shell/e-shortcuts-view.c:329
+msgid "Activate this shortcut"
+msgstr "Aktiver denne snarveien"
+
+#: shell/e-shortcuts-view.c:332
+msgid "Remove this shortcut from the shortcut bar"
+msgstr "Fjern denne snarveien fra snarveilinjen"
 
 #: shell/e-shortcuts.c:358
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
+#: shell/e-storage.c:217
+msgid "(No name)"
+msgstr "(Uten navn)"
+
+#: shell/e-storage.c:412
+msgid "No error"
+msgstr "Ingen feil"
+
+#: shell/e-storage.c:414
+msgid "Generic error"
+msgstr "Vanlig feil"
+
+#: shell/e-storage.c:416
+msgid "A folder with the same name already exists"
+msgstr "En mappe med samme navn eksisterer allerede"
+
+#: shell/e-storage.c:418
+msgid "The specified folder type is not valid"
+msgstr "Spesifisert mappetype er ikke gyldig"
+
+#: shell/e-storage.c:420
+msgid "I/O error"
+msgstr "I/U-feil"
+
+#: shell/e-storage.c:422
+msgid "Not enough space to create the folder"
+msgstr "Ikke nok plass til å opprette mappen"
+
+#: shell/e-storage.c:424
+msgid "The specified folder was not found"
+msgstr "Spesifisert mappe ble ikke funnet"
+
+#: shell/e-storage.c:426
+msgid "Function not implemented in this storage"
+msgstr ""
+
+#: shell/e-storage.c:428
+msgid "Permission denied"
+msgstr "Tilgang nektet"
+
+#: shell/e-storage.c:430
+msgid "Operation not supported"
+msgstr "Operasjonen er ikke støttet"
+
+#: 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 "Ukjent feil"
+
+#: shell/main.c:99
+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 ""
+"Hei. Takk for at du har tatt deg tid til å laste ned denne prøveversjonen\n"
+"av Evolution gruppevare-suiten.\n"
+"\n"
+"Evolution utviklerene har arbeidet hardt for å gjøre Evolution så\n"
+"robust, utvidbart, pent, raskt og passende for tunge internettbrukere\n"
+"som overhodet mulig. Og vi er utslitt. Men vi er ikke ferdig -- ikke ennå.\n"
+"\n"
+"Ettersom du utforsker Evolution, vennligst prøv å forstå at det meste av\n"
+"arbeidet har vært fokusert på fundamentet som ligger under hele systemet\n"
+"og ikke på brukergrensesnittet. Vi er i ferd med å bestige denne høyden \n"
+"nå, og vil bruke det meste av vår tid og kjærlighet på brukergrensesnittet\n"
+"fra nå av. Men du vil i det minste ikke måtte bruke en ren demoversjon.\n"
+"\n"
+"Så, nå det det dags for den nerdete meldingen: Evolution vil: krasje,\n"
+"ødelegge din mail, etterlate seg tapte prosesser, oppta 100% av din CPU,\n"
+"låse seg, sende HTML e-post til tilfeldige e-post lister, og drite deg ut\n"
+"foran dine venner og kolleger. Bruk det på egen risiko.\n"
+"\n"
+"Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
+"spenning på at du tilbyr din hjelp!\n"
+
+#: shell/main.c:128
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"Takk\n"
+"Evolution utviklerene\n"
+
+#: shell/main.c:169
+msgid "Cannot initialize the Evolution shell."
+msgstr "Kan ikke initialisere Evolution skallet."
+
+#: shell/main.c:205
+msgid "Cannot initialize the Bonobo component system."
+msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
+
+#.
+#. * 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 "Felt"
+
+#: widgets/e-table/e-table-config.glade.h:8
+msgid "Grouping"
+msgstr "Gruppering"
+
+#: widgets/e-table/e-table-config.glade.h:9
+msgid "Sort"
+msgstr "Sorter"
+
+#: widgets/e-table/e-table-config.glade.h:10
+msgid "Filter"
+msgstr "Filter"
+
+#.
+#. * 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
+msgid "Field Chooser"
+msgstr ""
+
+#: 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 ""
+
+#: widgets/e-table/e-table-group.glade.h:9
+msgid "label1"
+msgstr ""
+
+#: widgets/e-table/e-table-group.glade.h:10
+msgid "Show in this order"
+msgstr "Vis i denne rekkefølgen"
+
+#: widgets/e-table/e-table-group.glade.h:11
+msgid "label2"
+msgstr "etikett2"
+
+#: widgets/e-table/e-table-group.glade.h:12
+msgid "Add >>"
+msgstr "Legg til >>"
+
+#: widgets/e-table/e-table-group.glade.h:13
+msgid "<< Remove"
+msgstr "<< Fjern"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Tentativ"
@@ -2486,26 +3809,11 @@ msgstr "Tid for møtets slutt:"
 msgid "All Attendees"
 msgstr "Alle deltakere"
 
-#: widgets/shortcut-bar/e-group-bar.c:631
-#, c-format
-msgid "Group %i"
-msgstr "Gruppe %i"
-
 #: widgets/misc/e-clipped-label.c:106
 msgid "..."
 msgstr "..."
 
-#~ msgid "IMAP server replied using unknown tokens.\n"
-#~ msgstr "IMAP-tjener svarte med ukjente tegn.\n"
-
-#~ msgid "IMAP responded with \"no such message\".\n"
-#~ msgstr "IMAP-tjener svarte med \"ingen slik melding\".\n"
-
-#~ msgid "Connecting to IMAP server (%s)..."
-#~ msgstr "Kobler til IMAP-tjener (%s)..."
-
-#~ msgid "failed.\n"
-#~ msgstr "feilet.\n"
-
-#~ msgid "success.\n"
-#~ msgstr "suksess.\n"
+#: widgets/shortcut-bar/e-group-bar.c:631
+#, c-format
+msgid "Group %i"
+msgstr "Gruppe %i"