aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2001-09-29 16:25:46 +0800
committerKjartan Maraas <kmaraas@src.gnome.org>2001-09-29 16:25:46 +0800
commit46e92c6efdcbba1be9d3b6db6d2153e55937798b (patch)
tree7c3f8a7366cb54731f7012f89ddb7832d9bd223d /po
parent11b30502cd6b5b8b9679c21e57fd11d49725d375 (diff)
downloadgsoc2013-evolution-46e92c6efdcbba1be9d3b6db6d2153e55937798b.tar
gsoc2013-evolution-46e92c6efdcbba1be9d3b6db6d2153e55937798b.tar.gz
gsoc2013-evolution-46e92c6efdcbba1be9d3b6db6d2153e55937798b.tar.bz2
gsoc2013-evolution-46e92c6efdcbba1be9d3b6db6d2153e55937798b.tar.lz
gsoc2013-evolution-46e92c6efdcbba1be9d3b6db6d2153e55937798b.tar.xz
gsoc2013-evolution-46e92c6efdcbba1be9d3b6db6d2153e55937798b.tar.zst
gsoc2013-evolution-46e92c6efdcbba1be9d3b6db6d2153e55937798b.zip
Updated Norwegian (bokmål) translation.
2001-09-29 Kjartan Maraas <kmaraas@gnome.org> * no.po: Updated Norwegian (bokmål) translation. svn path=/trunk/; revision=13247
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog4
-rw-r--r--po/no.po1911
2 files changed, 1047 insertions, 868 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 9f0ce10edd..59cf23c138 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-29 Kjartan Maraas <kmaraas@gnome.org>
+
+ * no.po: Updated Norwegian (bokmål) translation.
+
2001-09-29 Carlos Perelló Marín <carlos@gnome-db.org>
* es.po: Fixed /s/M/2º Nombre/ where M is Middle in english. A better
diff --git a/po/no.po b/po/no.po
index b53164f8ff..b3ca1a6258 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gnome-applets 1.4.1\n"
-"POT-Creation-Date: 2001-09-22 12:32+0200\n"
-"PO-Revision-Date: 2001-09-22 12:33+0200\n"
+"POT-Creation-Date: 2001-09-29 10:08+0200\n"
+"PO-Revision-Date: 2001-09-29 10:19+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
"MIME-Version: 1.0\n"
@@ -31,276 +31,276 @@ msgid "Name"
msgstr "Navn"
#: addressbook/backend/ebook/e-card-simple.c:60
-msgid "Family Name"
-msgstr "Etternavn"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
#: addressbook/gui/widgets/e-addressbook-view.c:870
msgid "Email"
msgstr "E-post"
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
#: addressbook/gui/contact-editor/e-contact-editor.c:1609
msgid "Primary"
msgstr "Primær"
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
msgid "Prim"
msgstr "Pri"
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
#: addressbook/gui/contact-editor/e-contact-editor.c:1594
#: addressbook/gui/widgets/e-addressbook-view.c:902
msgid "Assistant"
msgstr "Assistent"
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
#: addressbook/gui/contact-editor/e-contact-editor.c:1595
#: addressbook/gui/contact-editor/e-contact-editor.c:1662
msgid "Business"
msgstr "Arbeid"
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
msgid "Bus"
msgstr "Buss"
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/gui/contact-editor/e-contact-editor.c:1598
msgid "Callback"
msgstr "Tilbakering"
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
#: addressbook/gui/contact-editor/e-contact-editor.c:1600
msgid "Company"
msgstr "Firma"
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
msgid "Comp"
msgstr "Datamaskin"
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
#: addressbook/gui/contact-editor/e-contact-editor.c:1601
#: addressbook/gui/contact-editor/e-contact-editor.c:1663
msgid "Home"
msgstr "Hjemme"
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
#: addressbook/gui/widgets/e-addressbook-view.c:877
msgid "Organization"
msgstr "Organisasjon"
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
msgid "Org"
msgstr "Org"
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
#: addressbook/gui/contact-editor/e-contact-editor.c:1605
msgid "Mobile"
msgstr "Mobil"
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
#: addressbook/gui/contact-editor/e-contact-editor.c:1599
msgid "Car"
msgstr "Bil"
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
#: addressbook/gui/contact-editor/e-contact-editor.c:1597
#: addressbook/gui/widgets/e-addressbook-view.c:882
msgid "Business Fax"
msgstr "Faks på arbeid"
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
msgid "Bus Fax"
msgstr "Faks i buss"
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
#: addressbook/gui/contact-editor/e-contact-editor.c:1603
#: addressbook/gui/widgets/e-addressbook-view.c:883
msgid "Home Fax"
msgstr "Faks hjemme"
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
#: addressbook/gui/contact-editor/e-contact-editor.c:1596
msgid "Business 2"
msgstr "Arbeid 2"
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
msgid "Bus 2"
msgstr "Buss 2"
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
#: addressbook/gui/contact-editor/e-contact-editor.c:1602
msgid "Home 2"
msgstr "Hjemme 2"
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
#: addressbook/gui/contact-editor/e-contact-editor.c:1604
#: addressbook/gui/widgets/e-addressbook-view.c:886
msgid "ISDN"
msgstr "ISDN"
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
#: addressbook/gui/contact-editor/e-contact-editor.c:1606
#: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
msgid "Other"
msgstr "Andre"
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
#: addressbook/gui/contact-editor/e-contact-editor.c:1607
#: addressbook/gui/widgets/e-addressbook-view.c:888
msgid "Other Fax"
msgstr "Annen faks"
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
#: addressbook/gui/contact-editor/e-contact-editor.c:1608
#: addressbook/gui/widgets/e-addressbook-view.c:889
msgid "Pager"
msgstr "Personsøker"
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
#: addressbook/gui/contact-editor/e-contact-editor.c:1610
#: addressbook/gui/widgets/e-addressbook-view.c:890
msgid "Radio"
msgstr "Radio"
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
#: addressbook/gui/contact-editor/e-contact-editor.c:1611
#: addressbook/gui/widgets/e-addressbook-view.c:891
msgid "Telex"
msgstr "Teleks"
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
#: addressbook/gui/widgets/e-addressbook-view.c:892
msgid "TTY"
msgstr "TTY"
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
#: addressbook/gui/component/e-address-popup.c:476
#: addressbook/gui/contact-editor/e-contact-editor.c:1637
#: addressbook/gui/widgets/e-addressbook-view.c:894
msgid "Email 2"
msgstr "E-post 2"
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
#: addressbook/gui/component/e-address-popup.c:486
#: addressbook/gui/contact-editor/e-contact-editor.c:1638
#: addressbook/gui/widgets/e-addressbook-view.c:895
msgid "Email 3"
msgstr "E-post 3"
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
#: addressbook/gui/widgets/e-addressbook-view.c:896
msgid "Web Site"
msgstr "Nettside"
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
msgid "Url"
msgstr "Url"
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
#: addressbook/gui/widgets/e-addressbook-view.c:897
msgid "Department"
msgstr "Avdeling"
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
msgid "Dep"
msgstr "Avd"
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
#: addressbook/gui/widgets/e-addressbook-view.c:898
msgid "Office"
msgstr "Kontor"
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
msgid "Off"
msgstr "Av"
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
#: addressbook/gui/widgets/e-addressbook-view.c:899
msgid "Title"
msgstr "Tittel"
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
#: addressbook/gui/widgets/e-addressbook-view.c:900
msgid "Profession"
msgstr "Yrke"
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
msgid "Prof"
msgstr "Yrke"
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
#: addressbook/gui/widgets/e-addressbook-view.c:901
msgid "Manager"
msgstr "Leder"
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
msgid "Man"
msgstr "Mann"
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
msgid "Ass"
msgstr "Ass"
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
#: addressbook/gui/widgets/e-addressbook-view.c:903
msgid "Nickname"
msgstr "Kallenavn"
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
msgid "Nick"
msgstr "Kallenavn"
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
#: addressbook/gui/widgets/e-addressbook-view.c:904
msgid "Spouse"
msgstr "Ektefelle"
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
#: addressbook/gui/widgets/e-addressbook-view.c:905
msgid "Note"
msgstr "Kommentar"
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
msgid "Calendar URI"
msgstr "Kalender URI"
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
msgid "CALUri"
msgstr "CALUri"
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
#: addressbook/gui/widgets/e-addressbook-view.c:906
msgid "Free-busy URL"
msgstr "Fri-ledig URL"
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
msgid "FBUrl"
msgstr "FBUrl"
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
msgid "Anniversary"
msgstr "Bryllupsdag"
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
msgid "Anniv"
msgstr "Br.dag"
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
msgid "Birth Date"
msgstr "Fødselsdato"
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
#: calendar/gui/e-calendar-table.etspec.h:4
msgid "Categories"
msgstr "Kategorier"
+#: addressbook/backend/ebook/e-card-simple.c:103
+msgid "Family Name"
+msgstr "Etternavn"
+
#: addressbook/backend/ebook/e-card.c:3564
msgid "Card: "
msgstr "Kort: "
@@ -600,10 +600,10 @@ msgstr "VCard for %s"
#: addressbook/backend/ebook/load-pine-addressbook.c:22
#: addressbook/backend/ebook/test-client-list.c:23
#: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1119
+#: addressbook/conduit/address-conduit.c:1167
#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1220
+#: calendar/conduits/todo/todo-conduit.c:1034
#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
msgid "Could not initialize Bonobo"
msgstr "Kunne ikke initialisere Bonobo"
@@ -662,20 +662,20 @@ msgstr "Markøren kunne ikke lokaliseres\n"
msgid "EBook not loaded\n"
msgstr "EBook ikke lastet\n"
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:795
+#: calendar/conduits/todo/todo-conduit.c:609
msgid "Could not start wombat server"
msgstr "Kunne ikke starte wombat tjener"
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:796
+#: calendar/conduits/todo/todo-conduit.c:610
msgid "Could not start wombat"
msgstr "Kunne ikke starte wombat"
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
msgid "Could not read pilot's Address application block"
msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
@@ -720,8 +720,8 @@ msgid "Factory for the sample Addressbook control"
msgstr "Factory for eksempelkontroll for adressebok"
#: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
#: shell/e-shortcuts.c:1062
msgid "Contacts"
msgstr "Kontakter"
@@ -738,20 +738,20 @@ msgstr "LDAP-tjener"
msgid "LDAP server containing contact information"
msgstr "LDAP-tjener some inneholder kontaktinformasjon"
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
#: ui/evolution-addressbook.xml.h:11
msgid "New Contact"
msgstr "Ny kontakt"
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
msgid "New _Contact"
msgstr "Ny _kontakt"
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
msgid "New Contact List"
msgstr "Ny kontaktliste"
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
msgid "New Contact _List"
msgstr "Ny kontakt_liste"
@@ -857,15 +857,15 @@ msgid "_Account name:"
msgstr "Konton_avn:"
#: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
msgid "_Add"
msgstr "_Legg til"
#: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:48
@@ -985,7 +985,7 @@ msgid "(none)"
msgstr "(ingen)"
#: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
#: addressbook/gui/contact-editor/e-contact-editor.c:1636
msgid "Primary Email"
msgstr "Primær e-post"
@@ -1156,117 +1156,126 @@ msgid "Details"
msgstr "Detaljer"
#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "F_ree/Busy URL:"
+msgstr "L_edig/opptatt URL:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
msgid "File A_s:"
msgstr "Lagre _som:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
msgid "General"
msgstr "Generelt"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+"Hvis en person publiserer ledig-/opptatt informasjon eller annen kalenderinformasjon på internett, skriv inn adressen\n"
+"til denne informasjonen her."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
msgid "New phone type"
msgstr "Ny telefontype"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
msgid "No_tes:"
msgstr "No_tater:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
msgid "Organi_zation:"
msgstr "Organisas_jon:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
msgid "Phone Types"
msgstr "Telefontyper"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
msgid "Wants to receive _HTML mail"
msgstr "Vil motta _HTML e-post"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
msgid "_Address..."
msgstr "_Adresse..."
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
msgid "_Assistant's name:"
msgstr "Assistents navn"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
msgid "_Birthday:"
msgstr "Fø_dselsdag:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
msgid "_Business"
msgstr "Ar_beid"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Calendar Information:"
-msgstr "_Kalenderinformasjon:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
#: calendar/gui/dialogs/event-page.glade.h:12
#: calendar/gui/dialogs/task-page.glade.h:10
msgid "_Contacts..."
msgstr "_Kontakter..."
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:36
msgid "_Delete"
msgstr "_Slett"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "_Department:"
msgstr "Av_deling:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "_Free/Busy Information:"
-msgstr "_Ledig/opptatt-informasjon"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "_Full Name..."
msgstr "_Fullt navn..."
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
msgid "_Home"
msgstr "_Hjemme"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "_Job title:"
msgstr "_Jobbtittel:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "_Manager's Name:"
msgstr "_Leders navn:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "_Mobile"
msgstr "_Mobil"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "_Nickname:"
msgstr "Kalle_navn:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "_Office:"
msgstr "Kont_or:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
msgid "_Profession:"
msgstr "_Yrke:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Public Calendar URL:"
+msgstr "_Offentlig kalender URL:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "_Spouse:"
msgstr "Ekte_felle:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "_This is the mailing address"
msgstr "De_tte er postadressen"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "_Web page address:"
msgstr "_Hjemmeside-adresse:"
@@ -2505,8 +2514,8 @@ msgid "Success"
msgstr "Suksess"
#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
msgid "Unknown error"
msgstr "Ukjent feil"
@@ -2514,7 +2523,7 @@ msgstr "Ukjent feil"
msgid "Repository offline"
msgstr "Lager \"offline\""
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
msgid "Permission denied"
msgstr "Tilgang nektet"
@@ -2531,10 +2540,10 @@ msgid "Protocol not supported"
msgstr "Protokollen er ikke støttet"
#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
msgid "Cancelled"
msgstr "Avbrutt"
@@ -2842,18 +2851,44 @@ msgstr "Skriv ut kort"
msgid "Print envelope"
msgstr "Skriv ut konvolutt"
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "Høy"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "Lav"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "Udefinert"
+
+#: calendar/conduits/calendar/calendar-conduit.c:751
+#: calendar/conduits/todo/todo-conduit.c:564
msgid "Error while communicating with calendar server"
msgstr "Feil under kommunikasjon med kalendertjeneren"
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:854
+#: calendar/conduits/calendar/calendar-conduit.c:857
msgid "Could not read pilot's Calendar application block"
msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
msgid "Could not read pilot's ToDo application block"
msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
@@ -3029,7 +3064,7 @@ msgstr "%d %B %Y"
#. month name. You can change the order but don't
#. change the specifiers or add anything.
#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
msgid "%d %B"
msgstr "%d %B"
@@ -3040,17 +3075,17 @@ msgstr ""
"Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
"konfigurasjon."
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
msgid "Private"
msgstr "Privat"
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
msgid "Confidential"
msgstr "Konfidensiell"
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
msgid "Public"
msgstr "Offentlig"
@@ -3070,67 +3105,48 @@ msgstr "Ø"
msgid "W"
msgstr "V"
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "Høy"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "Lav"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
msgid "Free"
msgstr "Ledig"
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
#: calendar/gui/e-meeting-time-sel.c:393
msgid "Busy"
msgstr "Opptatt"
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
msgid "Not Started"
msgstr "Ikke startet"
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
msgid "In Progress"
msgstr "Under arbeid"
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
#: calendar/gui/e-meeting-model.c:321
msgid "Completed"
msgstr "Fullført"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
#: e-util/e-time-utils.c:354
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d.%m.%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
#: e-util/e-time-utils.c:363
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %d.%m.%Y %H:%M:%S %p"
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -3141,7 +3157,7 @@ msgstr ""
"\n"
"%s"
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -3151,47 +3167,36 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr "Prioriteten må være en av 'Høy', 'Normal', 'Lav' eller 'Udefinert'."
-
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "Udefinert"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
msgid "None"
msgstr "Ingen"
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
msgid "Recurring"
msgstr "Gjeninntreffer"
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
msgid "Assigned"
msgstr "Tildelt"
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
#: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
#: calendar/gui/e-meeting-model.c:702
msgid "Yes"
msgstr "Ja"
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
#: calendar/gui/e-meeting-model.c:703
msgid "No"
msgstr "Nei"
@@ -3228,40 +3233,40 @@ msgstr "Kommentar inneholder"
msgid "Unmatched"
msgstr "Ingen treff"
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
msgid "Calendar"
msgstr "Kalender"
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
msgid "Folder containing appointments and events"
msgstr "Mappe som inneholder avtaler og hendelser"
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
#: views/tasks/galview.xml.h:1
msgid "Tasks"
msgstr "Oppgaver"
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
msgid "Folder containing to-do items"
msgstr "Mappe som inneholder oppgaver"
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
msgid "Create a new appointment"
msgstr "Opprett en ny avtale"
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
msgid "New _Appointment"
msgstr "Ny _avtale"
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
#: ui/evolution-tasks.xml.h:5
msgid "Create a new task"
msgstr "Opprett en ny oppgave"
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
msgid "New _Task"
msgstr "Ny _oppgave"
@@ -3337,94 +3342,118 @@ msgstr "timer"
msgid "minutes"
msgstr "minutter"
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
#, c-format
msgid "%d days"
msgstr "%d dager"
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
msgid "1 day"
msgstr "1 dag"
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
#, c-format
msgid "%d weeks"
msgstr "%d uker"
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
msgid "1 week"
msgstr "1 uke"
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
#, c-format
msgid "%d hours"
msgstr "%d timer"
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
msgid "1 hour"
msgstr "1 time"
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
#, c-format
msgid "%d minutes"
msgstr "%d minutter"
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
msgid "1 minute"
msgstr "1 minutt"
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
#, c-format
msgid "%d seconds"
msgstr "%d sekunder"
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
msgid "1 second"
msgstr "1 sekund"
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
#: calendar/gui/dialogs/alarm-page.glade.h:4
msgid "Play a sound"
msgstr "Spill en lyd"
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
#: calendar/gui/dialogs/alarm-page.glade.h:3
msgid "Display a message"
msgstr "Vis en melding"
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
msgid "Send an email"
msgstr "Send en melding"
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
#: calendar/gui/dialogs/alarm-page.glade.h:6
msgid "Run a program"
msgstr "Kjør et program"
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Ukjent"
+#: calendar/gui/dialogs/alarm-page.c:391
+msgid "Unknown action to be performed"
+msgstr "Ukjent handling som skal utføres"
-#: calendar/gui/dialogs/alarm-page.c:380
-msgid "before start of appointment"
-msgstr "før avtalen starter"
+#: calendar/gui/dialogs/alarm-page.c:403
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s før avtalen starter"
-#: calendar/gui/dialogs/alarm-page.c:383
-msgid "after start of appointment"
-msgstr "etter avtalens start"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s etter avtalen har startet"
+
+#: calendar/gui/dialogs/alarm-page.c:411
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s ved avtalens start"
+
+#: calendar/gui/dialogs/alarm-page.c:420
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s før avtalen slutter"
-#: calendar/gui/dialogs/alarm-page.c:393
-msgid "before end of appointment"
-msgstr "før avtalens slutt"
+#: calendar/gui/dialogs/alarm-page.c:423
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s etter avtalens slutt"
-#: calendar/gui/dialogs/alarm-page.c:396
-msgid "after end of appointment"
-msgstr "etter avtalens slutt"
+#: calendar/gui/dialogs/alarm-page.c:428
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s ved avtalens slutt"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, c-format
+msgid "%s at an unknown time"
+msgstr "%s ved en ukjent tid"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, c-format
+msgid "%s at %s"
+msgstr "%s ved %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s for en ukjent utløsertype"
#: calendar/gui/dialogs/alarm-page.glade.h:1
#: calendar/gui/dialogs/recurrence-page.glade.h:2
@@ -3742,55 +3771,55 @@ msgstr ""
msgid "%s You have made no changes, update the editor?"
msgstr "%s Du har ikke gjort endringer. Oppdater redigering?"
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
msgid " to "
msgstr " til "
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
msgid " (Completed "
msgstr " (Fullført "
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
msgid "Completed "
msgstr "Fullført "
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
msgid " (Due "
msgstr " (Ferdig "
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
msgid "Due "
msgstr "Ferdig "
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:514
msgid "Edit Appointment"
msgstr "Rediger avtale"
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:519
#, c-format
msgid "Appointment - %s"
msgstr "Avtale - %s"
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:522
#, c-format
msgid "Task - %s"
msgstr "Oppgave - %s"
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:525
#, c-format
msgid "Journal entry - %s"
msgstr "Journaloppføring - %s"
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:539
msgid "No summary"
msgstr "Ingen sammendrag"
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:949 mail/mail-callbacks.c:1671
#: mail/mail-display.c:100
msgid "Overwrite file?"
msgstr "Overskriv fil?"
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:953 mail/mail-callbacks.c:1677
#: mail/mail-display.c:104
msgid ""
"A file by that name already exists.\n"
@@ -3799,53 +3828,53 @@ msgstr ""
"En fil med samme navn eksisterer allerede.\n"
"Overskriv den?"
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1016 ui/evolution-comp-editor.xml.h:13
#: widgets/misc/e-filter-bar.h:101
msgid "Save As..."
msgstr "Lagre som..."
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1169
msgid "Unable to obtain current version!"
msgstr "Kan ikke hente versjonsdata!"
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
msgstr "Er du sikker på at du vil slette avtalen `%s'?"
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
msgid "Are you sure you want to delete this untitled appointment?"
msgstr "Er du sikker på at du vil slette denne avtalen uten tittel?"
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
#, c-format
msgid "Are you sure you want to delete the task `%s'?"
msgstr "Er du sikker på at du vil slette oppgaven `%s'?"
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
msgid "Are you sure you want to delete this untitled task?"
msgstr "Er du sikker på at du vil slette denne oppgaven uten tittel?"
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
#, c-format
msgid "Are you sure you want to delete the journal entry `%s'?"
msgstr "Er du sikker på at du vil slette journaloppføringen `%s'?"
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
msgid "Are you sure want to delete this untitled journal entry?"
msgstr "Er du sikker på at du vil slette denne journaloppføringen uten tittel?"
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
#, c-format
msgid "Are you sure you want to delete %d appointments?"
msgstr "Er du sikker på at du vil slette %d avtaler?"
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
#, c-format
msgid "Are you sure you want to delete %d tasks?"
msgstr "Er du sikker på at du vil slette %d oppgaver?"
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
#, c-format
msgid "Are you sure you want to delete %d journal entries?"
msgstr "Er du sikker på at du vil slette %d journaloppføringer?"
@@ -4026,7 +4055,7 @@ msgstr "Status"
#: calendar/gui/dialogs/meeting-page.etspec.h:11
#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
#: shell/glade/e-active-connection-dialog.glade.h:5
msgid "Type"
msgstr "Type"
@@ -4048,8 +4077,8 @@ msgstr "_Inviter andre"
msgid "_Other Organizer"
msgstr "Annen _organisator"
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
msgid "%a %b %d %Y"
msgstr "%a %b %d %Y"
@@ -4169,7 +4198,7 @@ msgid "Progress"
msgstr "Fremgang"
#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
msgid "URL:"
msgstr "URL:"
@@ -4188,7 +4217,7 @@ msgstr "Tildeling"
#: calendar/gui/dialogs/task-page.glade.h:4
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
msgid "Description:"
msgstr "Beskrivelse:"
@@ -4204,105 +4233,105 @@ msgstr "_Konfidensiell"
msgid "_Due Date:"
msgstr "Fer_dig-dato:"
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
#, c-format
msgid "0%"
msgstr "0%"
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
#, c-format
msgid "10%"
msgstr "10%"
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
#, c-format
msgid "20%"
msgstr "20%"
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
#, c-format
msgid "30%"
msgstr "30%"
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
#, c-format
msgid "40%"
msgstr "40%"
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
#, c-format
msgid "50%"
msgstr "50%"
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
#, c-format
msgid "60%"
msgstr "60%"
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
#, c-format
msgid "70%"
msgstr "70%"
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
#, c-format
msgid "80%"
msgstr "80%"
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
#, c-format
msgid "90%"
msgstr "90%"
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
#, c-format
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
#: shell/e-shortcuts-view.c:385
msgid "_Open"
msgstr "_Åpne"
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "Klipp _ut"
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:14
msgid "_Copy"
msgstr "_Kopier"
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:17
msgid "_Paste"
msgstr "_Lim inn"
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
msgid "_Mark as Complete"
msgstr "_Merk som fullført"
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
msgid "_Delete this Task"
msgstr "Sle_tt denne oppgaven"
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
msgid "_Mark Tasks as Complete"
msgstr "_Merk oppgaver som fullført"
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
msgid "_Delete Selected Tasks"
msgstr "Sle_tt valgte oppgaver"
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr "Klikk for å legge til en oppgave"
@@ -4311,8 +4340,8 @@ msgstr "Klikk for å legge til en oppgave"
msgid "Alarms"
msgstr "Alarmer"
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
msgid "Complete"
msgstr "Fullført"
@@ -4343,8 +4372,8 @@ msgstr "Startdato"
#. FIXME: Inbox shortcut should point to something else for
#. people who won't care about using /Local Folders/Inbox
#: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
msgid "Summary"
msgstr "Sammendrag"
@@ -4364,7 +4393,7 @@ msgstr "%02i minutters oppdeling"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
msgid "%A %d %B"
msgstr "%A %d %B"
@@ -4376,48 +4405,64 @@ msgid "%d %b"
msgstr "%d %b"
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
msgid "am"
msgstr "am"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
msgid "pm"
msgstr "pm"
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
msgid "New All Day _Event"
msgstr "Ny avtale som varer h_ele dagen"
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
#: ui/evolution-calendar.xml.h:17
msgid "Go to _Today"
msgstr "Gå _til i dag"
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
msgid "_Go to Date..."
msgstr "_Gå til dato..."
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
msgid "_Delete this Appointment"
msgstr "Sle_tt denne avtalen"
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
msgid "Make this Occurrence _Movable"
msgstr "Gjør denne hendelsen _flyttbar"
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
msgid "Delete this _Occurrence"
msgstr "Slett denne _hendelsen"
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
msgid "Delete _All Occurrences"
msgstr "Slett _alle hendelser"
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr "Møte starter: <b>"
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr "Oppgave starter: <b>"
+
+#: calendar/gui/e-itip-control.c:479
+msgid "Free/Busy info begins: <b>"
+msgstr "Ledig/opptatt-informasjon starter: <b>"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr "Starter: <b>"
+
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -4425,227 +4470,227 @@ msgstr ""
"<br>Vennligst sjekk følgende informasjon og velg så en handling fra menyen "
"under."
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
#, c-format
msgid "<b>Summary:</b> %s<br><br>"
msgstr "<b>Sammendrag:</b> %s<br><br>"
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
msgid "<i>None</i>"
msgstr "<i>Ingen</i>"
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
#, c-format
msgid "<b>Description:</b> %s"
msgstr "<b>Beskrivelse:</b> %s"
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> har publisert møteinformasjon."
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
msgid "Meeting Information"
msgstr "Møteinformasjon"
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
msgid "Meeting Proposal"
msgstr "Møteforslag"
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte."
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
msgid "Meeting Update"
msgstr "Møteoppdatering"
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> ønsker å motta seneste møteinformasjon."
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
msgid "Meeting Update Request"
msgstr "Forespørsel om møteoppdatering"
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> har svart på en møteforespørsel."
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
msgid "Meeting Reply"
msgstr "Møtesvar"
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> har avlyst et møte."
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
msgid "Meeting Cancellation"
msgstr "Møteavlysing"
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> har sendt en uforståelig melding."
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
msgid "Bad Meeting Message"
msgstr "Ugyldig møtemelding"
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> har publisert informasjon om en oppgave."
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
msgid "Task Information"
msgstr "Oppgaveinformasjon"
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> forespør at du utfører en oppgave."
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
msgid "Task Proposal"
msgstr "Forespørsel om oppgave"
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave."
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
msgid "Task Update"
msgstr "Oppgaveoppdatering"
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
msgid "Task Update Request"
msgstr "Forespørsel om oppgaveoppdatering"
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> har svart på en oppgavetildeling."
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
msgid "Task Reply"
msgstr "Svar på oppgave"
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> har avlyst en oppgave."
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
msgid "Task Cancellation"
msgstr "Avlysing av oppgave"
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
msgid "Bad Task Message"
msgstr "Ugyldig oppgavemelding"
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
msgid "Free/Busy Information"
msgstr "Ledig/opptatt-informasjon"
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> forespør din ledig/opptatt-informasjon."
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
msgid "Free/Busy Request"
msgstr "Ledig/opptatt forespørsel"
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> har svart på en forespørsel etter ledig/opptatt-informasjon."
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
msgid "Free/Busy Reply"
msgstr "Ledig/opptatt svar"
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
msgid "Bad Free/Busy Message"
msgstr "Ugyldig ledig/opptatt-melding"
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
msgid "The message does not appear to be properly formed"
msgstr "Meldingen ser ikke ut til å være riktig utformet"
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
msgid "The message contains only unsupported requests."
msgstr "Denne meldingen inneholder forespørsler som ikke er støttet."
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
msgid "The attachment does not contain a valid calendar message"
msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
msgid "Calendar file could not be updated!\n"
msgstr "Kalenderfilen kunne ikke oppdateres!\n"
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
msgid "Update complete\n"
msgstr "Oppdatering fullført\n"
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
msgid "Attendee status ould not be updated!\n"
msgstr "Deltakerstatus kunne ikke oppdateres!\n"
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
msgid "Attendee status updated\n"
msgstr "Deltakerstatus oppdatert\n"
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
"Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
msgid "I couldn't remove the item from your calendar file!\n"
msgstr "Kunne ikke fjerne oppføringen fra din kalenderfil!\n"
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
msgid "Removal Complete"
msgstr "Fjerning fullført"
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
msgid "Item sent!\n"
msgstr "Oppføring sendt!\n"
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
msgid "The item could not be sent!\n"
msgstr "Oppføringen kunne ikke sendes!\n"
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
msgid "Unable to find any of your identities in the attendees list!\n"
msgstr "Kunne ikke finne noen av dine indentiteter i deltakerlisten!\n"
@@ -4706,6 +4751,14 @@ msgstr "Ressurs"
msgid "Room"
msgstr "Rom"
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Ukjent"
+
#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
#: calendar/gui/e-meeting-model.c:686
msgid "Chair"
@@ -4758,14 +4811,14 @@ msgstr "Under arbeid"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
msgid "%A, %B %d, %Y"
msgstr "%A, %B %d, %Y"
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
#: e-util/e-time-utils.c:345
msgid "%a %m/%d/%Y"
msgstr "%a %d.%m.%Y"
@@ -4773,7 +4826,7 @@ msgstr "%a %d.%m.%Y"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
msgid "%m/%d/%Y"
msgstr "%d.%m.%Y"
@@ -4851,16 +4904,16 @@ msgstr "Kunne ikke laste oppgavene i `%s'"
msgid "The method required to load `%s' is not supported"
msgstr "Metoden som er nødvendig for å laste `%s' er ikke støttet"
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
msgid "New _Appointment..."
msgstr "Ny _avtale..."
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "Kunne ikke åpne mappen i `%s'"
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "Metoden som er nødvendig for å åpne `%s' er ikke støttet"
@@ -4929,201 +4982,201 @@ msgstr "En organisator må oppgis."
msgid "Could not create the component editor factory"
msgstr "Kunne ikke opprette factory for komponentredigering"
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
msgid "1st"
msgstr "1"
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
msgid "2nd"
msgstr "2"
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
msgid "3rd"
msgstr "3"
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
msgid "4th"
msgstr "4"
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
msgid "5th"
msgstr "5"
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
msgid "6th"
msgstr "6"
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
msgid "7th"
msgstr "7"
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
msgid "8th"
msgstr "8"
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
msgid "9th"
msgstr "9"
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
msgid "10th"
msgstr "10"
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
msgid "11th"
msgstr "11"
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
msgid "12th"
msgstr "12"
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
msgid "13th"
msgstr "13"
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
msgid "14th"
msgstr "14"
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
msgid "15th"
msgstr "15"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
msgid "16th"
msgstr "16"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
msgid "17th"
msgstr "17"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
msgid "18th"
msgstr "18"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
msgid "19th"
msgstr "19"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
msgid "20th"
msgstr "20"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
msgid "21st"
msgstr "21"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
msgid "22nd"
msgstr "22"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
msgid "23rd"
msgstr "23"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
msgid "24th"
msgstr "24"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
msgid "25th"
msgstr "25"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
msgid "26th"
msgstr "26"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
msgid "27th"
msgstr "27"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
msgid "28th"
msgstr "28"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
msgid "29th"
msgstr "29"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
msgid "30th"
msgstr "30"
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
msgid "31st"
msgstr "31"
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
msgid "Su"
msgstr "Søn"
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
msgid "Mo"
msgstr "Man"
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
msgid "Tu"
msgstr "Tir"
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
msgid "We"
msgstr "Ons"
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
msgid "Th"
msgstr "Tor"
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
msgid "Fr"
msgstr "Fre"
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
msgid "Sa"
msgstr "Lør"
#. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
msgid "Selected day (%a %b %d %Y)"
msgstr "Valgt dag (%a %b %d %Y)"
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
msgid "%a %b %d"
msgstr "%a %b %d"
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
msgid "%a %d %Y"
msgstr "%a %d %Y"
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
#, c-format
msgid "Selected week (%s - %s)"
msgstr "Valgt uke (%s - %s)"
#. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
msgid "Selected month (%b %Y)"
msgstr "Valgt måned (%b %Y)"
#. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
msgid "Selected year (%Y)"
msgstr "Valgt år (%Y)"
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
msgid "Print Calendar"
msgstr "Skriv ut kalender"
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
msgid "Print Preview"
msgstr "Forhåndsvisning av utskrift"
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
msgid "Print Item"
msgstr "Skriv ut oppføring"
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
msgid "Print Setup"
msgstr "Skriveroppsett"
@@ -5327,66 +5380,76 @@ msgstr ""
msgid "Resynchronizing with server"
msgstr "Resynkroniserer med tjener"
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
msgid "You must be working online to complete this operation"
msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen"
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
msgid "Syncing folders"
msgstr "Synkroniserer mapper"
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
msgid "Unable to open spool folder"
msgstr "Kunne ikke åpne spool-mappen"
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
msgid "Unable to process spool folder"
msgstr "Kan ikke prosessere spool-mappen"
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Henter melding %d (%d%%)"
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
#, c-format
msgid "Failed on message %d"
msgstr "Feilet på melding %d"
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
msgid "Cannot open message"
msgstr "Kan ikke åpne melding"
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
msgid "Syncing folder"
msgstr "Synkroniserer mappe"
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
#, c-format
msgid "Getting message %d of %d"
msgstr "Henter melding %d av %d"
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
#, c-format
msgid "Failed at message %d of %d"
msgstr "Feilet på melding %d av %d"
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Feil under lesing av filter: %s: %s"
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Feil under kjøring av filter: %s: %s"
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Feil under lagring av filtersøk: %s: %s"
-#: camel/camel-folder.c:1210
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Ustøttet operasjon: legg til melding: for %s"
+
+#: camel/camel-folder.c:1039
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Ustøttet operasjon: søk etter uttrykk: etter %s"
+
+#: camel/camel-folder.c:1219
msgid "Moving messages"
msgstr "Flytter meldinger"
@@ -5417,7 +5480,7 @@ msgstr "(treff-alle) krever et enkelt bolsk resultat"
msgid "Performing query on unknown header: %s"
msgstr "Utfører spørring på ukjent header: %s"
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
msgid "Invalid type in body-contains, expecting string"
msgstr "Ugyldig type i kropp-inneholder, forventer streng"
@@ -5516,79 +5579,79 @@ msgstr "Feil under skriving av midlertidig fil: %s"
msgid "Error copying mail temp file: %s"
msgstr "Feil under kopiering midlertidig meldingsfil: %s"
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
#, c-format
msgid "Please enter your %s passphrase for %s"
msgstr "Vennligst skriv inn din %s passphrase for %s"
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
#, c-format
msgid "Please enter your %s passphrase"
msgstr "Vennligst skriv inn din %s passphrase"
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
msgid "Cannot sign this message: no plaintext to sign"
msgstr "Kan ikke signere denne meldingen: ingen tekst å signere"
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:704
msgid "Cannot sign this message: no password provided"
msgstr "Kan ikke signere denne meldingen: ingen passord oppgitt"
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:710
#, c-format
msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
"Kunne ikke signere denne meldingen: kunne ikke opprette rør til GPG/PGP: %s"
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:697
msgid "Cannot sign this message: no plaintext to clearsign"
msgstr "Kan ikke signere denne meldingen: ingen tekst for \"clearsign\""
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:887
msgid "Cannot verify this message: no plaintext to verify"
msgstr "Kan ikke verifisere denne meldingen: ingen tekst å verifisere"
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:893
#, c-format
msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
"Kunne ikke verifisere denne meldingen: kunne ikke opprette rør til GPG/PGP: %"
"s"
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:904
#, c-format
msgid "Cannot verify this message: couldn't create temp file: %s"
msgstr ""
"Kunne ikke verifisere denne meldingen: kunne ikke opprette midlertidig fil: %"
"s"
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1070
msgid "Cannot encrypt this message: no plaintext to encrypt"
msgstr "Kan ikke kryptere denne meldingen: ingen tekst å kryptere"
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1080
msgid "Cannot encrypt this message: no password provided"
msgstr "Kan ikke kryptere denne meldingen: ingen passord oppgitt"
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1087
#, c-format
msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
"Kunne ikke kryptere denne meldingen: kunne ikke opprette rør til GPG/PGP: %s"
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1096
msgid "Cannot encrypt this message: no recipients specified"
msgstr "Kan ikke kryptere denne meldingen: ingen mottakere oppgitt"
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1256
msgid "Cannot decrypt this message: no ciphertext to decrypt"
msgstr "Kan ikke dekryptere denne meldingen: ingen ciphertekst å dekryptere"
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1264
msgid "Cannot decrypt this message: no password provided"
msgstr "Kan ikke dekryptere denne meldingen: ingen passord oppgitt"
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1271
#, c-format
msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
@@ -5634,13 +5697,13 @@ msgstr "Kunne ikke koble til %s (port %d): %s"
msgid "(unknown host)"
msgstr "(ukjent vert)"
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
#: camel/providers/imap/camel-imap-command.c:386
msgid "Operation cancelled"
msgstr "Opreasjon avbrutt"
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Tjener koblet fra uventet: %s"
@@ -5770,7 +5833,7 @@ msgstr "Ukjent autentiseringstilstand."
#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
msgid "Password"
msgstr "Passord"
@@ -5800,37 +5863,37 @@ msgstr "POP før SMTP autentisering via ikke-pop kilde"
msgid "Regular expression compilation failed: %s: %s"
msgstr "Kompilering av regulært uttrykk feilet: %s: %s"
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s' må inneholde et brukernavn"
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s' må inneholde et vertsnavn"
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' må inneholde en sti"
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
#, c-format
msgid "Resolving: %s"
msgstr "Finner: \"%s\""
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
#, c-format
msgid "Failure in name lookup: %s"
msgstr "Feil i navneoppslag: %s"
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "Vertsoppslag feilet: %s: vert ikke funnet"
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "Vertsoppslag feilet: %s: ukjent årsak"
@@ -5843,12 +5906,12 @@ msgstr "E-post-tilbyder for virtuelle mapper"
msgid "For reading mail as a query of another set of folders"
msgstr "For lesing av e-post som en spørring på et annet sett med mapper"
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
#, c-format
msgid "No provider available for protocol `%s'"
msgstr "Ingen tilbyder tilgjengelig for protokoll `%s'"
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -5898,7 +5961,7 @@ msgstr "Feil under verifisering av sertifikater."
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Kan ikke opprette mappe: Ugyldig operasjon på dette lageret"
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
#, c-format
msgid ""
"Issuer: %s\n"
@@ -5908,7 +5971,7 @@ msgstr ""
"Emne: %s"
#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
#, c-format
msgid ""
"Bad certificate from %s:\n"
@@ -5947,37 +6010,37 @@ msgstr ""
msgid "Could not parse URL `%s'"
msgstr "Kunne ikke tolke URL `%s'"
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
#, c-format
msgid "No such message %s in %s"
msgstr "Ingen slik melding %s i %s"
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
#, c-format
msgid "No such message: %s"
msgstr "Ingen slik melding: %s"
-#: camel/camel-vee-store.c:251
+#: camel/camel-vee-store.c:250
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
-#: camel/camel-vee-store.c:287
+#: camel/camel-vee-store.c:286
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
-#: camel/camel-vee-store.c:299
+#: camel/camel-vee-store.c:298
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
-#: camel/camel-vee-store.c:327
+#: camel/camel-vee-store.c:326
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vtrash-folder.c:109
msgid "You cannot copy messages from this trash folder."
msgstr "Du kan ikke kopiere meldinger fra denne søppel-katalogen."
@@ -6025,7 +6088,7 @@ msgid "Scanning for changed messages"
msgstr "Søker etter endrede meldinger"
#: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
msgid "This message is not currently available"
msgstr "Denne meldingen er ikke tilgjengelig"
@@ -6038,7 +6101,7 @@ msgstr "Henter sammendragsinformasjon for nye meldinger"
msgid "Scanning for new messages"
msgstr "Søker etter nye meldinger"
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
msgid "Could not find message body in FETCH response."
msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
@@ -6055,7 +6118,7 @@ msgstr "Kan ikke åpne cache-katalog: %s"
msgid "Failed to cache message %s: %s"
msgstr "Feil under mellomlagring av melding %s: %s"
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
msgid "Checking for new mail"
msgstr "Ser etter nye meldinger"
@@ -6063,7 +6126,7 @@ msgstr "Ser etter nye meldinger"
msgid "Check for new messages in all folders"
msgstr "Se etter nye meldinger i alle mapper"
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
msgid "Folders"
msgstr "Mapper"
@@ -6681,7 +6744,7 @@ msgstr "Behold meldinger på tjeneren"
msgid "Delete after %s day(s)"
msgstr "Slett etter %s dag(er)"
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
msgid "POP"
msgstr "POP"
@@ -6777,7 +6840,7 @@ msgid "Unexpected response from POP server: %s"
msgstr "Uventet svar fra POP-tjener: %s"
#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
msgid "Sendmail"
msgstr "Sendmail"
@@ -6831,7 +6894,7 @@ msgstr "sendmail"
msgid "Mail delivery via the sendmail program"
msgstr "Levering av e-post via sendmail programmet"
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
msgid "SMTP"
msgstr "SMTP"
@@ -7449,13 +7512,13 @@ msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
msgid "%I:%M %p"
msgstr "%I:%M %p"
#. strptime format for time of day, without seconds 24-hour format.
#: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
msgid "%H:%M"
msgstr "%H:%M"
@@ -7604,8 +7667,8 @@ msgstr ""
"Du glemte å velge en meppe.\n"
"Vennligst gå tilbake og spesifiser en gyldig mappe for levering av e-post."
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
msgid "Select Folder"
msgstr "Velg mappe"
@@ -7855,7 +7918,7 @@ msgstr "Svart til"
msgid "Score"
msgstr "Poenggi"
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
msgid "Sender"
msgstr "Avsender"
@@ -7887,7 +7950,7 @@ msgstr "starter med"
msgid "Stop Processing"
msgstr "Stopp behandling"
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
#: mail/message-list.etspec.h:9
msgid "Subject"
msgstr "Emne"
@@ -7916,7 +7979,7 @@ msgstr "Rediger regel"
msgid "Score Rules"
msgstr "Poengregler"
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
msgid "Oops. You need to to specify at least one folder as a source."
msgstr "Oops. Du må spesifisere minst en mappe som kilde."
@@ -7934,19 +7997,19 @@ msgstr "Importerer..."
msgid "Please wait"
msgstr "Vennligst vent"
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
#: importers/pine-importer.c:369
#, c-format
msgid "Importing %s as %s"
msgstr "Importerer %s som %s"
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
#: importers/pine-importer.c:506
#, c-format
msgid "Scanning %s"
msgstr "Søker i %s"
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
#: importers/pine-importer.c:669 mail/component-factory.c:96
msgid "Mail"
msgstr "Post"
@@ -7983,19 +8046,19 @@ msgstr ""
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution importerer dine gamle data fra Netscape"
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
msgid "Scanning directory"
msgstr "Søker i katalog"
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
msgid "Starting import"
msgstr "Starter import"
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
msgid "Settings"
msgstr "Innstillinger"
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -8079,19 +8142,25 @@ msgstr "Egenskaper ..."
msgid "Change this folder's properties"
msgstr "Endre denne mappens egenskaper"
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr "Noen av dine innstillinger for e-post ser ut til å være korrupt. Vennligst sjekk at alt er i orden."
+
+#: mail/component-factory.c:812
msgid "New Mail Message"
msgstr "Ny e-post melding"
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
msgid "New _Mail Message"
msgstr "Ny e-post _melding"
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
msgid "Cannot initialize Evolution's mail component."
msgstr "Kan ikke initiere Evolutions e-postkomponent."
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
msgid "Cannot register storage with shell"
msgstr "Kan ikke registrere lagring i skallet"
@@ -8104,159 +8173,159 @@ msgstr "Egenskaper for \"%s\""
msgid "Properties"
msgstr "Egenskaper"
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "Kunne ikke opprette midlertidig katalog: %s"
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
#, c-format
msgid "%d new"
msgstr "%d nye"
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
msgid ", "
msgstr ", "
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
#, c-format
msgid "%d hidden"
msgstr "%d skjulte"
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
#, c-format
msgid "%d selected"
msgstr "%d valgt"
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
#, c-format
msgid "%d unsent"
msgstr "%d usendte"
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
#, c-format
msgid "%d total"
msgstr "%d totalt"
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
msgid "Create vFolder from Search"
-msgstr "La_g vFolder fra søk"
+msgstr "Lag vFolder fra søk"
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
msgid "VFolder on _Subject"
msgstr "VFolder på e_mne"
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
msgid "VFolder on Se_nder"
msgstr "VFolder for se_nder"
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
msgid "VFolder on _Recipients"
msgstr "VFolder for mottake_re"
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
msgid "VFolder on Mailing _List"
msgstr "VFolder på e-post_liste"
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
msgid "Filter on Sub_ject"
msgstr "Filtrer på em_ne"
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
msgid "Filter on Sen_der"
msgstr "Filtrer på sen_der"
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
msgid "Filter on Re_cipients"
msgstr "Filtrer på motta_ker"
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
msgid "Filter on _Mailing List"
msgstr "Filtrer på e-_postliste"
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
msgid "_Edit as New Message..."
msgstr "R_ediger som ny melding..."
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
msgid "_Save As..."
msgstr "Lagre _som..."
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
msgid "_Print"
msgstr "S_kriv ut"
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
msgid "_Reply to Sender"
msgstr "Sva_r til sender"
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
msgid "Reply to _List"
msgstr "Svar til _listen"
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
msgid "Reply to _All"
msgstr "Svar til _alle"
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
msgid "_Forward"
msgstr "_Videresend"
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
msgid "Mar_k as Read"
msgstr "Mer_k som lest"
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
msgid "Mark as U_nread"
msgstr "Merk som _ulest"
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
msgid "Mark as _Important"
msgstr "Merk som v_iktig"
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
msgid "Mark as Unim_portant"
msgstr "Merk som uv_iktig"
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
msgid "_Move to Folder..."
msgstr "Fl_ytt til mappe..."
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
msgid "_Copy to Folder..."
msgstr "K_opier til mappe..."
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
msgid "_Undelete"
msgstr "A_ngre slett"
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
msgid "Add Sender to Address Book"
msgstr "Legg til sender i adressebok"
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
msgid "Apply Filters"
msgstr "Påfør filtre"
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
msgid "Create Ru_le From Message"
msgstr "Lage rege_l fra melding"
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
msgid "Filter on Mailing List"
msgstr "Filtrer etter e-postliste"
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
msgid "VFolder on Mailing List"
msgstr "VFolder på e-postliste"
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr "Filtrer etter e-postliste (%s)"
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr "VFolder på e-postliste (%s)"
@@ -8329,15 +8398,15 @@ msgstr "Evolution nyhetsredigerer"
msgid "Evolution Account Editor"
msgstr "Kontoredigering for Evolution"
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
msgid "Could not save signature file."
msgstr "Kunne ikke lagre signaturfil."
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
msgid "Save signature"
msgstr "Lagre signatur"
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
@@ -8347,7 +8416,7 @@ msgstr ""
"\n"
"Vil du lagre endringene?"
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
msgid "You may not create two accounts with the same name."
msgstr "Du kan ikke opprette to kontoer med samme navn."
@@ -8380,7 +8449,7 @@ msgid "Are you sure you want to delete this news account?"
msgstr "Er du sikker på at du vil slette denne diskusjonsgruppekontoen?"
#. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
msgid "Mail Settings"
msgstr "Innstillinger for e-post"
@@ -8487,36 +8556,36 @@ msgstr ""
msgid "This message contains invalid recipients:"
msgstr "Denne meldingen inneholder ugyldige mottakere:"
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
msgid "You must specify recipients in order to send this message."
msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
-#: mail/mail-callbacks.c:549
+#: mail/mail-callbacks.c:550
msgid "You must configure an account before you can send this email."
msgstr "Du må konfigurere en konto før du kan sender denne meldingen."
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:783
msgid "an unknown sender"
msgstr "en ukjent avsender"
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
msgid "Move message(s) to"
msgstr "Flytt melding(er) til"
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
msgid "Copy message(s) to"
msgstr "Kopier melding(er) til"
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "Er du sikker på at du vil redigere alle %d meldingene?"
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -8524,7 +8593,7 @@ msgstr ""
"Du kan kun redigere meldinger lagret\n"
"i Skisser-katalogen."
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -8532,28 +8601,28 @@ msgstr ""
"Du kan kun sende meldinger på nytt\n"
"som er lagret i sendt-katalogen."
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "Er du sikker på at du vil sende alle %d meldingene på nytt?"
-#: mail/mail-callbacks.c:1627
+#: mail/mail-callbacks.c:1636
msgid "No Message Selected"
msgstr "Ingen melding valgt"
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
msgid "Save Message As..."
msgstr "Lagre melding som..."
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
msgid "Save Messages As..."
msgstr "Lagre meldinger som..."
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "Advarsel"
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -8565,11 +8634,11 @@ msgstr ""
"\n"
"Vil du virkelig slette disse meldingene?"
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
msgid "Do not ask me again."
msgstr "Ikke spør meg igjen."
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -8578,19 +8647,19 @@ msgstr ""
"Feil under lasting av filter-informasjon:\n"
"%s"
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
msgid "Filters"
msgstr "Filtre"
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
msgid "Print Message"
msgstr "Skriv ut melding"
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
msgid "Printing of message failed"
msgstr "Feil under utskrift av melding"
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "Er du sikker på at du vil åpne alle %d meldingene i separate vinduer?"
@@ -8651,85 +8720,98 @@ msgstr ""
msgid "Evolution Account Assistant"
msgstr "Evolution kontoassistent"
-#: mail/mail-config.c:1486
-msgid "Evolution Shortcuts"
-msgstr "Evolution snarveier"
+#: mail/mail-config.c:313
+#, c-format
+msgid "Account %d"
+msgstr "Konto %d"
#. right now, the URL always works basically as a matter of luck...
#. * both IMAP and mbox spool stores have INBOX as their inbox folder
#. * name. I don't think this will work with maildir. How can we figure out
#. * what shortcut to insert?
#.
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1613
#, c-format
msgid "%s: Inbox"
msgstr "%s: Innboks"
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1846
msgid "Checking Service"
msgstr "Sjekker tjeneste"
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1917 mail/mail-config.c:1920
msgid "Connecting to server..."
msgstr "Kobler til tjener..."
#: mail/mail-config.glade.h:1
+msgid " _Check for supported types "
+msgstr "_Søk etter støttede typer"
+
+#: mail/mail-config.glade.h:2
msgid " color"
msgstr " farge"
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
msgid "(SSL is not supported in this build of evolution)"
msgstr "(SSL er ikke støttet i denne versjonen av evolution)"
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
msgid "Account"
msgstr "Konto"
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
msgid "Account Information"
msgstr "Kontoinformasjon"
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Account Management"
msgstr "Håndtering av konti"
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
msgid "Accounts"
msgstr "Kontoer"
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
msgid "Always encrypt to myself when sending encrypted mail"
msgstr "Alltid krypter til meg selv ved sending av kryptert e-post."
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
msgid "Always encrypt to myself when sending encrypyed mail"
msgstr "Alltid krypter til meg selv ved sending av kryptert e-post"
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
msgid "Always sign outgoing messages when using this account"
msgstr "Alltid signer utgående meldinger når denne kontoen brukes"
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "Vedlegg"
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
msgid "Authentication"
msgstr "Autentisering"
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
msgid "Authentication Type: "
msgstr "Autentiseringstype: "
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
msgid "Certificate ID:"
msgstr "Sertifikat-ID:"
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
msgid "Composer"
msgstr "Skriv"
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#: mail/mail-config.glade.h:18
+msgid "Confirm when Expunging a folder"
+msgstr "Bekreft ved tømming av mappe"
+
+#: mail/mail-config.glade.h:19
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -8745,237 +8827,225 @@ msgstr ""
"\n"
"Klikk \"Fullfør\" for å lagre dine innstillinger"
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
msgid "De_fault"
msgstr "_Forvalgt"
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
msgid "Default Forward style is: "
msgstr "Standard videresendingsstil er: "
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
msgid "Default character encoding: "
msgstr "Standard tegnkoding: "
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
msgid "Digital IDs..."
msgstr "Digitale IDer..."
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
msgid "Display"
msgstr "Vis"
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
msgid "Done"
msgstr "Ferdig"
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
msgid "Drafts"
msgstr "Skisser"
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
msgid "Drafts folder:"
msgstr "Skissemappe:"
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
msgid "E_nable"
msgstr "A_ktiver"
-#: mail/mail-config.glade.h:31
-msgid "Each account must have a different name."
-msgstr "Kontoene må ha forskjellige navn."
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
#: widgets/misc/e-filter-bar.h:103
msgid "Edit..."
msgstr "Rediger..."
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
msgid "Enabled"
msgstr "Aktivert"
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
msgid "Get Digital ID..."
msgstr "Hent digital ID..."
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
msgid "HTML signature file:"
msgstr "HTML-signaturfil:"
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
msgid "IMAPv4 "
msgstr "IMAPv4"
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
msgid "Identity"
msgstr "Identitet"
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
msgid "In HTML mail"
msgstr "I HTML e-post"
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
msgid "Inline"
msgstr "Inline"
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
msgid "Kerberos "
msgstr "Kerberos "
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
msgid "Mail Configuration"
msgstr "E-post-konfigurasjon"
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
msgid "Mailbox location"
msgstr "Plassering av postboks"
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
msgid "Make this my _default account"
msgstr "Bruk denne som stan_dard konto"
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr "Forhåndsvisning av meldinger skal være _på som standard"
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr "Meldingslisten skal vises med _tråder som standard"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
msgid "NNTP Server:"
msgstr "NNTP-tjener:"
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
msgid "News"
msgstr "News"
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
msgid "Optional Information"
msgstr "Tilleggsinformasjon"
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
msgid "PGP Key ID:"
msgstr "PGP-nøkkel ID:"
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
msgid "Pick a color"
msgstr "Velg en farge"
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
msgid "Pretty Good Privacy"
msgstr "Pretty Good Privacy"
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
msgid "Prompt when sending messages with an _empty subject"
msgstr "Spør ved sending av meldinger uten _emne"
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
msgid "Prompt when sending messages with only _Bcc recipients defined"
msgstr "Spør ved sending av meldinger med kun _Bcc-mottakere definert"
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
msgid "Qmail maildir "
msgstr "Qmail maildir"
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
msgid "Quoted"
msgstr "Sitert"
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
msgid "Receiving Email"
msgstr "Innkommende e-post"
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
msgid "Receiving Mail"
msgstr "Innkommende e-post"
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
msgid "Receiving Options"
msgstr "Alternativer innkommende"
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
msgid "Required Information"
msgstr "Nødvendig informasjon"
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
msgid "Secure MIME"
msgstr "Sikker MIME"
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
msgid "Security"
msgstr "Sikkerhet"
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
msgid "Select Filter Log file..."
msgstr "Velg en loggfil for filter..."
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
msgid "Select PGP binary"
msgstr "Velg PGP-binærfil"
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr "Utgående e-post"
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
msgid "Sending Mail"
msgstr "Utgående e-post"
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
#: shell/e-local-storage.c:177
msgid "Sent"
msgstr "Sendt"
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
msgid "Sent and Draft Messages"
msgstr "Sendte meldinger og skisser"
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
msgid "Sent messages folder:"
msgstr "Mappe for sendte meldinger:"
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
msgid "Server Configuration"
msgstr "Tjenerkonfigurasjon"
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
msgid "Server Type: "
msgstr "Tjenertype: "
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
msgid "Server requires _authentication"
msgstr "Tjener krever _autentisering"
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
msgid "Signature file:"
msgstr "Signaturfil:"
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
msgid "Source"
msgstr "Kilde"
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
msgid "Source Information"
msgstr "Kildeinformasjon"
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
msgid "Sources"
msgstr "Kilder"
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
msgid "Special Folders"
msgstr "Spesielle mapper"
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
msgid "Standard Unix mbox"
msgstr "Standard Unix mbox"
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
msgid "Use secure connection (_SSL)"
msgstr "Bruk sikker forbindelse (_SSL)"
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -8985,78 +9055,74 @@ msgstr ""
"\n"
"Klikk \"Neste\" for å begynne. "
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
msgid "_Always load images off the net"
msgstr "_Alltid last bilder fra nettet"
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
msgid "_Automatically check for new mail every"
msgstr "Sjekk etter meldinger _automatisk hver(t)"
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
msgid "_Check for supported types"
msgstr "S_øk etter støttede typer"
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
msgid "_Email Address:"
msgstr "_E-post adresse:"
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
msgid "_Empty trash folders on exit"
msgstr "Tøm søpp_elkurven ved slutt"
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
msgid "_Full Name:"
msgstr "_Fullt navn:"
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
msgid "_HTML Signature:"
msgstr "_HTML-signatur:"
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
msgid "_Highlight citations with"
msgstr "M_erk sitering med"
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
msgid "_Host:"
msgstr "_Vert:"
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
msgid "_Load images if sender is in addressbook"
msgstr "_Last bilder hvis avsender er i adresseboken"
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
msgid "_Log filter actions to:"
msgstr "_Logg filterhandlinger til:"
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
msgid "_Mark messages as Read after"
msgstr "_Merk meldinger som Lest etter"
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
msgid "_Name:"
msgstr "_Navn:"
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
msgid "_Never load images off the net"
msgstr "Aldri last bilder fra _nettet"
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
msgid "_Organization:"
msgstr "_Organisasjon:"
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
msgid "_PGP binary path:"
msgstr "Sti til _PGP-binærfil:"
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
msgid "_Path:"
msgstr "S_ti:"
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr "Husk PGP-passo_rd til du avslutter"
-
#: mail/mail-config.glade.h:111
msgid "_Remember this password"
msgstr "Husk dette passo_rdet"
@@ -9089,39 +9155,39 @@ msgstr "plassholder"
msgid "seconds."
msgstr "sekunder"
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
msgid "Could not create a PGP signature context."
msgstr "Kunne ikke opprette PGP signaturkontekst."
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
msgid "Could not create a PGP verification context."
msgstr "Kunne ikke opprette PGP verifiseringskontekst."
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
msgid "Could not create a PGP encryption context."
msgstr "Kunne ikke opprette PGP krypteringskontekst."
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
msgid "Could not create a PGP decryption context."
msgstr "Kunne ikke opprette PGP dekrypteringskontekst."
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
msgid "Could not create a S/MIME signature context."
msgstr "Kunne ikke opprette S/MIME signaturkontekst."
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
msgid "Could not create a S/MIME certsonly context."
msgstr "Kunne ikke opprette S/MIME \"certsonly\" kontekst."
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
msgid "Could not create a S/MIME encryption context."
msgstr "Kunne ikke opprette S/MIME krypteringskontekst."
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
msgid "Could not create a S/MIME envelope context."
msgstr "Kunne ikke opprette S/MIME \"envelope\" kontekst."
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
msgid "Could not create a S/MIME decode context."
msgstr "Kunne ikke opprette S/MIME dekodingskontekst."
@@ -9167,11 +9233,11 @@ msgstr "Åpne lenke i nettleser"
msgid "Copy Link Location"
msgstr "Kopier lokasjon for lenke"
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
msgid "Save Link as (FIXME)"
msgstr "Lagre lenke som"
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
msgid "Save Image as..."
msgstr "Lagre bilde som..."
@@ -9188,84 +9254,84 @@ msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
msgid "Date"
msgstr "Dato"
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
msgid "Bad Address"
msgstr "Ugyldig e-post-adresse:"
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
msgid "From"
msgstr "Fra"
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
msgid "Reply-To"
msgstr "Svar-til"
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
msgid "To"
msgstr "Til"
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
msgid "Cc"
msgstr "Cc"
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
msgid "No GPG/PGP program configured."
msgstr "Ingen GPG/PGP-program konfigurert."
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
msgid "Encrypted message not displayed"
msgstr "Kryptert melding ikke vist"
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
msgid "Encrypted message"
msgstr "Kryptert melding"
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
msgid "Click icon to decrypt."
msgstr "Klikk på ikonet for å dekryptere."
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
msgid "This message is digitally signed and has been found to be authentic."
msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "Peker til FTP-tjener (%s)"
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "Peker til lokal fil (%s) gyldig på nettsted \"%s\""
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2147
#, c-format
msgid "Pointer to local file (%s)"
msgstr "Peker til lokal fil (%s)"
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "Peker til eksterne data (%s)"
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
msgid "Malformed external-body part."
msgstr "Feilutformet del for ekstern-kropp."
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
msgid "Reconfiguring folder"
msgstr "Omkonfigurerer mappe"
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9274,28 +9340,28 @@ msgstr ""
"Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
"ikke kunne åpne denne mappen igjen: %s: %s"
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr "Kan ikke lagre metainformasjon om mappe på: %s: %s"
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr "Kan ikke slette metainformasjon for mappe %s: %s"
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1071
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "Endrer mappe \"%s\" til \"%s\"-format"
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1086
#, c-format
msgid "%s may not be reconfigured because it is not a local folder"
msgstr ""
"%s kan kanskje ikke konfigureres på nytt fordi det ikke er en lokal mappe"
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1108
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
@@ -9303,11 +9369,11 @@ msgstr ""
"Hvis du ikke kan åpne denne postboksen igjen må\n"
"du reparere den manuelt."
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1199
msgid "You cannot change the format of a non-local folder."
msgstr "Du kan ikke endre format på en ikke-lokal mappe."
-#: mail/mail-local.c:1190
+#: mail/mail-local.c:1209
#, c-format
msgid "Reconfigure %s"
msgstr "Omkonfigurer %s"
@@ -9331,20 +9397,24 @@ msgstr ""
"%s"
#. Remember the password?
-#: mail/mail-mt.c:477
+#: mail/mail-mt.c:509
msgid "Remember this password"
msgstr "Husk dette passordet"
-#: mail/mail-mt.c:534
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr "Husk dette passordet for resten av denne sesjonen"
+
+#: mail/mail-mt.c:567
#, c-format
msgid "Enter Password for %s"
msgstr "Skriv inn passord for %s"
-#: mail/mail-mt.c:537
+#: mail/mail-mt.c:570
msgid "Enter Password"
msgstr "Skriv inn passord"
-#: mail/mail-mt.c:847
+#: mail/mail-mt.c:886
msgid "Working"
msgstr "Arbeider"
@@ -9499,6 +9569,11 @@ msgstr "Kan ikke skrive data: %s"
msgid "Disconnecting from %s"
msgstr "Kobler fra %s"
+#: mail/mail-ops.c:2065
+#, c-format
+msgid "Reconnecting to %s"
+msgstr "Kobler til %s på nytt"
+
#: mail/mail-search-dialogue.c:113
msgid "_Search"
msgstr "_Søk"
@@ -9592,20 +9667,38 @@ msgstr "Videresendt melding - %s"
msgid "Forwarded message"
msgstr "Videresendt melding"
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:437
msgid "Forwarded Message"
msgstr "Videresendt melding"
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
#, c-format
msgid "Setting up vfolder: %s"
msgstr "Setter opp vmappe: %s"
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Oppdaterer vfoldere for URI: %s"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+" '%s'\n"
+"And have been updated."
+msgstr ""
+"Følgende vFolder(e):\n"
+"%sBrukte fjernet mappe:\n"
+" '%s'\n"
+"Og har blitt oppdatert."
+
+#: mail/mail-vfolder.c:636
msgid "VFolders"
msgstr "VMapper"
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
msgid "New VFolder"
msgstr "Ny VFolder"
@@ -9674,7 +9767,7 @@ msgstr "%a %l:%M %p"
msgid "%b %d %Y"
msgstr "%b %d %Y"
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
msgid "Generating message list"
msgstr "Genererer meldingsliste"
@@ -9759,31 +9852,31 @@ msgstr "_Fjern abonnement"
msgid "Evolution component for the executive summary."
msgstr "Evolution-komponent for sammendrag."
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
msgid "Folder containing the Evolution Summary"
msgstr "Mappe som inneholder Evolution sammendrag"
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
msgid "Cannot initialize Evolution's Executive Summary component."
msgstr "Kan ikke initiere Evolutions sammendragskomponent."
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
msgid "Appointments"
msgstr "Avtaler"
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
msgid "No appointments"
msgstr "Ingen avtaler"
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
msgid "%k%M %d %B"
msgstr "%k%M %d %B"
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
msgid "%l:%M %d %B"
msgstr "%l: %M %d %B"
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
msgid "Mail summary"
msgstr "E-post sammendrag"
@@ -9791,81 +9884,81 @@ msgstr "E-post sammendrag"
#. see in My Evolution by default. You can find the list of all
#. stations and their codes in Evolution sources
#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
msgid "KBOS:ZSAM:EGAA"
msgstr "KBOS:ZSAM:EGAA"
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
msgid "Dictionary.com Word of the Day"
msgstr "Dictionary.com Ord for dagen"
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
msgid "Quotes of the Day"
msgstr "Dagens sitat"
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
msgid "Add a news feed"
msgstr "Legg til news-tjener"
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
msgid "Enter the URL of the news feed you wish to add"
msgstr "Skriv inn URL for nyhetsstedet du vil legge til"
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
msgid "Name:"
msgstr "Navn:"
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
msgid "Summary Settings"
msgstr "Innstillinger for sammendrag"
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:291 my-evolution/e-summary-rdf.c:376
+#: my-evolution/e-summary-rdf.c:409
msgid "Error downloading RDF"
msgstr "Feil under nedlasting av RDF"
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:501
msgid "News Feed"
msgstr "Nyhetstjenester"
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
msgid "No tasks"
msgstr "Ingen oppgaver"
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
msgid "(No Description)"
msgstr "(Ingen beskrivelse)"
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
msgid "My Weather"
msgstr "Min værmelding"
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
msgid "<dd><b>The weather server could not be contacted</b></dd>"
msgstr "<dd><b>Vær-tjeneren kunne ikke kontaktes</b></dd>"
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
msgid "Weather"
msgstr "Vær"
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
msgid "Regions"
msgstr "Regioner"
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
msgid "%A, %B %e %Y"
msgstr "%A, %B %e %Y"
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
msgid "Print Summary"
msgstr "Skriv ut sammendrag"
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
msgid "Printing of Summary failed"
msgstr "Feil under utskrift av sammendrag"
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr "Executive summary komponent kunne ikke initialisere Bonobo.\n"
@@ -11269,37 +11362,37 @@ msgstr ""
"Evolution-katalogen. Venligst flytt den for å \n"
"tillate installasjon av Evolution's brukerfiler."
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
msgid "Cannot move a folder over itself."
msgstr "Kan ikke flytte en mappe over seg selv."
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
msgid "Cannot copy a folder over itself."
msgstr "Kan ikke kopiere en mappe oppå seg selv."
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
msgid "Cannot move a folder into one of its descendants."
msgstr "Kan ikke flytte en mappe til en av sine egne undermapper."
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
#, c-format
msgid "Specify a folder to copy folder \"%s\" into:"
msgstr "Spesifiser en mappe som mappen \"%s\" skal kopieres til:"
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
msgid "Copy folder"
msgstr "Kopier mappe"
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
#, c-format
msgid "Specify a folder to move folder \"%s\" into:"
msgstr "Spesifiser en mappe å flytte mappen \"%s\" til:"
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
msgid "Move folder"
msgstr "Flytt mappe"
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
#, c-format
msgid ""
"Cannot delete folder:\n"
@@ -11308,33 +11401,34 @@ msgstr ""
"Kunne ikke slette mappe:\n"
"%s"
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
#, c-format
-msgid "Delete folder '%s'"
-msgstr "Slett mappe '%s'"
+msgid "Delete \"%s\""
+msgstr "Slett \"%s\""
#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
#, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
-msgstr "Er du sikker på at du vil fjerne mappen '%s'?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
+msgstr "Er du sikker på at du vil fjerne mappen \"%s\"?"
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
+#: shell/e-shell-folder-commands.c:470
#, c-format
-msgid "Rename folder '%s'"
-msgstr "Endre navn på mappe '%s'"
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"Kunne ikke endre navn på mappe:\n"
+"%s"
-#: shell/e-shell-folder-commands.c:472
-msgid "Rename"
-msgstr "Endre navn"
+#: shell/e-shell-folder-commands.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Endre navn på mappe \"%s\" til:"
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Mappenavn:"
+#: shell/e-shell-folder-commands.c:506
+msgid "Rename folder"
+msgstr "Endre navn på mappe"
#: shell/e-shell-folder-creation-dialog.c:111
#, c-format
@@ -11370,7 +11464,7 @@ msgstr "Spesifisert mappenavn er ikke gyldig: %s"
msgid "Evolution - Create new folder"
msgstr "Evolution - Lag ny mappe"
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
msgid ""
"The type of the selected folder is not valid for\n"
"the requested operation."
@@ -11378,7 +11472,7 @@ msgstr ""
"Typen for valgt mappe er ikke gyldig for den\n"
"forespurte operasjonen."
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
msgid "New..."
msgstr "Ny..."
@@ -11386,7 +11480,11 @@ msgstr "Ny..."
msgid "(Untitled)"
msgstr "(Uten navn)"
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr "Velg type importerer som skal kjøres"
+
+#: shell/e-shell-importer.c:144
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -11400,9 +11498,13 @@ msgstr ""
"Du kan velge \"Automatisk\" hvis du ikke vet, så vil Evolution prøve å finne "
"ut hvilken type det er for deg."
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr "Vennligst velg informasjon du ønsker å importere"
+
#. Importer isn't ready yet.
#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
#, c-format
msgid ""
"Importing %s\n"
@@ -11413,7 +11515,7 @@ msgstr ""
"Importerer ikke klar.\n"
"Venter 5 sekunder før nytt forsøk."
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
#, c-format
msgid ""
"Importing %s\n"
@@ -11422,16 +11524,16 @@ msgstr ""
"Importerer %s\n"
"Importerer oppføring %d."
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
#, c-format
msgid "File %s does not exist"
msgstr "Filen %s eksisterer ikke"
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
msgid "You may only import to local folders"
msgstr "Du kan kun importere til lokale mapper"
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -11440,11 +11542,11 @@ msgstr ""
"Ingen importerer som kan håndtere\n"
"%s"
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
msgid "Importing"
msgstr "Importerer"
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
#, c-format
msgid ""
"Importing %s.\n"
@@ -11453,17 +11555,17 @@ msgstr ""
"Importerer %s.\n"
"Starter %s"
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
#, c-format
msgid "Error starting %s"
msgstr "Feil under start av %s"
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
#, c-format
msgid "Error loading %s"
msgstr "Feil under lasting av %s"
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
#, c-format
msgid ""
"Importing %s\n"
@@ -11472,31 +11574,56 @@ msgstr ""
"Importerer %s\n"
"Importerer oppføring 1."
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
msgid "Automatic"
msgstr "Automatisk"
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
msgid "Filename:"
msgstr "Filnavn:"
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
msgid "Select a file"
msgstr "Velg en fil"
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
msgid "File type:"
msgstr "Filtype:"
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr "Importer data og innstillinger fra andre programmer"
+
+#: shell/e-shell-importer.c:655
+msgid "Import a single file"
+msgstr "Importer en enkelt fil"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Vennligst vent...\n"
+"Søker etter eksisterende oppsett"
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr "Starter intelligent import"
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, c-format
+msgid "From %s:"
+msgstr "Fra %s:"
+
+#: shell/e-shell-importer.c:1003
msgid "Select folder"
msgstr "Velg mappe"
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
msgid "Select a destination folder for importing this data"
msgstr "Velg en målmappe for å importere data"
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
msgid "Import"
msgstr "Importer"
@@ -11517,23 +11644,6 @@ msgstr ""
msgid "Cannot initialize the Evolution Mailer Wizard interface"
msgstr "Kan ikke initiere assistentgrensesnittet for Evolution"
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-"Vennligst vent...\n"
-"Søker etter eksisterende oppsett"
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr "Starter intelligent import"
-
-#: shell/e-shell-startup-wizard.c:703
-#, c-format
-msgid "From %s:"
-msgstr "Fra %s:"
-
#: shell/e-shell-startup-wizard.c:745
msgid ""
"Please select the information\n"
@@ -11542,23 +11652,23 @@ msgstr ""
"Vennligst velg informasjonen\n"
"du ønsker å importere"
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
msgid "Bug buddy was not found in your $PATH."
msgstr "Bug buddy ble ikke funnet i din $PATH."
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
msgid "Bug buddy could not be run."
msgstr "Bug buddy kunne ikke kjøres."
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
msgid "Ximian Evolution"
msgstr "Ximian Evolution"
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
msgid ""
"Ximian Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
@@ -11568,27 +11678,36 @@ msgstr ""
"for e-post, kalender og kontaktdatabaser for\n"
"GNOME skrivebordsmiljøet."
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
msgid "Go to folder..."
msgstr "Gå til mappe..."
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
msgid "Select the folder that you want to open"
msgstr "Velg mappen du ønsker å åpne"
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
msgid "Create a new shortcut"
msgstr "Opprett en ny snarvei"
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
msgid "Select the folder you want the shortcut to point to:"
msgstr "Velg mappen du ønsker snarveien skal peke til:"
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "GNOME pilot verktøyene ser ikke ut til å være installert på dette systemet."
+
+#: shell/e-shell-view-menu.c:603
+#, c-format
+msgid "Error executing %s."
+msgstr "Feil under kjøring av %s."
+
+#: shell/e-shell-view-menu.c:705
msgid "Work Online"
msgstr "Arbeid \"online\""
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
#: ui/evolution.xml.h:31
msgid "Work Offline"
msgstr "Arbeid \"offline\""
@@ -11597,49 +11716,49 @@ msgstr "Arbeid \"offline\""
msgid "(No folder displayed)"
msgstr "(Ingen mappe vist)"
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
#, c-format
msgid "%s (%d)"
msgstr "%s (%d)"
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
msgid "(None)"
msgstr "(Ingen)"
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
#, c-format
msgid "%s - Ximian Evolution %s"
msgstr "%s - Ximian Evolution %s"
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
#, c-format
msgid "%s - Ximian Evolution %s [%s]"
msgstr "%s - Ximian Evolution %s [%s]"
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
"Ximian Evolution er koblet til. Klikk på denne knappen for å arbeide "
"frakoblet."
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
msgid "Ximian Evolution is in the process of going offline."
msgstr "Ximian Evolution er i ferd med å koble fra."
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
"Ximian Evolution er frakoblet. Klikk på denne knappen for å arbeide "
"tilkoblet."
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "Kan ikke sette opp lokal lagring -- %s"
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
#, c-format
msgid ""
"Ooops! The views for `%s' have died unexpectedly. :-(\n"
@@ -11648,23 +11767,23 @@ msgstr ""
"Ops! Visningen for `%s' døde uventet. :-(\n"
"Dette betyr sannsynligvis at komponenten %s har krasjet."
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
msgid "OK"
msgstr "OK"
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
msgid "Invalid arguments"
msgstr "Ugyldige argumenter"
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
msgid "Cannot register on OAF"
msgstr "Kan ikke registrere i OAF"
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
msgid "Configuration Database not found"
msgstr "Konfigurasjonsdatabase ikke funnet"
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
msgid "Generic error"
msgstr "Vanlig feil"
@@ -11789,51 +11908,60 @@ msgstr "Feil under lagring av snarveier."
msgid "Shortcuts"
msgstr "Snarveier"
+#: shell/e-storage-set-view.c:645
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Kan ikke overføre mappe:\n"
+"%s"
+
#: shell/e-storage.c:182 shell/e-storage.c:188
msgid "(No name)"
msgstr "(Uten navn)"
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
msgid "No error"
msgstr "Ingen feil"
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
msgid "A folder with the same name already exists"
msgstr "En mappe med samme navn eksisterer allerede"
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
msgid "The specified folder type is not valid"
msgstr "Spesifisert mappetype er ikke gyldig"
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
msgid "I/O error"
msgstr "I/U-feil"
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
msgid "Not enough space to create the folder"
msgstr "Ikke nok plass til å opprette mappen"
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
msgid "The specified folder was not found"
msgstr "Spesifisert mappe ble ikke funnet"
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
msgid "Function not implemented in this storage"
msgstr "Funksjonen er ikke implementert i dette lageret"
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
msgid "Operation not supported"
msgstr "Operasjonen er ikke støttet"
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
msgid "The specified type is not supported in this storage"
msgstr "Spesifisert type er ikke støttet for dette lageret"
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
msgid "The specified folder cannot be modified or removed"
msgstr "Spesifisert mappe kan ikke endres eller fjernes"
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
msgid "Cannot make a folder a child of one of its descendants"
msgstr "Kan ikke gjøre en mappe til barn av en av sine etterkommere"
@@ -11863,6 +11991,10 @@ msgstr "Vert"
msgid "The following connections are currently active:"
msgstr "Følgende forbindelser er aktive:"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Mappenavn:"
+
#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
msgid "Folder type:"
msgstr "Mappetype:"
@@ -11914,14 +12046,22 @@ msgid "Evolution Importer Assistant"
msgstr "Importeringsassistent for Evolution"
#: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr "Importer fil (Steg 2 av 2)"
+msgid "Import File (step 3 of 3)"
+msgstr "Importer fil (steg 3 av 3)"
#: shell/importer/import.glade.h:5
-msgid "Select a File (step 1 of 2)"
-msgstr "Velg en fil (steg 1 av 2)"
+msgid "Importer Type (step 1 of 3)"
+msgstr "Importer type (steg 1 av 3)"
#: shell/importer/import.glade.h:6
+msgid "Select Importers (step 2 of 3)"
+msgstr "Velg importerere (steg 2 av 3)"
+
+#: shell/importer/import.glade.h:7
+msgid "Select a File (step 2 of 3)"
+msgstr "Velg en fil (steg 2 av 3)"
+
+#: shell/importer/import.glade.h:8
msgid ""
"Welcome to the Evolution Import Assistant.\n"
"With this assistant you will be guided through the process of\n"
@@ -12138,13 +12278,6 @@ msgstr "_Søk etter kontakter"
msgid "_Select All"
msgstr "_Velg alle"
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "_Verktøy"
-
#: ui/evolution-calendar.xml.h:2
msgid "Configure the calendar's settings"
msgstr "Konfigurer innstillinger for kalender"
@@ -12927,6 +13060,11 @@ msgstr "_Normal visning"
msgid "_Open Message"
msgstr "_Åpne melding"
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:50
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "_Verktøy"
+
#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
msgid "Close this window"
msgstr "Lukk dette vinduet"
@@ -12938,8 +13076,8 @@ msgstr "Lukk dette vinduet"
msgid "_Close"
msgstr "L_ukk"
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:51
msgid "_View"
msgstr "_Vis"
@@ -13263,8 +13401,8 @@ msgid "Exit the program"
msgstr "Avslutt programmet"
#: ui/evolution.xml.h:15
-msgid "Import an external file format"
-msgstr "Importer et eksternt filformat"
+msgid "Import data from other programs"
+msgstr "Importer data fra andre programmer"
#: ui/evolution.xml.h:17
msgid "Move this folder to another place"
@@ -13339,8 +13477,8 @@ msgid "_Go to Folder..."
msgstr "_Gå til mappe..."
#: ui/evolution.xml.h:42
-msgid "_Import File..."
-msgstr "_Importer fil..."
+msgid "_Import..."
+msgstr "_Importer..."
#: ui/evolution.xml.h:43
msgid "_Move..."
@@ -13355,18 +13493,22 @@ msgid "_New Folder"
msgstr "_Ny mappe"
#: ui/evolution.xml.h:46
+msgid "_Pilot Settings..."
+msgstr "Innstillinger for _pilot..."
+
+#: ui/evolution.xml.h:47
msgid "_Rename..."
msgstr "_Gi nytt navn..."
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
msgid "_Shortcut"
msgstr "_Snarvei"
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:49
msgid "_Shortcut Bar"
msgstr "_Snarveilinje"
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
msgid "_Work Offline"
msgstr "Ar_beid \"offline\""
@@ -13463,11 +13605,11 @@ msgstr "MTOTFLS"
msgid "%B %Y"
msgstr "%B %Y"
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
msgid "Now"
msgstr "nå"
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
msgid "Today"
msgstr "I dag"
@@ -13610,18 +13752,60 @@ msgstr "Personlig adressebok-tjener"
msgid "The Personal Calendar Server; calendar factory"
msgstr "Personlig adressebok-tjener; factory"
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
msgid "setup_vfs(): could not initialize GNOME-VFS"
msgstr "setup_vfs(): kunne ikke initiere GNOME-VFS"
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
msgid "init_corba(): could not initialize GNOME"
msgstr "init_corba(): kunne ikke initiere GNOME"
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
+#~ msgid "_Calendar Information:"
+#~ msgstr "_Kalenderinformasjon:"
+
+#~ msgid "_Free/Busy Information:"
+#~ msgstr "_Ledig/opptatt-informasjon"
+
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr "Prioriteten må være en av 'Høy', 'Normal', 'Lav' eller 'Udefinert'."
+
+#~ msgid "before start of appointment"
+#~ msgstr "før avtalen starter"
+
+#~ msgid "after start of appointment"
+#~ msgstr "etter avtalens start"
+
+#~ msgid "before end of appointment"
+#~ msgstr "før avtalens slutt"
+
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Evolution snarveier"
+
+#~ msgid "Each account must have a different name."
+#~ msgstr "Kontoene må ha forskjellige navn."
+
+#~ msgid "Message _preview should be displayed by default"
+#~ msgstr "Forhåndsvisning av meldinger skal være _på som standard"
+
+#~ msgid "Message list should display in a _threaded fashion by default"
+#~ msgstr "Meldingslisten skal vises med _tråder som standard"
+
+#~ msgid "_Remember PGP Passphrase until exit"
+#~ msgstr "Husk PGP-passo_rd til du avslutter"
+
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Slett mappe '%s'"
+
+#~ msgid "Rename"
+#~ msgstr "Endre navn"
+
+#~ msgid "_Import File..."
+#~ msgstr "_Importer fil..."
+
#~ msgid "Unable to get local storage. This should never happen."
#~ msgstr "Kunne ikke finne lokalt lager. Burde aldri skje."
@@ -14467,9 +14651,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Moving folder %s to %s"
#~ msgstr "Flytter mappe %s til %s"
-#~ msgid "Copying folder %s to %s"
-#~ msgstr "Kopierer mappe %s til %s"
-
#~ msgid "="
#~ msgstr "="
@@ -15540,9 +15721,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "%a, %b %d / %H:%M"
#~ msgstr "%a, %b %d / %H:%M"
-#~ msgid "Unknown observation time"
-#~ msgstr "Ukjent observasjonstid"
-
#~ msgid "Calm"
#~ msgstr "Rolig"
@@ -18474,9 +18652,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Cannot copy data to output file: %s"
#~ msgstr "Kan ikke kopiere data til utfil: %s"
-#~ msgid "Cannot append message to mh folder: %s"
-#~ msgstr "Kan ikke legge til melding i mh-mappe: %s"
-
#~ msgid "Could not rename folder `%s': %s"
#~ msgstr "Kunne ikke endre navn på mappe `%s': %s"