aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/ChangeLog4
-rw-r--r--po/no.po1829
2 files changed, 1005 insertions, 828 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 8b0e38cbb2..0bb5f105fc 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-06 Kjartan Maraas <kmaraas@gnome.org>
+
+ * no.po: Updated Norwegian (bokmål) translation.
+
2001-09-05 Gediminas Paulauskas <menesis@delfi.lt>
* lt.po: Updated Lithuanian translation.
diff --git a/po/no.po b/po/no.po
index 7f2f448555..916b34a4b9 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-08-30 09:19+0200\n"
-"PO-Revision-Date: 2001-08-30 10:01+0200\n"
+"POT-Creation-Date: 2001-09-06 00:08+0200\n"
+"PO-Revision-Date: 2001-09-06 00:09+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,283 @@ msgstr "Factory for import av VCard-filer til Evolution."
msgid "Imports VCard files into Evolution."
msgstr "Importerer VCard-filer til Evolution."
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card-simple.c:58
+#: addressbook/gui/widgets/e-addressbook-view.c:870
+msgid "File As"
+msgstr "Lagre som"
+
+#: addressbook/backend/ebook/e-card-simple.c:59
+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:872
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/contact-editor/e-contact-editor.c:1581
+msgid "Primary"
+msgstr "Primær"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+msgid "Prim"
+msgstr "Pri"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/contact-editor/e-contact-editor.c:1566
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/contact-editor/e-contact-editor.c:1567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1634
+msgid "Business"
+msgstr "Arbeid"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+msgid "Bus"
+msgstr "Buss"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+msgid "Callback"
+msgstr "Tilbakering"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1572
+msgid "Company"
+msgstr "Firma"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+msgid "Comp"
+msgstr "Datamaskin"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1635
+msgid "Home"
+msgstr "Hjemme"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+msgid "Organization"
+msgstr "Organisasjon"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+msgid "Org"
+msgstr "Org"
+
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+msgid "Mobile"
+msgstr "Mobil"
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+msgid "Car"
+msgstr "Bil"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1569
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+msgid "Business Fax"
+msgstr "Faks på arbeid"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+msgid "Bus Fax"
+msgstr "Faks i buss"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+msgid "Home Fax"
+msgstr "Faks hjemme"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+msgid "Business 2"
+msgstr "Arbeid 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+msgid "Bus 2"
+msgstr "Buss 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+msgid "Home 2"
+msgstr "Hjemme 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1576
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/contact-editor/e-contact-editor.c:1578
+#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: mail/mail-config.glade.h:51
+msgid "Other"
+msgstr "Andre"
+
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Other Fax"
+msgstr "Annen faks"
+
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1580
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+msgid "Pager"
+msgstr "Personsøker"
+
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1582
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1583
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/widgets/e-addressbook-view.c:894
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/gui/widgets/e-addressbook-view.c:896
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Email 3"
+msgstr "E-post 3"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Web Site"
+msgstr "Nettside"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+msgid "Url"
+msgstr "Url"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+msgid "Department"
+msgstr "Avdeling"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+msgid "Dep"
+msgstr "Avd"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+msgid "Office"
+msgstr "Kontor"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+msgid "Off"
+msgstr "Av"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+msgid "Title"
+msgstr "Tittel"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+msgid "Profession"
+msgstr "Yrke"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+msgid "Prof"
+msgstr "Yrke"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+msgid "Manager"
+msgstr "Leder"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+msgid "Man"
+msgstr "Mann"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+msgid "Ass"
+msgstr "Ass"
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+msgid "Nickname"
+msgstr "Kallenavn"
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+msgid "Nick"
+msgstr "Kallenavn"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:906
+msgid "Spouse"
+msgstr "Ektefelle"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:907
+msgid "Note"
+msgstr "Kommentar"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:908
+msgid "Free-busy URL"
+msgstr "Fri-ledig URL"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+msgid "FBUrl"
+msgstr "FBUrl"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Anniversary"
+msgstr "Bryllupsdag"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Anniv"
+msgstr "Br.dag"
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+msgid "Birth Date"
+msgstr "Fødselsdato"
+
+#: 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.c:3684
msgid "Card: "
msgstr "Kort: "
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3686
msgid ""
"\n"
"Name: "
@@ -33,7 +305,7 @@ msgstr ""
"\n"
"Navn:"
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3687
msgid ""
"\n"
" Prefix: "
@@ -41,7 +313,7 @@ msgstr ""
"\n"
"Prefiks: "
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3688
msgid ""
"\n"
" Given: "
@@ -49,7 +321,7 @@ msgstr ""
"\n"
"Oppgitt: "
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3689
msgid ""
"\n"
" Additional: "
@@ -57,7 +329,7 @@ msgstr ""
"\n"
"Tillegg: "
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3690
msgid ""
"\n"
" Family: "
@@ -65,7 +337,7 @@ msgstr ""
"\n"
"Familie: "
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3691
msgid ""
"\n"
" Suffix: "
@@ -73,7 +345,7 @@ msgstr ""
"\n"
"Suffiks: "
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3705
msgid ""
"\n"
"Birth Date: "
@@ -81,7 +353,7 @@ msgstr ""
"\n"
"Fødselsdato: "
-#: addressbook/backend/ebook/e-card.c:3628
+#: addressbook/backend/ebook/e-card.c:3716
msgid ""
"\n"
"Address:"
@@ -89,7 +361,7 @@ msgstr ""
"\n"
"Adresse:"
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3718
msgid ""
"\n"
" Postal Box: "
@@ -97,7 +369,7 @@ msgstr ""
"\n"
"Postboks: "
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3719
msgid ""
"\n"
" Ext: "
@@ -105,7 +377,7 @@ msgstr ""
"\n"
"Linje: "
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3720
msgid ""
"\n"
" Street: "
@@ -113,7 +385,7 @@ msgstr ""
"\n"
"Gate: "
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3721
msgid ""
"\n"
" City: "
@@ -121,7 +393,7 @@ msgstr ""
"\n"
"By: "
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3722
msgid ""
"\n"
" Region: "
@@ -129,7 +401,7 @@ msgstr ""
"\n"
"Region: "
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3723
msgid ""
"\n"
" Postal Code: "
@@ -137,7 +409,7 @@ msgstr ""
"\n"
"Postnummer: "
-#: addressbook/backend/ebook/e-card.c:3636
+#: addressbook/backend/ebook/e-card.c:3724
msgid ""
"\n"
" Country: "
@@ -145,7 +417,7 @@ msgstr ""
"\n"
"Land: "
-#: addressbook/backend/ebook/e-card.c:3649
+#: addressbook/backend/ebook/e-card.c:3737
msgid ""
"\n"
"Delivery Label: "
@@ -153,7 +425,7 @@ msgstr ""
"\n"
"Leveringsetikett: "
-#: addressbook/backend/ebook/e-card.c:3661
+#: addressbook/backend/ebook/e-card.c:3749
msgid ""
"\n"
"Telephones:\n"
@@ -161,7 +433,7 @@ msgstr ""
"\n"
"Telefoner:\n"
-#: addressbook/backend/ebook/e-card.c:3664
+#: addressbook/backend/ebook/e-card.c:3752
msgid ""
"\n"
"Telephone:"
@@ -169,7 +441,7 @@ msgstr ""
"\n"
"Telefon:"
-#: addressbook/backend/ebook/e-card.c:3688
+#: addressbook/backend/ebook/e-card.c:3776
msgid ""
"\n"
"E-mail:\n"
@@ -177,7 +449,7 @@ msgstr ""
"\n"
"E-post:\n"
-#: addressbook/backend/ebook/e-card.c:3691
+#: addressbook/backend/ebook/e-card.c:3779
msgid ""
"\n"
"E-mail:"
@@ -185,7 +457,7 @@ msgstr ""
"\n"
"E-post:"
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3798
msgid ""
"\n"
"Mailer: "
@@ -193,7 +465,7 @@ msgstr ""
"\n"
"E-post program: "
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3804
msgid ""
"\n"
"Time Zone: "
@@ -201,7 +473,7 @@ msgstr ""
"\n"
"Tidssone: "
-#: addressbook/backend/ebook/e-card.c:3724
+#: addressbook/backend/ebook/e-card.c:3812
msgid ""
"\n"
"Geo Location: "
@@ -209,7 +481,7 @@ msgstr ""
"\n"
"Geografisk lokasjon: "
-#: addressbook/backend/ebook/e-card.c:3728
+#: addressbook/backend/ebook/e-card.c:3816
msgid ""
"\n"
"Business Role: "
@@ -217,7 +489,7 @@ msgstr ""
"\n"
"Stilling: "
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3828
msgid ""
"\n"
"Org: "
@@ -225,7 +497,7 @@ msgstr ""
"\n"
"Org: "
-#: addressbook/backend/ebook/e-card.c:3741
+#: addressbook/backend/ebook/e-card.c:3829
msgid ""
"\n"
" Name: "
@@ -233,7 +505,7 @@ msgstr ""
"\n"
"Navn: "
-#: addressbook/backend/ebook/e-card.c:3742
+#: addressbook/backend/ebook/e-card.c:3830
msgid ""
"\n"
" Unit: "
@@ -241,7 +513,7 @@ msgstr ""
"\n"
"Enhet: "
-#: addressbook/backend/ebook/e-card.c:3743
+#: addressbook/backend/ebook/e-card.c:3831
msgid ""
"\n"
" Unit2: "
@@ -249,7 +521,7 @@ msgstr ""
"\n"
"Enhet2: "
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3832
msgid ""
"\n"
" Unit3: "
@@ -257,7 +529,7 @@ msgstr ""
"\n"
"Enhet3: "
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3833
msgid ""
"\n"
" Unit4: "
@@ -265,7 +537,7 @@ msgstr ""
"\n"
"Enhet4: "
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3837
msgid ""
"\n"
"Categories: "
@@ -273,7 +545,7 @@ msgstr ""
"\n"
"Kategorier: "
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3838
msgid ""
"\n"
"Comment: "
@@ -291,7 +563,7 @@ msgstr ""
#.
#. add_SoundType (string, crd->sound.type);
#. }
-#: addressbook/backend/ebook/e-card.c:3763
+#: addressbook/backend/ebook/e-card.c:3851
msgid ""
"\n"
"Unique String: "
@@ -299,7 +571,7 @@ msgstr ""
"\n"
"Unik streng: "
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3854
msgid ""
"\n"
"Public Key: "
@@ -307,11 +579,11 @@ msgstr ""
"\n"
"Offentlig nøkkel: "
-#: addressbook/backend/ebook/e-card.c:4098
+#: addressbook/backend/ebook/e-card.c:4204
msgid "Multiple VCards"
msgstr "Flere VCard"
-#: addressbook/backend/ebook/e-card.c:4106
+#: addressbook/backend/ebook/e-card.c:4212
#, c-format
msgid "VCard for %s"
msgstr "VCard for %s"
@@ -324,7 +596,7 @@ msgstr "VCard for %s"
#: addressbook/gui/component/addressbook-factory.c:48
#: calendar/conduits/calendar/calendar-conduit.c:1204
#: calendar/conduits/todo/todo-conduit.c:1018
-#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:63
msgid "Could not initialize Bonobo"
msgstr "Kunne ikke initialisere Bonobo"
@@ -399,8 +671,8 @@ msgstr "Factory for eksempelkontroll for adressebok"
#: addressbook/gui/component/addressbook-component.c:68
#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
-#: shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1063
msgid "Contacts"
msgstr "Kontakter"
@@ -530,7 +802,7 @@ msgstr "Konton_avn:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:15
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:20
msgid "_Add"
msgstr "_Legg til"
@@ -555,7 +827,7 @@ msgstr "_Port:"
msgid "_Server name:"
msgstr "_Tjenernavn:"
-#: addressbook/gui/component/addressbook-storage.c:138
+#: addressbook/gui/component/addressbook-storage.c:140
msgid "Other Contacts"
msgstr "Andre kontakter"
@@ -655,22 +927,10 @@ msgstr "(ingen)"
#: addressbook/gui/component/e-address-popup.c:466
#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
msgid "Primary Email"
msgstr "Primær e-post"
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:860
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
-#: addressbook/gui/widgets/e-addressbook-view.c:861
-msgid "Email 3"
-msgstr "E-post 3"
-
#: addressbook/gui/component/e-address-popup.c:579
msgid "Select an Action"
msgstr "Velg en handling"
@@ -798,7 +1058,9 @@ msgstr "_Faks på arbeid"
msgid "Ca_tegories..."
msgstr "Ka_tegorier..."
+#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor.c:1213
msgid "Contact Editor"
msgstr "Kontaktredigering"
@@ -859,7 +1121,7 @@ msgstr "_Kontakter..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:21
#: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
+#: calendar/gui/dialogs/meeting-page.c:1483 filter/filter.glade.h:8
#: mail/folder-browser.c:1318 mail/mail-config.glade.h:94
#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:36
@@ -926,99 +1188,15 @@ msgstr ""
msgid "Delete Contact?"
msgstr "Slett kontakt?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:730
+#: addressbook/gui/contact-editor/e-contact-editor.c:735
msgid "This contact belongs to these categories:"
msgstr "Denne kontakten hører til disse kategoriene:"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
-#: addressbook/gui/widgets/e-addressbook-view.c:868
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
-msgid "Business"
-msgstr "Arbeid"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
-msgid "Business 2"
-msgstr "Arbeid 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/widgets/e-addressbook-view.c:848
-msgid "Business Fax"
-msgstr "Faks på arbeid"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
-msgid "Callback"
-msgstr "Tilbakering"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
-msgid "Car"
-msgstr "Bil"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-msgid "Home"
-msgstr "Hjemme"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-msgid "Home 2"
-msgstr "Hjemme 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
-#: addressbook/gui/widgets/e-addressbook-view.c:849
-msgid "Home Fax"
-msgstr "Faks hjemme"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
-msgid "Mobile"
-msgstr "Mobil"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: mail/mail-config.glade.h:51
-msgid "Other"
-msgstr "Andre"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1574
-#: addressbook/gui/widgets/e-addressbook-view.c:854
-msgid "Other Fax"
-msgstr "Annen faks"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
-#: addressbook/gui/widgets/e-addressbook-view.c:855
-msgid "Pager"
-msgstr "Personsøker"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
-msgid "Primary"
-msgstr "Primær"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
-#: addressbook/gui/widgets/e-addressbook-view.c:856
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1578
-#: addressbook/gui/widgets/e-addressbook-view.c:857
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/gui/contact-editor/e-contact-editor.c:1584
msgid "TTY/TDD"
msgstr "TTY/TTD"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#: addressbook/gui/contact-editor/e-contact-editor.c:2203
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "Kunne ikke finne widget for felt: `%s'"
@@ -1032,7 +1210,7 @@ msgid "Edit Full"
msgstr "Rediger alt"
#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:835
+#: addressbook/gui/widgets/e-addressbook-view.c:871
msgid "Full Name"
msgstr "Fullt navn"
@@ -2162,114 +2340,6 @@ msgstr "Avansert søk"
msgid "Search"
msgstr "Søk"
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
#: addressbook/gui/widgets/e-addressbook-model.c:121
msgid "No cards"
msgstr "Ingen kort"
@@ -2283,46 +2353,46 @@ msgstr "1 kort"
msgid "%d cards"
msgstr "%d kort"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:655
-#: addressbook/gui/widgets/e-addressbook-view.c:717
-#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:138
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:753
+#: addressbook/gui/widgets/e-addressbook-view.c:1381
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "Lagre som VCard"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
#: ui/evolution-message-composer.xml.h:13
msgid "Open"
msgstr "Åpne"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:754
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "Videresend kontakt"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:755
msgid "Send Message to Contact"
msgstr "Send melding til kontakt"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:756
#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
#: ui/my-evolution.xml.h:2
msgid "Print"
msgstr "Skriv ut"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
+#: addressbook/gui/widgets/e-addressbook-view.c:758
msgid "Print Envelope"
msgstr "Skriv ut konvolutt"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
+#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:8
#: mail/mail-accounts.c:282 ui/evolution-addressbook.xml.h:8
#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
@@ -2332,7 +2402,7 @@ msgstr "Slett"
#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:451
+#: addressbook/gui/widgets/e-minicard.c:452
msgid "Error modifying card"
msgstr "Feil ved endring av kort"
@@ -2341,7 +2411,7 @@ msgid "Success"
msgstr "Suksess"
#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1654
#: shell/e-storage.c:515
msgid "Unknown error"
msgstr "Ukjent feil"
@@ -2369,8 +2439,8 @@ msgstr "Protokollen er ikke støttet"
#: addressbook/gui/widgets/e-addressbook-util.c:41
#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
-#: camel/camel-service.c:581
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
+#: camel/camel-service.c:580
msgid "Cancelled"
msgstr "Avbrutt"
@@ -2395,131 +2465,90 @@ msgid "Error removing list"
msgstr "Feil ved fjerning av liste"
#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1218
+#: addressbook/gui/widgets/e-addressbook-view.c:1254
msgid "Error removing card"
msgstr "Feil ved fjerning av kort"
-#: addressbook/gui/widgets/e-addressbook-view.c:833
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:399
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:404
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:869
msgid "* Click here to add a contact *"
msgstr "* Klikk her for å legge til en kontakt *"
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-msgid "File As"
-msgstr "Lagre som"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:837
+#: addressbook/gui/widgets/e-addressbook-view.c:873
msgid "Primary Phone"
msgstr "Primær telefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:874
msgid "Assistant Phone"
msgstr "Assistents telefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-view.c:875
msgid "Business Phone"
msgstr "Arbeidstelefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:840
+#: addressbook/gui/widgets/e-addressbook-view.c:876
msgid "Callback Phone"
msgstr "Telefon for tilbakeringing"
-#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: addressbook/gui/widgets/e-addressbook-view.c:877
msgid "Company Phone"
msgstr "Firmatelefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:842
+#: addressbook/gui/widgets/e-addressbook-view.c:878
msgid "Home Phone"
msgstr "Hjemmetelefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-msgid "Organization"
-msgstr "Organisasjon"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:844
+#: addressbook/gui/widgets/e-addressbook-view.c:880
msgid "Business Address"
msgstr "Arbeidsadresse"
-#: addressbook/gui/widgets/e-addressbook-view.c:845
+#: addressbook/gui/widgets/e-addressbook-view.c:881
msgid "Home Address"
msgstr "Hjemmeadresse"
-#: addressbook/gui/widgets/e-addressbook-view.c:846
+#: addressbook/gui/widgets/e-addressbook-view.c:882
msgid "Mobile Phone"
msgstr "Mobiltelefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:847
+#: addressbook/gui/widgets/e-addressbook-view.c:883
msgid "Car Phone"
msgstr "Biltelefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:886
msgid "Business Phone 2"
msgstr "Arbeidstelefon 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:887
msgid "Home Phone 2"
msgstr "Hjemmetelefon 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:889
msgid "Other Phone"
msgstr "Annen telefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:858
-msgid "TTY"
-msgstr "TTY"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:895
msgid "Other Address"
msgstr "Annen adresse"
-#: addressbook/gui/widgets/e-addressbook-view.c:862
-msgid "Web Site"
-msgstr "Nettside"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:863
-msgid "Department"
-msgstr "Avdeling"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:864
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:865
-msgid "Title"
-msgstr "Tittel"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:866
-msgid "Profession"
-msgstr "Yrke"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:867
-msgid "Manager"
-msgstr "Leder"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:869
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:870
-msgid "Spouse"
-msgstr "Ektefelle"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:871
-msgid "Note"
-msgstr "Kommentar"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:872
-msgid "Free-busy URL"
-msgstr "Fri-ledig URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1215
+#: addressbook/gui/widgets/e-addressbook-view.c:1251
msgid "Done."
msgstr "Ferdig."
-#: addressbook/gui/widgets/e-addressbook-view.c:1247
+#: addressbook/gui/widgets/e-addressbook-view.c:1283
msgid "Removing cards..."
msgstr "Fjerner kort..."
@@ -2713,12 +2742,12 @@ msgstr "Bredde:"
msgid "_Font..."
msgstr "Skri_fttype..."
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1092
msgid "Print cards"
msgstr "Skriv ut kort"
-#: addressbook/printing/e-contact-print.c:1111
-#: addressbook/printing/e-contact-print.c:1133
+#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1134
msgid "Print card"
msgstr "Skriv ut kort"
@@ -2778,6 +2807,10 @@ msgstr "Factory for eksempelkontroll for kalender"
msgid "Factory to centralize calendar component editor dialogs"
msgstr "Factory for å sentralisere dialoger for kalender-komponent"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+msgid "Factory to create a component editor factory"
+msgstr "Factory for å opprette en factory for komponentredigering"
+
#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
msgid "Alarm notification service"
msgstr "Alarm-tjeneste"
@@ -2845,23 +2878,23 @@ msgstr "Utsett-tid (minutter)"
msgid "_Edit appointment"
msgstr "R_ediger avtale"
-#: calendar/gui/alarm-notify/alarm-queue.c:556
+#: calendar/gui/alarm-notify/alarm-queue.c:606
msgid "No description available."
msgstr "Ingen beskrivelse tilgjengelig."
-#: calendar/gui/alarm-notify/alarm-queue.c:775
-#: calendar/gui/alarm-notify/alarm-queue.c:1074
-#: calendar/gui/alarm-notify/alarm-queue.c:1130
+#: calendar/gui/alarm-notify/alarm-queue.c:825
+#: calendar/gui/alarm-notify/alarm-queue.c:1124
+#: calendar/gui/alarm-notify/alarm-queue.c:1180
msgid "Reminder of your appointment at "
msgstr "Påminnelse om din avtale "
-#: calendar/gui/alarm-notify/alarm-queue.c:1066
+#: calendar/gui/alarm-notify/alarm-queue.c:1116
msgid "Snooze"
msgstr "Utsett"
#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1079
-#: calendar/gui/alarm-notify/alarm-queue.c:1134
+#: calendar/gui/alarm-notify/alarm-queue.c:1129
+#: calendar/gui/alarm-notify/alarm-queue.c:1184
msgid "Ok"
msgstr "Ok"
@@ -2873,11 +2906,11 @@ msgid ""
msgstr ""
"Det er %s. Unix tiden er %ld akkurat nå. Vi bare tenkte du ville vite det."
-#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:58
msgid "Could not initialize GNOME"
msgstr "Kunne ikke initiere GNOME"
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:106
msgid "Could not initialize gnome-vfs"
msgstr "Kunne ikke initiere gnome-vfs"
@@ -2885,42 +2918,42 @@ msgstr "Kunne ikke initiere gnome-vfs"
msgid "Could not create the alarm notify service factory"
msgstr "Kunne ikke opprette factory for alarm-tjenesten"
-#: calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:426
msgid "%A %d %B %Y"
msgstr "%A %d %B %Y"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:429 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:334
msgid "%a %d %b"
msgstr "%a %d %b"
-#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:431 calendar/gui/calendar-commands.c:436
+#: calendar/gui/calendar-commands.c:438
msgid "%a %d %b %Y"
msgstr "%a %d %b %Y"
-#: calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:447
#, c-format
msgid "%d"
msgstr "%d"
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
-#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:449 calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:464
msgid "%d %B %Y"
msgstr "%d %B %Y"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:454
#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
#: my-evolution/e-summary-calendar.c:240
msgid "%d %B"
msgstr "%d %B"
-#: calendar/gui/calendar-commands.c:604
+#: calendar/gui/calendar-commands.c:664
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
@@ -2959,20 +2992,20 @@ msgstr "V"
#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
msgid "High"
msgstr "Høy"
#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
#: calendar/gui/calendar-model.c:1624
#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
msgid "Normal"
msgstr "Normal"
#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
msgid "Low"
msgstr "Lav"
@@ -2999,20 +3032,20 @@ msgid "In Progress"
msgstr "Under arbeid"
#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:688
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-calendar-table.c:403
msgid "Completed"
msgstr "Fullført"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
+#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:323
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:842 e-util/e-time-utils.c:326
+#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:332
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %d.%m.%Y %H:%M:%S %p"
@@ -3053,7 +3086,7 @@ msgid "Undefined"
msgstr "Udefinert"
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
+#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:360
#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1430
#: mail/mail-accounts.c:144 mail/mail-accounts.c:391
#: mail/mail-config.glade.h:49
@@ -3071,15 +3104,15 @@ msgstr "Gjeninntreffer"
msgid "Assigned"
msgstr "Tildelt"
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1187
-#: calendar/gui/dialogs/meeting-page.c:1283
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:637
+#: calendar/gui/dialogs/meeting-page.c:647
+#: calendar/gui/dialogs/meeting-page.c:1179
+#: calendar/gui/dialogs/meeting-page.c:1286
msgid "Yes"
msgstr "Ja"
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1284
+#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:649
+#: calendar/gui/dialogs/meeting-page.c:1287
msgid "No"
msgstr "Nei"
@@ -3115,40 +3148,40 @@ msgstr "Kommentar inneholder"
msgid "Unmatched"
msgstr "Ingen treff"
-#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:61 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1057
msgid "Calendar"
msgstr "Kalender"
-#: calendar/gui/component-factory.c:55
+#: calendar/gui/component-factory.c:62
msgid "Folder containing appointments and events"
msgstr "Mappe som inneholder avtaler og hendelser"
-#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
+#: calendar/gui/component-factory.c:66 calendar/gui/print.c:1707
#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
-#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1058
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1060
#: views/tasks/galview.xml.h:1
msgid "Tasks"
msgstr "Oppgaver"
-#: calendar/gui/component-factory.c:56
+#: calendar/gui/component-factory.c:67
msgid "Folder containing to-do items"
msgstr "Mappe som inneholder oppgaver"
-#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:512 ui/evolution-calendar.xml.h:7
msgid "Create a new appointment"
msgstr "Opprett en ny avtale"
-#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#: calendar/gui/component-factory.c:513 calendar/gui/e-day-view.c:3420
msgid "New _Appointment"
msgstr "Ny _avtale"
-#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:518 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:409
+#: calendar/gui/component-factory.c:519
msgid "New _Task"
msgstr "Ny _oppgave"
@@ -3220,95 +3253,95 @@ msgstr "timer"
msgid "minutes"
msgstr "minutter"
-#: calendar/gui/dialogs/alarm-page.c:332
+#: calendar/gui/dialogs/alarm-page.c:304
#, c-format
msgid "%d days"
msgstr "%d dager"
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:306
msgid "1 day"
msgstr "1 dag"
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:309
#, c-format
msgid "%d weeks"
msgstr "%d uker"
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:311
msgid "1 week"
msgstr "1 uke"
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:314
#, c-format
msgid "%d hours"
msgstr "%d timer"
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:316
msgid "1 hour"
msgstr "1 time"
-#: calendar/gui/dialogs/alarm-page.c:347
+#: calendar/gui/dialogs/alarm-page.c:319
#, c-format
msgid "%d minutes"
msgstr "%d minutter"
-#: calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:321
msgid "1 minute"
msgstr "1 minutt"
-#: calendar/gui/dialogs/alarm-page.c:352
+#: calendar/gui/dialogs/alarm-page.c:324
#, c-format
msgid "%d seconds"
msgstr "%d sekunder"
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:326
msgid "1 second"
msgstr "1 sekund"
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:351
#: calendar/gui/dialogs/alarm-page.glade.h:4
msgid "Play a sound"
msgstr "Spill en lyd"
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:355
#: calendar/gui/dialogs/alarm-page.glade.h:3
msgid "Display a message"
msgstr "Vis en melding"
-#: calendar/gui/dialogs/alarm-page.c:387
+#: calendar/gui/dialogs/alarm-page.c:359
#: calendar/gui/dialogs/alarm-page.glade.h:7
msgid "Send an email"
msgstr "Send en melding"
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:363
#: calendar/gui/dialogs/alarm-page.glade.h:6
msgid "Run a program"
msgstr "Kjør et program"
-#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
-#: calendar/gui/dialogs/meeting-page.c:601
-#: calendar/gui/dialogs/meeting-page.c:636
-#: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1255
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/alarm-page.c:369 calendar/gui/dialogs/alarm-page.c:405
+#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:628
+#: calendar/gui/dialogs/meeting-page.c:693
+#: calendar/gui/dialogs/meeting-page.c:1258
+#: calendar/gui/dialogs/meeting-page.c:1274
#: 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:409
+#: calendar/gui/dialogs/alarm-page.c:381
msgid "before start of appointment"
msgstr "før avtalen starter"
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:384
msgid "after start of appointment"
msgstr "etter avtalens start"
-#: calendar/gui/dialogs/alarm-page.c:422
+#: calendar/gui/dialogs/alarm-page.c:394
msgid "before end of appointment"
msgstr "før avtalens slutt"
-#: calendar/gui/dialogs/alarm-page.c:425
+#: calendar/gui/dialogs/alarm-page.c:397
msgid "after end of appointment"
msgstr "etter avtalens slutt"
@@ -3410,7 +3443,7 @@ msgid "First day of wee_k:"
msgstr "Første dag i u_ken:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:969
+#: calendar/gui/dialogs/recurrence-page.c:950
msgid "Friday"
msgstr "Fredag"
@@ -3423,7 +3456,7 @@ msgid "Minutes"
msgstr "Minutter"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:946
msgid "Monday"
msgstr "Mandag"
@@ -3432,7 +3465,7 @@ msgid "O_verdue tasks:"
msgstr "Utgåtte oppga_ver:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:970
+#: calendar/gui/dialogs/recurrence-page.c:951
msgid "Saturday"
msgstr "Lørdag"
@@ -3453,7 +3486,7 @@ msgid "Su_n"
msgstr "Sø_n"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: calendar/gui/dialogs/recurrence-page.c:952
msgid "Sunday"
msgstr "Søndag"
@@ -3470,7 +3503,7 @@ msgid "Tas_ks due today:"
msgstr "Opp_gaver som går ut i dag:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:968
+#: calendar/gui/dialogs/recurrence-page.c:949
msgid "Thursday"
msgstr "Torsdag"
@@ -3491,12 +3524,12 @@ msgid "Time format:"
msgstr "Tidformat:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/recurrence-page.c:947
msgid "Tuesday"
msgstr "Tirsdag"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:967
+#: calendar/gui/dialogs/recurrence-page.c:948
msgid "Wednesday"
msgstr "Onsdag"
@@ -3647,35 +3680,35 @@ msgstr " (Ferdig "
msgid "Due "
msgstr "Ferdig "
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:469
msgid "Edit Appointment"
msgstr "Rediger avtale"
-#: calendar/gui/dialogs/comp-editor.c:467
+#: calendar/gui/dialogs/comp-editor.c:474
#, c-format
msgid "Appointment - %s"
msgstr "Avtale - %s"
-#: calendar/gui/dialogs/comp-editor.c:470
+#: calendar/gui/dialogs/comp-editor.c:477
#, c-format
msgid "Task - %s"
msgstr "Oppgave - %s"
-#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:480
#, c-format
msgid "Journal entry - %s"
msgstr "Journaloppføring - %s"
-#: calendar/gui/dialogs/comp-editor.c:487
+#: calendar/gui/dialogs/comp-editor.c:494
msgid "No summary"
msgstr "Ingen sammendrag"
-#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1529
+#: calendar/gui/dialogs/comp-editor.c:860 mail/mail-callbacks.c:1529
#: mail/mail-display.c:100
msgid "Overwrite file?"
msgstr "Overskriv fil?"
-#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1535
+#: calendar/gui/dialogs/comp-editor.c:864 mail/mail-callbacks.c:1535
#: mail/mail-display.c:104
msgid ""
"A file by that name already exists.\n"
@@ -3684,12 +3717,12 @@ msgstr ""
"En fil med samme navn eksisterer allerede.\n"
"Overskriv den?"
-#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:927 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:1077
+#: calendar/gui/dialogs/comp-editor.c:1080
msgid "Unable to obtain current version!"
msgstr "Kan ikke hente versjonsdata!"
@@ -3819,123 +3852,123 @@ msgstr "S_lutt-tid:"
msgid "_Start time:"
msgstr "_Start-tid:"
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1251
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:585
+#: calendar/gui/dialogs/meeting-page.c:1175
+#: calendar/gui/dialogs/meeting-page.c:1254
msgid "Individual"
msgstr "Individuell"
-#: calendar/gui/dialogs/meeting-page.c:578
-#: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1252
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:587
+#: calendar/gui/dialogs/meeting-page.c:1255
msgid "Group"
msgstr "Gruppe"
-#: calendar/gui/dialogs/meeting-page.c:580
-#: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1253
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:589
+#: calendar/gui/dialogs/meeting-page.c:1256
msgid "Resource"
msgstr "Ressurs"
-#: calendar/gui/dialogs/meeting-page.c:582
-#: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1254
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:591
+#: calendar/gui/dialogs/meeting-page.c:1257
msgid "Room"
msgstr "Rom"
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1267
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:1270
msgid "Chair"
msgstr "Styremedlem"
-#: calendar/gui/dialogs/meeting-page.c:613
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1185
-#: calendar/gui/dialogs/meeting-page.c:1268
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:622
+#: calendar/gui/dialogs/meeting-page.c:1177
+#: calendar/gui/dialogs/meeting-page.c:1271
msgid "Required Participant"
msgstr "Obligatorisk deltaker"
-#: calendar/gui/dialogs/meeting-page.c:615
-#: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1269
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:624
+#: calendar/gui/dialogs/meeting-page.c:1272
msgid "Optional Participant"
msgstr "Valgfri deltaker"
-#: calendar/gui/dialogs/meeting-page.c:617
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1270
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:1273
msgid "Non-Participant"
msgstr "Ikke-deltaker"
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1193
-#: calendar/gui/dialogs/meeting-page.c:1296
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/dialogs/meeting-page.c:678
+#: calendar/gui/dialogs/meeting-page.c:1185
+#: calendar/gui/dialogs/meeting-page.c:1299
msgid "Needs Action"
msgstr "Trenger handling"
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1297
+#: calendar/gui/dialogs/meeting-page.c:657
+#: calendar/gui/dialogs/meeting-page.c:680
+#: calendar/gui/dialogs/meeting-page.c:1300
msgid "Accepted"
msgstr "Godtatt"
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1298
+#: calendar/gui/dialogs/meeting-page.c:659
+#: calendar/gui/dialogs/meeting-page.c:682
+#: calendar/gui/dialogs/meeting-page.c:1301
msgid "Declined"
msgstr "Avslått"
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1299
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:684
+#: calendar/gui/dialogs/meeting-page.c:1302
#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
msgid "Tentative"
msgstr "Tentativ"
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1300
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:686
+#: calendar/gui/dialogs/meeting-page.c:1303
msgid "Delegated"
msgstr "Delegert"
-#: calendar/gui/dialogs/meeting-page.c:675
-#: calendar/gui/dialogs/meeting-page.c:698
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:690
msgid "In Process"
msgstr "Under arbeid"
-#: calendar/gui/dialogs/meeting-page.c:737
+#: calendar/gui/dialogs/meeting-page.c:729
msgid "That person is already attending the meeting!"
msgstr "Denne personen er allerede satt opp for dette møtet!"
-#: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:780
+#: calendar/gui/dialogs/meeting-page.c:834
msgid "Chair Persons"
msgstr "Styremedlemmer"
-#: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:842
-#: calendar/gui/dialogs/meeting-page.c:962
+#: calendar/gui/dialogs/meeting-page.c:782
+#: calendar/gui/dialogs/meeting-page.c:834
+#: calendar/gui/dialogs/meeting-page.c:954
msgid "Required Participants"
msgstr "Obligatoriske deltakere"
-#: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:784
+#: calendar/gui/dialogs/meeting-page.c:834
msgid "Optional Participants"
msgstr "Valgfrie deltakere"
-#: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:786
+#: calendar/gui/dialogs/meeting-page.c:834
msgid "Non-Participants"
msgstr "Ikke-deltakere"
-#: calendar/gui/dialogs/meeting-page.c:920
+#: calendar/gui/dialogs/meeting-page.c:912
msgid "Sent By:"
msgstr "Sendt av:"
-#: calendar/gui/dialogs/meeting-page.c:1471
+#: calendar/gui/dialogs/meeting-page.c:1478
msgid "_Delegate To..."
msgstr "_Deleger til..."
@@ -4004,33 +4037,33 @@ msgstr "_Inviter andre"
msgid "_Other Organizer"
msgstr "Annen _organisator"
-#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:417 calendar/gui/print.c:1839
#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
msgid "%a %b %d %Y"
msgstr "%a %b %d %Y"
-#: calendar/gui/dialogs/recurrence-page.c:584
+#: calendar/gui/dialogs/recurrence-page.c:565
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr ""
"Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
-#: calendar/gui/dialogs/recurrence-page.c:938
+#: calendar/gui/dialogs/recurrence-page.c:919
msgid "on"
msgstr "på"
-#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:945 filter/filter-datespec.c:83
msgid "day"
msgstr "dag"
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1075
msgid "on the"
msgstr "den"
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1083
msgid "th"
msgstr "de"
-#: calendar/gui/dialogs/recurrence-page.c:1275
+#: calendar/gui/dialogs/recurrence-page.c:1256
msgid "occurrences"
msgstr "gjentakelser"
@@ -4125,7 +4158,7 @@ msgid "Progress"
msgstr "Fremgang"
#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:895
+#: my-evolution/e-summary-preferences.c:896
msgid "URL:"
msgstr "URL:"
@@ -4215,28 +4248,28 @@ msgstr "90%"
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1283
+#: 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:1283
#: shell/e-shortcuts-view.c:381
msgid "_Open"
msgstr "_Åpne"
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
+#: 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
#: 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:3432
-#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: 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
#: 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:3407
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
-#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
+#: 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:35
#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
#: ui/evolution-tasks.xml.h:16
msgid "_Paste"
@@ -4267,10 +4300,6 @@ msgstr "Klikk for å legge til en oppgave"
msgid "Alarms"
msgstr "Alarmer"
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategorier"
-
#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:699
#: camel/camel-filter-driver.c:815
msgid "Complete"
@@ -4303,8 +4332,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:1049
-#: shell/e-storage-set-view.c:1481 shell/e-summary-storage.c:78
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1051
+#: shell/e-storage-set-view.c:1479 shell/e-summary-storage.c:80
msgid "Summary"
msgstr "Sammendrag"
@@ -4323,59 +4352,82 @@ 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:1354
+#: 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:1452
msgid "%A %d %B"
msgstr "%A %d %B"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1401
#: calendar/gui/e-week-view-main-item.c:348
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:588 calendar/gui/e-week-view.c:324
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
#: calendar/gui/print.c:759
msgid "am"
msgstr "am"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
#: calendar/gui/print.c:761
msgid "pm"
msgstr "pm"
-#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
+#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
msgid "New All Day _Event"
msgstr "Ny avtale som varer h_ele dagen"
-#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
#: ui/evolution-calendar.xml.h:17
msgid "Go to _Today"
msgstr "Gå _til i dag"
-#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
msgid "_Go to Date..."
msgstr "_Gå til dato..."
-#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
+#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
msgid "_Delete this Appointment"
msgstr "Sle_tt denne avtalen"
-#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
+#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
msgid "Make this Occurrence _Movable"
msgstr "Gjør denne hendelsen _flyttbar"
-#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
msgid "Delete this _Occurrence"
msgstr "Slett denne _hendelsen"
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
msgid "Delete _All Occurrences"
msgstr "Slett _alle hendelser"
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:556
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br>Vennligst sjekk følgende informasjon og velg så en handling fra menuen "
+"under."
+
+#: calendar/gui/e-itip-control.c:571
+#, c-format
+msgid "<b>Summary:</b> %s<br><br>"
+msgstr "<b>Sammendrag:</b> %s<br><br>"
+
+#: calendar/gui/e-itip-control.c:571
+msgid "<i>None</i>"
+msgstr "<i>Ingen</i>"
+
+#: calendar/gui/e-itip-control.c:581
+#, c-format
+msgid "<b>Description:</b> %s"
+msgstr "<b>Beskrivelse:</b> %s"
+
#: calendar/gui/e-itip-control.c:617
#, c-format
msgid "<b>%s</b> has published meeting information."
@@ -4414,7 +4466,7 @@ msgstr "Forespørsel om møteoppdatering"
#: calendar/gui/e-itip-control.c:637
#, c-format
-msgid "<b>%s</b> has replyed to a meeting request."
+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:638
@@ -4478,7 +4530,7 @@ msgstr "Forespørsel om oppgaveoppdatering"
#: calendar/gui/e-itip-control.c:685
#, c-format
-msgid "<b>%s</b> has replyed to a task assignment."
+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:686
@@ -4518,7 +4570,7 @@ msgstr "Ledig/opptatt forespørsel"
#: calendar/gui/e-itip-control.c:723
#, c-format
-msgid "<b>%s</b> has replyed to a free/busy request."
+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:724
@@ -4600,16 +4652,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:3244 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
msgid "New _Appointment..."
msgstr "Ny _avtale..."
-#: calendar/gui/gnome-cal.c:1260
+#: calendar/gui/gnome-cal.c:1318
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "Kunne ikke åpne mappen i `%s'"
-#: calendar/gui/gnome-cal.c:1271
+#: calendar/gui/gnome-cal.c:1329
#, 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"
@@ -4670,10 +4722,18 @@ msgstr "Oktober"
msgid "September"
msgstr "September"
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:254
msgid "An organizer must be set."
msgstr "En organisator må oppgis."
+#: calendar/gui/itip-utils.c:300
+msgid "Calendar attachment"
+msgstr "Kalender-vedlegg"
+
+#: calendar/gui/main.c:92
+msgid "Could not create the component editor factory"
+msgstr "Kunne ikke opprette factory for komponentredigering"
+
#: calendar/gui/print.c:422
msgid "1st"
msgstr "1"
@@ -4955,54 +5015,48 @@ msgid "time-day-begin expects argument 1 to be a time_t"
msgstr "time-day-begin forventer at argument 1 er en time_t"
#: calendar/pcs/query.c:367
-#, fuzzy
msgid "time-day-end expects 1 argument"
-msgstr "tid-nå forventer 0 argumenter"
+msgstr "time-day-end forventer 1 argument"
#: calendar/pcs/query.c:372
-#, fuzzy
msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "lag-tid forventer at argument 1 er en streng"
+msgstr "time-day-end forventer at argument 1 er av type time_t"
#: calendar/pcs/query.c:408
-#, fuzzy
msgid "get-vtype expects 0 arguments"
-msgstr "lag-tid forventer 1 argument"
+msgstr "get-vtype forventer 0 argumenter"
#: calendar/pcs/query.c:504
-#, fuzzy
msgid "occur-in-time-range? expects 2 arguments"
-msgstr "inneholder? forventer 2 argumenter"
+msgstr "occur-in-time-range? forventer 2 argumenter"
#: calendar/pcs/query.c:509
-#, fuzzy
msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr "lag-tid forventer at argument 1 er en streng"
+msgstr "occur-in-time-range? forventer at argument 1 er av type time_t"
#: calendar/pcs/query.c:516
-#, fuzzy
msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr "lag-tid forventer at argument 1 er en streng"
+msgstr "occur-in-time-range forventer at argument 2 er av type time_t"
#: calendar/pcs/query.c:646
msgid "contains? expects 2 arguments"
msgstr "inneholder? forventer 2 argumenter"
#: calendar/pcs/query.c:651
-#, fuzzy
msgid "contains? expects argument 1 to be a string"
-msgstr "lag-tid forventer at argument 1 er en streng"
+msgstr "contains? forventer at argument 1 er en streng"
#: calendar/pcs/query.c:658
-#, fuzzy
msgid "contains? expects argument 2 to be a string"
-msgstr "lag-tid forventer at argument 1 er en streng"
+msgstr "contains? forventer at argument 2 er en streng"
#: calendar/pcs/query.c:675
msgid ""
"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
"\""
msgstr ""
+"contains? forventer at argument 1 er en av \"any\", \"summary\", "
+"\"description\""
#: calendar/pcs/query.c:717
msgid "has-categories? expects at least 1 argument"
@@ -5013,6 +5067,8 @@ msgid ""
"has-categories? expects all arguments to be strings or one and only one "
"argument to be a boolean false (#f)"
msgstr ""
+"has-categories? forventer at alle argumenter er strenger eller ett, og kun "
+"ett, argument er den bolske verdien falsk (#f)"
#: calendar/pcs/query.c:817
msgid "is-completed? expects 0 arguments"
@@ -5343,13 +5399,13 @@ msgstr "Kunne ikke koble til %s (port %d): %s"
msgid "(unknown host)"
msgstr "(ukjent vert)"
-#: camel/camel-remote-store.c:353 camel/camel-remote-store.c:415
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:349 camel/camel-remote-store.c:411
+#: camel/camel-remote-store.c:482
#: camel/providers/imap/camel-imap-command.c:386
msgid "Operation cancelled"
msgstr "Opreasjon avbrutt"
-#: camel/camel-remote-store.c:491
+#: camel/camel-remote-store.c:487
msgid "Server unexpectedly disconnected"
msgstr "Tjener koblet fra uventet."
@@ -5508,37 +5564,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:155
+#: camel/camel-service.c:154
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s' må inneholde et brukernavn"
-#: camel/camel-service.c:163
+#: camel/camel-service.c:162
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s' må inneholde et vertsnavn"
-#: camel/camel-service.c:171
+#: camel/camel-service.c:170
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' må inneholde en sti"
-#: camel/camel-service.c:549
+#: camel/camel-service.c:548
#, c-format
msgid "Resolving: %s"
msgstr "Finner: \"%s\""
-#: camel/camel-service.c:576
+#: camel/camel-service.c:575
#, c-format
msgid "Failure in name lookup: %s"
msgstr "Feil i navneoppslag: %s"
-#: camel/camel-service.c:601
+#: camel/camel-service.c:600
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "Vertsoppslag feilet: %s: vert ikke funnet"
-#: camel/camel-service.c:603
+#: camel/camel-service.c:602
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "Vertsoppslag feilet: %s: ukjent årsak"
@@ -5612,7 +5668,7 @@ msgstr ""
"Emne: %s"
#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:368
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
#, c-format
msgid ""
"Bad certificate from %s:\n"
@@ -5627,7 +5683,7 @@ msgstr ""
"\n"
"Vil du akseptere likevel?"
-#: camel/camel-tcp-stream-ssl.c:352
+#: camel/camel-tcp-stream-ssl.c:353
#, c-format
msgid ""
"EMail: %s\n"
@@ -6179,20 +6235,16 @@ msgstr "Spool `%s' eksisterer ikke eller er ikke en vanlig fil"
msgid "Folder `%s/%s' does not exist."
msgstr "Mappen `%s/%s' eksisterer ikke."
-#: camel/providers/local/camel-spool-store.c:176
-msgid "Spool stores do not have an inbox"
-msgstr "Spool-lager har ikke en innboks"
-
-#: camel/providers/local/camel-spool-store.c:186
+#: camel/providers/local/camel-spool-store.c:184
#, c-format
msgid "Spool mail file %s"
msgstr "Spool e-post-fil %s"
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:220
msgid "Spool folders cannot be renamed"
msgstr "Spool-mapper kan ikke være gis nytt navn"
-#: camel/providers/local/camel-spool-store.c:230
+#: camel/providers/local/camel-spool-store.c:228
msgid "Spool folders cannot be deleted"
msgstr "Spoolmapper kan ikke være slettes"
@@ -6648,7 +6700,7 @@ msgstr "Kan ikke sende melding: senderadresse ikke definert."
msgid "Cannot send message: sender address not valid."
msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:602
msgid "Sending message"
msgstr "Sender melding"
@@ -6956,10 +7008,10 @@ msgstr ""
#: composer/e-msg-composer.c:1172
msgid ""
-"Evolution has found unsaved files from a previous session.\n"
+"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
msgstr ""
-"Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
+"Ximian Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
"Vil du prøve å gjenopprette dem?"
#: composer/e-msg-composer.c:1320
@@ -6972,10 +7024,9 @@ msgstr ""
"\n"
"Vil du lagre endringene?"
-#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:217
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1327
+msgid "Warning: Modified Message"
+msgstr "Advarsel: Endret melding"
#: composer/e-msg-composer.c:1350
msgid "Open file"
@@ -7005,6 +7056,10 @@ msgstr ""
msgid "Cannot initialize Evolution's composer."
msgstr "Kan ikke initiere Evolutions composer."
+#: data/evolution.desktop.in.h:1
+msgid "Evolution"
+msgstr "Evolution"
+
#: data/evolution.desktop.in.h:2
msgid "The Evolution groupware suite"
msgstr "Gruppevaresuiten Evolution"
@@ -7050,60 +7105,65 @@ msgid "Subject does not contain"
msgstr "Emne inneholder ikke"
#. strptime format for a date.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:240
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:131
+#: e-util/e-time-utils.c:243
#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
#: widgets/misc/e-dateedit.c:1531
msgid "%m/%d/%Y"
msgstr "%d.%m.%Y"
#. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:362
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:277
+#: e-util/e-time-utils.c:368
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
-#: e-util/e-time-utils.c:354
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:280
+#: e-util/e-time-utils.c:360
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
-#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:284
+#: e-util/e-time-utils.c:365 widgets/misc/e-dateedit.c:1339
#: widgets/misc/e-dateedit.c:1566
msgid "%I:%M %p"
msgstr "%I:%M %p"
+#. strptime format for hour and AM/PM
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:287
+msgid "%I %p"
+msgstr "%I %p"
+
#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
-#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
+#: e-util/e-time-utils.c:111 e-util/e-time-utils.c:290
+#: e-util/e-time-utils.c:357 widgets/misc/e-dateedit.c:1336
#: widgets/misc/e-dateedit.c:1563
msgid "%H:%M"
msgstr "%H:%M"
#. This is the second-choice date format for the locale, which we use
#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:244
+#: e-util/e-time-utils.c:247
msgid "%d/%m/%Y"
msgstr "%d.%m.%Y"
#. This is the third-choice date format for the locale, which we use
#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:248
+#: e-util/e-time-utils.c:251
msgid "%Y/%m/%d"
msgstr "%d.%m.%Y"
#. This is the final-choice date format for the locale, which we use
#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:252
+#: e-util/e-time-utils.c:255
#, c-format
msgid "%x"
msgstr "%x"
#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:308
+#: e-util/e-time-utils.c:314
#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
msgid "%a %m/%d/%Y"
@@ -7111,13 +7171,13 @@ msgstr "%a %d.%m.%Y"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:313
+#: e-util/e-time-utils.c:319
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %m/%d/%Y %H:%M"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:322
+#: e-util/e-time-utils.c:328
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %m/%d/%Y %I:%M %p"
@@ -7232,7 +7292,7 @@ msgstr " siden"
msgid "ago"
msgstr "siden"
-#: filter/filter-datespec.c:711 mail/message-list.c:936
+#: filter/filter-datespec.c:711 mail/message-list.c:940
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
@@ -7578,18 +7638,44 @@ msgstr "Poengregler"
msgid "Oops. You need to to specify at least one folder as a source."
msgstr "Oops. Du må spesifisere minst en mappe som kilde."
-#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:903 importers/pine-importer.c:648
-#: shell/e-shell-importer.c:684 shell/importer/intelligent.c:194
+#: importers/elm-importer.c:96
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution importerer gammel e-post fra Elm"
+
+#: importers/elm-importer.c:97 importers/netscape-importer.c:108
+#: importers/pine-importer.c:101
+msgid "Importing..."
+msgstr "Importerer..."
+
+#: importers/elm-importer.c:99 importers/netscape-importer.c:110
+#: importers/pine-importer.c:103
+msgid "Please wait"
+msgstr "Vennligst vent"
+
+#: importers/elm-importer.c:171 importers/netscape-importer.c:687
+#: importers/pine-importer.c:438
+#, c-format
+msgid "Importing %s as %s"
+msgstr "Importerer %s som %s"
+
+#: importers/elm-importer.c:377 importers/netscape-importer.c:780
+#: importers/pine-importer.c:571
+#, c-format
+msgid "Scanning %s"
+msgstr "Søker i %s"
+
+#: importers/elm-importer.c:526 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:951 importers/pine-importer.c:732
+#: shell/e-shell-importer.c:701 shell/importer/intelligent.c:194
msgid "Import"
msgstr "Importer"
-#: importers/elm-importer.c:475 importers/netscape-importer.c:908
-#: importers/pine-importer.c:653 mail/component-factory.c:96
+#: importers/elm-importer.c:531 importers/netscape-importer.c:956
+#: importers/pine-importer.c:737 mail/component-factory.c:96
msgid "Mail"
msgstr "Post"
-#: importers/elm-importer.c:498
+#: importers/elm-importer.c:554
msgid ""
"Evolution has found Elm mail files\n"
"Would you like to import them into Evolution?"
@@ -7597,11 +7683,11 @@ msgstr ""
"Evolution har funnet Elm e-post filer.\n"
"Vil du importere dem til Evolution?"
-#: importers/elm-importer.c:527
+#: importers/elm-importer.c:583
msgid "Elm mail"
msgstr "Elm e-post"
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:658
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:742
msgid "Addressbook"
msgstr "Adressebok"
@@ -7613,41 +7699,23 @@ msgstr ""
"Evolution har funnet GnomeCard filer.\n"
"Vil du importere dem til Evolution?"
-#: importers/netscape-importer.c:105
+#: importers/netscape-importer.c:107
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution importerer dine gamle data fra Netscape"
-#: importers/netscape-importer.c:106
-msgid "Importing..."
-msgstr "Importerer..."
-
-#: importers/netscape-importer.c:108
-msgid "Please wait"
-msgstr "Vennligst vent"
-
-#: importers/netscape-importer.c:639
-#, c-format
-msgid "Importing %s as %s"
-msgstr "Importerer %s som %s"
-
-#: importers/netscape-importer.c:732
-#, c-format
-msgid "Scanning %s"
-msgstr "Søker i %s"
-
-#: importers/netscape-importer.c:835
+#: importers/netscape-importer.c:883 importers/pine-importer.c:667
msgid "Scanning directory"
msgstr "Søker i katalog"
-#: importers/netscape-importer.c:844
+#: importers/netscape-importer.c:892
msgid "Starting import"
msgstr "Starter import"
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:961
msgid "Settings"
msgstr "Innstillinger"
-#: importers/netscape-importer.c:938
+#: importers/netscape-importer.c:986
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -7655,7 +7723,11 @@ msgstr ""
"Evolution har funnet Netscape e-post filer.\n"
"Vil du importere dem til Evolution?"
-#: importers/pine-importer.c:684
+#: importers/pine-importer.c:100
+msgid "Evolution is importing your old Pine data"
+msgstr "Evolution importerer gammel e-post fra Pine"
+
+#: importers/pine-importer.c:768
msgid ""
"Evolution has found Pine mail files.\n"
"Would you like to import them into Evolution?"
@@ -7663,7 +7735,7 @@ msgstr ""
"Evolution har funnet Pine e-post filer.\n"
"Vil du importere dem til Evolution?"
-#: importers/pine-importer.c:712
+#: importers/pine-importer.c:796
msgid "Pine mail"
msgstr "Pine e-post"
@@ -7723,27 +7795,27 @@ msgstr "Virtuelle søppelmappe"
msgid "This folder cannot contain messages."
msgstr "Denne mappen kan ikke inneholde meldinger."
-#: mail/component-factory.c:344
+#: mail/component-factory.c:345
msgid "Properties..."
msgstr "Egenskaper ..."
-#: mail/component-factory.c:344
+#: mail/component-factory.c:345
msgid "Change this folder's properties"
msgstr "Endre denne mappens egenskaper"
-#: mail/component-factory.c:766
+#: mail/component-factory.c:769
msgid "New Mail Message"
msgstr "Ny e-post melding"
-#: mail/component-factory.c:766
+#: mail/component-factory.c:769
msgid "New _Mail Message"
msgstr "Ny e-post _melding"
-#: mail/component-factory.c:798
+#: mail/component-factory.c:801
msgid "Cannot initialize Evolution's mail component."
msgstr "Kan ikke initiere Evolutions e-postkomponent."
-#: mail/component-factory.c:937
+#: mail/component-factory.c:940
msgid "Cannot register storage with shell"
msgstr "Kan ikke registrere lagring i skallet"
@@ -8070,7 +8142,9 @@ msgstr ""
msgid ""
"Since the contact list you are sending to is configured to hide the list's "
"addresses, this message will contain only Bcc recipients."
-msgstr "Siden kontaktlisten du sender til er konfigurert til å skjule listens adresser vil denne meldingen kunn inneholde Bcc mottakere."
+msgstr ""
+"Siden kontaktlisten du sender til er konfigurert til å skjule listens "
+"adresser vil denne meldingen kunn inneholde Bcc mottakere."
#: mail/mail-callbacks.c:266
msgid "This message contains only Bcc recipients."
@@ -8082,7 +8156,8 @@ msgid ""
"Apparently-To header.\n"
"Send anyway?"
msgstr ""
-"Det er mulig at e-post tjeneren kan vise mottakerene ved å legge til en \"Apparently-To\" header.\n"
+"Det er mulig at e-post tjeneren kan vise mottakerene ved å legge til en "
+"\"Apparently-To\" header.\n"
"Send likevel?"
#: mail/mail-callbacks.c:359
@@ -8367,7 +8442,7 @@ msgstr "Vis"
msgid "Done"
msgstr "Ferdig"
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
msgid "Drafts"
msgstr "Skisser"
@@ -8521,7 +8596,7 @@ msgid "Sending Mail"
msgstr "Utgående e-post"
#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:179
+#: shell/e-local-storage.c:177
msgid "Sent"
msgstr "Sendt"
@@ -8773,32 +8848,32 @@ msgstr "Lagre lenke som"
msgid "Save Image as..."
msgstr "Lagre bilde som..."
-#: mail/mail-folder-cache.c:149
+#: mail/mail-folder-cache.c:151
#, c-format
msgid "%d new"
msgstr "%d nye"
-#: mail/mail-folder-cache.c:155 mail/mail-folder-cache.c:162
-#: mail/mail-folder-cache.c:169
+#: mail/mail-folder-cache.c:157 mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:171
msgid ", "
msgstr ", "
-#: mail/mail-folder-cache.c:156
+#: mail/mail-folder-cache.c:158
#, c-format
msgid "%d hidden"
msgstr "%d skjulte"
-#: mail/mail-folder-cache.c:163
+#: mail/mail-folder-cache.c:165
#, c-format
msgid "%d selected"
msgstr "%d valgt"
-#: mail/mail-folder-cache.c:172
+#: mail/mail-folder-cache.c:174
#, c-format
msgid "%d unsent"
msgstr "%d usendte"
-#: mail/mail-folder-cache.c:174
+#: mail/mail-folder-cache.c:176
#, c-format
msgid "%d total"
msgstr "%d totalt"
@@ -8957,118 +9032,118 @@ msgstr "Husk dette passordet"
msgid "Working"
msgstr "Arbeider"
-#: mail/mail-ops.c:84
+#: mail/mail-ops.c:85
msgid "Filtering Folder"
msgstr "Filtrerer mappe"
-#: mail/mail-ops.c:227
+#: mail/mail-ops.c:228
msgid "Fetching Mail"
msgstr "Henter e-post"
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:598
#, c-format
msgid "Sending \"%s\""
msgstr "Sender \"%s\""
-#: mail/mail-ops.c:710
+#: mail/mail-ops.c:717
#, c-format
msgid "Sending message %d of %d"
msgstr "Sender melding %d av %d"
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:736
#, c-format
msgid "Failed on message %d of %d"
msgstr "Feilet på melding %d av %d"
-#: mail/mail-ops.c:731 mail/mail-send-recv.c:500
+#: mail/mail-ops.c:738 mail/mail-send-recv.c:500
msgid "Complete."
msgstr "Fullført."
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:831
msgid "Saving message to folder"
msgstr "Lagrer melding til mappe"
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:910
#, c-format
msgid "Moving messages to %s"
msgstr "Flytter melding(er) til %s"
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:910
#, c-format
msgid "Copying messages to %s"
msgstr "Kopierer meldinger til %s"
-#: mail/mail-ops.c:920
+#: mail/mail-ops.c:927
msgid "Moving"
msgstr "Flytter"
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:930
msgid "Copying"
msgstr "Kopierer"
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:1042
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Skanner mapper i \"%s\""
#. Fill in the new fields
-#: mail/mail-ops.c:1075 mail/mail-ops.c:1076 shell/e-local-storage.c:181
+#: mail/mail-ops.c:1082 mail/mail-ops.c:1083 shell/e-local-storage.c:179
msgid "Trash"
msgstr "Søppel"
-#: mail/mail-ops.c:1212
+#: mail/mail-ops.c:1219
msgid "Forwarded messages"
msgstr "Videresendte meldinger"
-#: mail/mail-ops.c:1254
+#: mail/mail-ops.c:1261
#, c-format
msgid "Opening folder %s"
msgstr "Åpner mappe %s"
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1330
#, c-format
msgid "Opening store %s"
msgstr "Åpner lager %s"
-#: mail/mail-ops.c:1396
+#: mail/mail-ops.c:1403
#, c-format
msgid "Creating folder %s"
msgstr "Oppretter en ny mappe %s"
-#: mail/mail-ops.c:1466
+#: mail/mail-ops.c:1473
#, c-format
msgid "Removing folder %s"
msgstr "Fjerner mappe %s"
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1569
#, c-format
msgid "Synchronizing '%s'"
msgstr "Synkroniser '%s'"
-#: mail/mail-ops.c:1611
+#: mail/mail-ops.c:1620
msgid "Refreshing folder"
msgstr "Oppfrisker mappe"
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1656
msgid "Expunging folder"
msgstr "Tømmer mappe"
-#: mail/mail-ops.c:1696
+#: mail/mail-ops.c:1705
#, c-format
msgid "Retrieving message %s"
msgstr "Henter melding %s"
-#: mail/mail-ops.c:1763
+#: mail/mail-ops.c:1772
#, c-format
msgid "Retrieving %d message(s)"
msgstr "Henter %d melding(er)"
-#: mail/mail-ops.c:1849
+#: mail/mail-ops.c:1858
#, c-format
msgid "Saving %d messsage(s)"
msgstr "Lagrer %d melding(er)"
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1938
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -9077,7 +9152,7 @@ msgstr ""
"Kunne ikke opprette utdatafil: %s\n"
" %s"
-#: mail/mail-ops.c:1955
+#: mail/mail-ops.c:1964
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -9086,11 +9161,11 @@ msgstr ""
"Feil under lagring av av meldinger til: %s:\n"
" %s"
-#: mail/mail-ops.c:2029
+#: mail/mail-ops.c:2038
msgid "Saving attachment"
msgstr "Lagrer vedlegg"
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2054
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -9099,12 +9174,12 @@ msgstr ""
"Kunne ikke opprette utdatafil: %s\n"
" %s"
-#: mail/mail-ops.c:2076
+#: mail/mail-ops.c:2085
#, c-format
msgid "Could not write data: %s"
msgstr "Kan ikke skrive data: %s"
-#: mail/mail-ops.c:2145
+#: mail/mail-ops.c:2154
#, c-format
msgid "Disconnecting from %s"
msgstr "Kobler fra %s"
@@ -9150,7 +9225,7 @@ msgid "Cancelling..."
msgstr "Avbryter..."
#: mail/mail-send-recv.c:258
-msgid "Send & Receive mail"
+msgid "Send & Receive Mail"
msgstr "Send & motta e-post"
#: mail/mail-send-recv.c:312
@@ -9187,80 +9262,80 @@ msgstr "Videresendt melding"
msgid "Forwarded Message"
msgstr "Videresendt melding"
-#: mail/mail-vfolder.c:278
+#: mail/mail-vfolder.c:280
msgid "VFolders"
msgstr "VMapper"
-#: mail/mail-vfolder.c:498
+#: mail/mail-vfolder.c:500
msgid "New VFolder"
msgstr "Ny VFolder"
-#: mail/message-browser.c:125
+#: mail/message-browser.c:121
msgid "(No subject)"
msgstr "(Uten emne)"
-#: mail/message-browser.c:127
+#: mail/message-browser.c:123
#, c-format
msgid "%s - Message"
msgstr "%s - Melding"
-#: mail/message-list.c:636
+#: mail/message-list.c:640
msgid "Unseen"
msgstr "Ulest"
-#: mail/message-list.c:637
+#: mail/message-list.c:641
msgid "Seen"
msgstr "Lest"
-#: mail/message-list.c:638
+#: mail/message-list.c:642
msgid "Answered"
msgstr "Besvart"
-#: mail/message-list.c:639
+#: mail/message-list.c:643
msgid "Multiple Unseen Messages"
msgstr "Flere uleste meldinger"
-#: mail/message-list.c:640
+#: mail/message-list.c:644
msgid "Multiple Messages"
msgstr "Flere meldinger"
-#: mail/message-list.c:644
+#: mail/message-list.c:648
msgid "Lowest"
msgstr "Lavest"
-#: mail/message-list.c:645
+#: mail/message-list.c:649
msgid "Lower"
msgstr "Lavere"
-#: mail/message-list.c:649
+#: mail/message-list.c:653
msgid "Higher"
msgstr "Høyere"
-#: mail/message-list.c:650
+#: mail/message-list.c:654
msgid "Highest"
msgstr "Høyest"
-#: mail/message-list.c:900
+#: mail/message-list.c:904
msgid "?"
msgstr "?"
-#: mail/message-list.c:907
+#: mail/message-list.c:911
msgid "Today %l:%M %p"
msgstr "I dag %l:%M %p"
-#: mail/message-list.c:916
+#: mail/message-list.c:920
msgid "Yesterday %l:%M %p"
msgstr "I går %l:%M %p"
-#: mail/message-list.c:928
+#: mail/message-list.c:932
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: mail/message-list.c:938
+#: mail/message-list.c:942
msgid "%b %d %Y"
msgstr "%b %d %Y"
-#: mail/message-list.c:2312
+#: mail/message-list.c:2316
msgid "Generating message list"
msgstr "Genererer meldingsliste"
@@ -9384,7 +9459,7 @@ msgstr "E-post sammendrag"
#: my-evolution/e-summary-preferences.c:65
#: my-evolution/e-summary-weather.c:603
msgid "KBOS:ZSAM:EGAA"
-msgstr ""
+msgstr "KBOS:ZSAM:EGAA"
#: my-evolution/e-summary-preferences.c:427
msgid "Dictionary.com Word of the Day"
@@ -9394,19 +9469,19 @@ msgstr "Dictionary.com Ord for dagen"
msgid "Quotes of the Day"
msgstr "Dagens sitat"
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:876
msgid "Add a news feed"
msgstr "Legg til news-tjener"
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:884
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:887
+#: my-evolution/e-summary-preferences.c:888
msgid "Name:"
msgstr "Navn:"
-#: my-evolution/e-summary-preferences.c:1419
+#: my-evolution/e-summary-preferences.c:1420
msgid "Summary Settings"
msgstr "Innstillinger for sammendrag"
@@ -10681,69 +10756,69 @@ msgid "One w_eek"
msgstr "_En uke"
#: my-evolution/my-evolution.glade.h:12
+msgid "R_efresh time (seconds):"
+msgstr "Oppdat_eringstid (sekunder):"
+
+#: my-evolution/my-evolution.glade.h:13
msgid "Refresh _time (seconds):"
msgstr "Oppda_teringstid (sekunder):"
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
+msgid "S_how full path for folders"
+msgstr "V_is full sti for mapper"
+
+#: my-evolution/my-evolution.glade.h:15
msgid "Show _all tasks"
msgstr "Vis _alle oppgaver"
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:16
msgid "Show _today's tasks"
msgstr "Vis _oppgaver for i dag"
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:17
msgid "Tasks "
msgstr "Oppgaver "
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:18
msgid "Units: "
msgstr "Enheter: "
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:19
msgid "Weather settings"
msgstr "Innstillinger for vær"
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:21
msgid "_Display folders:"
msgstr "_Vis mapper:"
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:22
msgid "_Display stations:"
msgstr "_Vis stasjoner:"
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:23
msgid "_Displayed feeds:"
msgstr "_Viste tjenester:"
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:24
msgid "_Five days"
msgstr "_Fem dager"
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:25
msgid "_Mail"
msgstr "_E-post"
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:26
msgid "_News Feeds"
msgstr "_Nyhetstjenester"
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:27
msgid "_One day"
msgstr "_En dag"
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Refresh time (seconds):"
-msgstr "Oppdate_ringstid (sekunder):"
-
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:28
msgid "_Schedule"
msgstr "_Sett av tid"
-#: my-evolution/my-evolution.glade.h:28
-msgid "_Show full path for folders"
-msgstr "Vi_s full sti for mapper"
-
#: my-evolution/my-evolution.glade.h:29
msgid "_Weather"
msgstr "_Vær"
@@ -10760,23 +10835,23 @@ msgstr "m_etrisk"
msgid "The Evolution shell."
msgstr "Evolution skallet."
-#: shell/e-activity-handler.c:198
+#: shell/e-activity-handler.c:199
msgid "Show Details"
msgstr "Vis detaljer"
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:201
msgid "Cancel Operation"
msgstr "Alys operasjon"
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1052
+#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1054
msgid "Inbox"
msgstr "Innboks"
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:176
msgid "Outbox"
msgstr "Utboks"
-#: shell/e-local-storage.c:592
+#: shell/e-local-storage.c:623
msgid "Local Folders"
msgstr "Lokale mapper"
@@ -10870,25 +10945,25 @@ msgstr "Kan ikke kopiere en mappe oppå seg selv."
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:285
+#: shell/e-shell-folder-commands.c:289
#, 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:290
+#: shell/e-shell-folder-commands.c:294
msgid "Copy folder"
msgstr "Kopier mappe"
-#: shell/e-shell-folder-commands.c:328
+#: shell/e-shell-folder-commands.c:332
#, 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:333
+#: shell/e-shell-folder-commands.c:337
msgid "Move folder"
msgstr "Flytt mappe"
-#: shell/e-shell-folder-commands.c:358
+#: shell/e-shell-folder-commands.c:362
#, c-format
msgid ""
"Cannot delete folder:\n"
@@ -10897,30 +10972,30 @@ msgstr ""
"Kunne ikke slette mappe:\n"
"%s"
-#: shell/e-shell-folder-commands.c:374
+#: shell/e-shell-folder-commands.c:378
#, c-format
msgid "Delete folder '%s'"
msgstr "Slett mappe '%s'"
#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:384
+#: shell/e-shell-folder-commands.c:388
#, c-format
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:459
+#: shell/e-shell-folder-commands.c:463
#, c-format
msgid "Rename folder '%s'"
msgstr "Endre navn på mappe '%s'"
-#: shell/e-shell-folder-commands.c:463
+#: shell/e-shell-folder-commands.c:467
msgid "Rename"
msgstr "Endre navn"
#. Make, pack the label
-#: shell/e-shell-folder-commands.c:471
+#: shell/e-shell-folder-commands.c:475
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
msgid "Folder name:"
msgstr "Mappenavn:"
@@ -10934,11 +11009,28 @@ msgstr ""
"Kan ikke opprette spesifisert katalog:\n"
"%s"
-#: shell/e-shell-folder-creation-dialog.c:168
-msgid "The specified folder name is not valid."
-msgstr "Spesifisert mappe er ikke gyldig."
+#: shell/e-shell-folder-creation-dialog.c:126
+msgid "No folder name specified."
+msgstr "Ingen mappenavn spesifisert."
+
+#: shell/e-shell-folder-creation-dialog.c:132
+msgid "Folder name cannot contain the Return character."
+msgstr "Mappenavn kan ikke inneholde linjeskift."
+
+#: shell/e-shell-folder-creation-dialog.c:137
+msgid "Folder cannot contain the directory separator."
+msgstr "Mappenavn kan ikke inneholde katalogseparator."
+
+#: shell/e-shell-folder-creation-dialog.c:142
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' og '..' er reserverte mappenavn."
+
+#: shell/e-shell-folder-creation-dialog.c:180
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Spesifisert mappenavn er ikke gyldig: %s"
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:300
msgid "Evolution - Create new folder"
msgstr "Evolution - Lag ny mappe"
@@ -10958,7 +11050,7 @@ msgstr "Ny..."
msgid "(Untitled)"
msgstr "(Uten navn)"
-#: shell/e-shell-importer.c:97
+#: shell/e-shell-importer.c:101
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -10974,7 +11066,7 @@ msgstr ""
#. Importer isn't ready yet.
#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:192
+#: shell/e-shell-importer.c:196
#, c-format
msgid ""
"Importing %s\n"
@@ -10985,7 +11077,7 @@ msgstr ""
"Importerer ikke klar.\n"
"Venter 5 sekunder før nytt forsøk."
-#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#: shell/e-shell-importer.c:216 shell/e-shell-importer.c:247
#, c-format
msgid ""
"Importing %s\n"
@@ -10994,7 +11086,12 @@ msgstr ""
"Importerer %s\n"
"Importerer oppføring %d."
-#: shell/e-shell-importer.c:350
+#: shell/e-shell-importer.c:348
+#, c-format
+msgid "File %s does not exist"
+msgstr "Filen %s eksisterer ikke"
+
+#: shell/e-shell-importer.c:365
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -11003,11 +11100,11 @@ msgstr ""
"Ingen importerer som kan håndtere\n"
"%s"
-#: shell/e-shell-importer.c:362
+#: shell/e-shell-importer.c:377
msgid "Importing"
msgstr "Importerer"
-#: shell/e-shell-importer.c:370
+#: shell/e-shell-importer.c:385
#, c-format
msgid ""
"Importing %s.\n"
@@ -11016,17 +11113,17 @@ msgstr ""
"Importerer %s.\n"
"Starter %s"
-#: shell/e-shell-importer.c:383
+#: shell/e-shell-importer.c:398
#, c-format
msgid "Error starting %s"
msgstr "Feil under start av %s"
-#: shell/e-shell-importer.c:402
+#: shell/e-shell-importer.c:417
#, c-format
msgid "Error loading %s"
msgstr "Feil under lasting av %s"
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:434
#, c-format
msgid ""
"Importing %s\n"
@@ -11035,27 +11132,27 @@ msgstr ""
"Importerer %s\n"
"Importerer oppføring 1."
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:505
msgid "Automatic"
msgstr "Automatisk"
-#: shell/e-shell-importer.c:538
+#: shell/e-shell-importer.c:555
msgid "Filename:"
msgstr "Filnavn:"
-#: shell/e-shell-importer.c:543
+#: shell/e-shell-importer.c:560
msgid "Select a file"
msgstr "Velg en fil"
-#: shell/e-shell-importer.c:553
+#: shell/e-shell-importer.c:570
msgid "File type:"
msgstr "Filtype:"
-#: shell/e-shell-importer.c:622
+#: shell/e-shell-importer.c:639
msgid "Select folder"
msgstr "Velg mappe"
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:640
msgid "Select a destination folder for importing this data"
msgstr "Velg en målmappe for å importere data"
@@ -11096,17 +11193,21 @@ msgstr "Bug buddy ble ikke funnet i din $PATH."
msgid "Bug buddy could not be run."
msgstr "Bug buddy kunne ikke kjøres."
+#: shell/e-shell-view-menu.c:217
+msgid "Ximian Evolution"
+msgstr "Ximian Evolution"
+
#: shell/e-shell-view-menu.c:219
msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
#: shell/e-shell-view-menu.c:221
msgid ""
-"Evolution is a suite of groupware applications\n"
+"Ximian Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
"within the GNOME desktop environment."
msgstr ""
-"Evolution er en suite av gruppevareapplikasjoner\n"
+"Ximian Evolution er en suite av gruppevareapplikasjoner\n"
"for e-post, kalender og kontaktdatabaser for\n"
"GNOME skrivebordsmiljøet."
@@ -11131,7 +11232,7 @@ msgid "Work Online"
msgstr "Arbeid \"online\""
#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:31
msgid "Work Offline"
msgstr "Arbeid \"offline\""
@@ -11150,34 +11251,38 @@ msgstr "(Ingen)"
#: shell/e-shell-view.c:1502
#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid "%s - Ximian Evolution %s"
+msgstr "%s - Ximian Evolution %s"
#: shell/e-shell-view.c:1504
#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution - %s [%s]"
+msgid "%s - Ximian Evolution %s [%s]"
+msgstr "%s - Ximian Evolution %s [%s]"
#: shell/e-shell-view.c:1544
-msgid "Evolution is currently online. Click on this button to work offline."
+msgid ""
+"Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
-"Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
+"Ximian Evolution er koblet til. Klikk på denne knappen for å arbeide "
+"frakoblet."
#: shell/e-shell-view.c:1551
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution er i ferd med å koble fra."
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution er i ferd med å koble fra."
#: shell/e-shell-view.c:1557
-msgid "Evolution is currently offline. Click on this button to work online."
+msgid ""
+"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
-"Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
+"Ximian Evolution er frakoblet. Klikk på denne knappen for å arbeide "
+"tilkoblet."
#: shell/e-shell.c:509
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "Kan ikke sette opp lokal lagring -- %s"
-#: shell/e-shell.c:1438
+#: shell/e-shell.c:1440
#, c-format
msgid ""
"Ooops! The views for `%s' have died unexpectedly. :-(\n"
@@ -11186,23 +11291,23 @@ msgstr ""
"Ops! Visningen for `%s' døde uventet. :-(\n"
"Dette betyr sannsynligvis at komponenten %s har krasjet."
-#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1644 widgets/misc/e-cell-date-edit.c:248
msgid "OK"
msgstr "OK"
-#: shell/e-shell.c:1644
+#: shell/e-shell.c:1646
msgid "Invalid arguments"
msgstr "Ugyldige argumenter"
-#: shell/e-shell.c:1646
+#: shell/e-shell.c:1648
msgid "Cannot register on OAF"
msgstr "Kan ikke registrere i OAF"
-#: shell/e-shell.c:1648
+#: shell/e-shell.c:1650
msgid "Configuration Database not found"
msgstr "Konfigurasjonsdatabase ikke funnet"
-#: shell/e-shell.c:1650 shell/e-storage.c:491
+#: shell/e-shell.c:1652 shell/e-storage.c:491
msgid "Generic error"
msgstr "Vanlig feil"
@@ -11295,7 +11400,7 @@ msgstr "Endre navn på valgt snarvei til:"
msgid "Open the folder linked to this shortcut"
msgstr "Åpne mappen som er lenket til denne snarveien"
-#: shell/e-shortcuts-view.c:383 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:383 ui/evolution.xml.h:20
msgid "Open in New _Window"
msgstr "Åpne i nytt _vindu"
@@ -11323,7 +11428,7 @@ msgstr "Fjern denne snarveien fra snarveilinjen"
msgid "Error saving shortcuts."
msgstr "Feil under lagring av snarveier."
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1045
msgid "Shortcuts"
msgstr "Snarveier"
@@ -11489,9 +11594,9 @@ msgstr "Evolution kan importere data fra følgende filer:"
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
+"of the Ximian Evolution groupware suite.\n"
"\n"
-"Evolution is not yet complete. It's getting close, but there are\n"
+"Ximian Evolution is not yet complete. It's getting close, but there are\n"
"places where features are either missing or only half working. \n"
"\n"
"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
@@ -11502,10 +11607,12 @@ msgid ""
"eagerly await your contributions!\n"
msgstr ""
"Hei. Takk for at du har tatt deg tid til å laste ned denne prøveversjonen\n"
-"av Evolution gruppevarepakken.\n"
+"av Ximian Evolution gruppevarepakken.\n"
"\n"
-"Evolution er ikke ferdig. Det nærmer seg, men deler av funksjonaliteten\n"
+"Ximian Evolution er ikke ferdig. Det nærmer seg, men deler av "
+"funksjonaliteten\n"
"mangler eller er ikke fullført.\n"
+"\n"
"Hvis du finner feil, vennligst rapporter dem til bugzilla.ximian.com.\n"
"Dette produktet gir deg ingen garanti og er ikke ment for\n"
"individer som har lett for voldsomme sinneutbrudd.\n"
@@ -11516,19 +11623,19 @@ msgstr ""
#: shell/main.c:116
msgid ""
"Thanks\n"
-"The Evolution Team\n"
+"The Ximian Evolution Team\n"
msgstr ""
"Takk\n"
-"Evolution utviklerene\n"
+"Ximian Evolution utviklerene\n"
#: shell/main.c:173
-msgid "Cannot access the Evolution shell."
-msgstr "Kan ikke aksessere Evolution-skallet."
+msgid "Cannot access the Ximian Evolution shell."
+msgstr "Kan ikke aksessere Ximian Evolution-skallet."
#: shell/main.c:184
#, c-format
-msgid "Cannot initialize the Evolution shell: %s"
-msgstr "Kan ikke initiere Evolution-skallet: %s"
+msgid "Cannot initialize the Ximian Evolution shell: %s"
+msgstr "Kan ikke initiere Ximian Evolution-skallet: %s"
#: shell/main.c:228
msgid "Disable splash screen"
@@ -11810,7 +11917,7 @@ msgid "Delete this item"
msgstr "Slett denne oppføringen"
#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
msgid "Main toolbar"
msgstr "Hovedverktøylinje"
@@ -12748,8 +12855,8 @@ msgid "_Task"
msgstr "_Oppgave"
#: ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Om Evolution..."
+msgid "About Ximian Evolution..."
+msgstr "Om Ximian Evolution..."
#: ui/evolution.xml.h:2
msgid "Add to _Shortcut Bar"
@@ -12788,76 +12895,76 @@ msgid "E_xit"
msgstr "A_vslutt"
#: ui/evolution.xml.h:13
-msgid "Evolution _FAQ"
-msgstr "Evolution _OBS"
-
-#: ui/evolution.xml.h:14
msgid "Evolution _Window"
msgstr "Evolution vindu"
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
msgid "Exit the program"
msgstr "Avslutt programmet"
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
msgid "Import an external file format"
msgstr "Importer et eksternt filformat"
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
msgid "Move this folder to another place"
msgstr "Flytt denne mappen til et annet sted"
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
msgid "Open a new Evolution window"
msgstr "Åpne et nytt Evolution vindu"
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:19
msgid "Open in New Window"
msgstr "Åpne i nytt vindu"
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
msgid "Open this folder in an other window"
msgstr "Åpne denne mappen i et annet vindu"
-#: ui/evolution.xml.h:23
-msgid "Show information about Evolution"
-msgstr "Vis informasjon om Evolution"
+#: ui/evolution.xml.h:22
+msgid "Show information about Ximian Evolution"
+msgstr "Vis informasjon om Ximian Evolution"
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
msgid "Submit Bug Report"
msgstr "Send inn feilrapport"
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
msgid "Submit _Bug Report"
msgstr "Sen_d inn feilrapport"
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
msgid "Submit a bug report using Bug Buddy"
msgstr "Send inn en feilrapport med Bug Buddy"
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
msgid "Toggle"
msgstr "Bytt"
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
msgid "Toggle whether to show the folder bar"
msgstr "Slå av/på visning av mappelinjen"
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
msgid "Toggle whether to show the shortcut bar"
msgstr "Slå av/på visning av snarveilinjen"
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
msgid "Toggle whether we are working offline."
msgstr "Skift til \"offline\" arbeidsmodus."
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:30
msgid "View the selected folder"
msgstr "Vis den valgte mappen"
+#: ui/evolution.xml.h:32
+msgid "Ximian Evolution _FAQ"
+msgstr "Ximian Evolution _OBS"
+
#: ui/evolution.xml.h:33
-msgid "_About Evolution..."
-msgstr "_Om Evolution..."
+msgid "_About Ximian Evolution..."
+msgstr "_Om Ximian Evolution..."
#: ui/evolution.xml.h:35
msgid "_Copy..."
@@ -13230,6 +13337,93 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
+#~ msgid "123"
+#~ msgstr "123"
+
+#~ msgid "a"
+#~ msgstr "a"
+
+#~ msgid "b"
+#~ msgstr "b"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "d"
+#~ msgstr "d"
+
+#~ msgid "e"
+#~ msgstr "e"
+
+#~ msgid "f"
+#~ msgstr "f"
+
+#~ msgid "g"
+#~ msgstr "g"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "r"
+#~ msgstr "r"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "Spool stores do not have an inbox"
+#~ msgstr "Spool-lager har ikke en innboks"
+
+#~ msgid "_Refresh time (seconds):"
+#~ msgstr "Oppdate_ringstid (sekunder):"
+
#~ msgid "IMAPv4"
#~ msgstr "IMAPv4"
@@ -13505,9 +13699,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgstr ""
#~ "Velg type adressebok du har, og skriv inn relevant informasjon om den."
-#~ msgid "Name"
-#~ msgstr "Navn"
-
#~ msgid "URI"
#~ msgstr "URI"
@@ -15434,9 +15625,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Delete launcher"
#~ msgstr "Slett oppstarter"
-#~ msgid "File '%s' does not exist"
-#~ msgstr "Filen '%s' eksisterer ikke"
-
#~ msgid "Don't know how to make a launcher out of: '%s'"
#~ msgstr "Vet ikke hvordan en oppstarter kan lages av: '%s'"
@@ -15906,9 +16094,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Peak indicator"
#~ msgstr "Utslagsindikator"
-#~ msgid "off"
-#~ msgstr "av"
-
#~ msgid "active"
#~ msgstr "aktiv"
@@ -16075,9 +16260,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "File tail view file (Tick-a-Stat)"
#~ msgstr "Vis slutten av en fil med tail (Tick-a-Stat)"
-#~ msgid "no file specified"
-#~ msgstr "ingen fil spesifisert"
-
#~ msgid "File tail information (Tick-a-Stat)"
#~ msgstr "Vis informasjon om slutten på en fil (Tick-a-Stat)"
@@ -16735,9 +16917,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "_Reply (FIXME)"
#~ msgstr "Sva_r"
-#~ msgid "Inline attachment"
-#~ msgstr "Inline vedlegg"
-
#~ msgid "Send as:"
#~ msgstr "Send som:"
@@ -18120,12 +18299,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Bad storage URL (no server): %s"
#~ msgstr "Ugyldig URL for lagring (ingen tjener): %s"
-#~ msgid "Family Name"
-#~ msgstr "Etternavn"
-
-#~ msgid "Prim"
-#~ msgstr "Pri"
-
#~ msgid "Could not connect to IMAP server on %s."
#~ msgstr "Kunne ikke koble til IMAP-tjener på %s."