aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2001-07-03 06:31:50 +0800
committerKjartan Maraas <kmaraas@src.gnome.org>2001-07-03 06:31:50 +0800
commitf34530f1b56068294cb31274b8dd5f6c957f2340 (patch)
tree4f82d961858487a5c51f8df845f39145e8ef7d75
parentc79aa56aa1207d691f02373b5281e66a06852adf (diff)
downloadgsoc2013-evolution-f34530f1b56068294cb31274b8dd5f6c957f2340.tar
gsoc2013-evolution-f34530f1b56068294cb31274b8dd5f6c957f2340.tar.gz
gsoc2013-evolution-f34530f1b56068294cb31274b8dd5f6c957f2340.tar.bz2
gsoc2013-evolution-f34530f1b56068294cb31274b8dd5f6c957f2340.tar.lz
gsoc2013-evolution-f34530f1b56068294cb31274b8dd5f6c957f2340.tar.xz
gsoc2013-evolution-f34530f1b56068294cb31274b8dd5f6c957f2340.tar.zst
gsoc2013-evolution-f34530f1b56068294cb31274b8dd5f6c957f2340.zip
Updated Norwegian translation.
2001-07-03 Kjartan Maraas <kmaraas@gnome.org> * no.po: Updated Norwegian translation. svn path=/trunk/; revision=10708
-rw-r--r--po/ChangeLog4
-rw-r--r--po/no.po1513
2 files changed, 853 insertions, 664 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 282d550863..03e1705c88 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-03 Kjartan Maraas <kmaraas@gnome.org>
+
+ * no.po: Updated Norwegian translation.
+
2001-07-02 Jeffrey Stedfast <fejj@ximian.com>
* POTFILES.in: Added widgets/misc/e-charset-picker.c
diff --git a/po/no.po b/po/no.po
index 7985db6034..17225f4563 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,19 +5,19 @@
msgid ""
msgstr ""
"Project-Id-Version: gnome-applets 1.4.1\n"
-"POT-Creation-Date: 2001-06-29 01:46+0200\n"
-"PO-Revision-Date: 2001-06-29 01:48+0200\n"
+"POT-Creation-Date: 2001-07-03 00:09+0200\n"
+"PO-Revision-Date: 2001-07-03 00:22+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: addressbook/backend/ebook/e-card.c:3324
+#: addressbook/backend/ebook/e-card.c:3546
msgid "Card: "
msgstr "Kort: "
-#: addressbook/backend/ebook/e-card.c:3326
+#: addressbook/backend/ebook/e-card.c:3548
msgid ""
"\n"
"Name: "
@@ -25,7 +25,7 @@ msgstr ""
"\n"
"Navn:"
-#: addressbook/backend/ebook/e-card.c:3327
+#: addressbook/backend/ebook/e-card.c:3549
msgid ""
"\n"
" Prefix: "
@@ -33,7 +33,7 @@ msgstr ""
"\n"
"Prefiks: "
-#: addressbook/backend/ebook/e-card.c:3328
+#: addressbook/backend/ebook/e-card.c:3550
msgid ""
"\n"
" Given: "
@@ -41,7 +41,7 @@ msgstr ""
"\n"
"Oppgitt: "
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3551
msgid ""
"\n"
" Additional: "
@@ -49,7 +49,7 @@ msgstr ""
"\n"
"Tillegg: "
-#: addressbook/backend/ebook/e-card.c:3330
+#: addressbook/backend/ebook/e-card.c:3552
msgid ""
"\n"
" Family: "
@@ -57,7 +57,7 @@ msgstr ""
"\n"
"Familie: "
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3553
msgid ""
"\n"
" Suffix: "
@@ -65,7 +65,7 @@ msgstr ""
"\n"
"Suffiks: "
-#: addressbook/backend/ebook/e-card.c:3345
+#: addressbook/backend/ebook/e-card.c:3567
msgid ""
"\n"
"Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
"\n"
"Fødselsdato: "
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3578
msgid ""
"\n"
"Address:"
@@ -81,7 +81,7 @@ msgstr ""
"\n"
"Adresse:"
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3580
msgid ""
"\n"
" Postal Box: "
@@ -89,7 +89,7 @@ msgstr ""
"\n"
"Postboks: "
-#: addressbook/backend/ebook/e-card.c:3359
+#: addressbook/backend/ebook/e-card.c:3581
msgid ""
"\n"
" Ext: "
@@ -97,7 +97,7 @@ msgstr ""
"\n"
"Linje: "
-#: addressbook/backend/ebook/e-card.c:3360
+#: addressbook/backend/ebook/e-card.c:3582
msgid ""
"\n"
" Street: "
@@ -105,7 +105,7 @@ msgstr ""
"\n"
"Gate: "
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3583
msgid ""
"\n"
" City: "
@@ -113,7 +113,7 @@ msgstr ""
"\n"
"By: "
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3584
msgid ""
"\n"
" Region: "
@@ -121,7 +121,7 @@ msgstr ""
"\n"
"Region: "
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3585
msgid ""
"\n"
" Postal Code: "
@@ -129,7 +129,7 @@ msgstr ""
"\n"
"Postnummer: "
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3586
msgid ""
"\n"
" Country: "
@@ -137,7 +137,7 @@ msgstr ""
"\n"
"Land: "
-#: addressbook/backend/ebook/e-card.c:3377
+#: addressbook/backend/ebook/e-card.c:3599
msgid ""
"\n"
"Delivery Label: "
@@ -145,7 +145,7 @@ msgstr ""
"\n"
"Leveringsetikett: "
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3611
msgid ""
"\n"
"Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
"\n"
"Telefoner:\n"
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3614
msgid ""
"\n"
"Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
"\n"
"Telefon:"
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3638
msgid ""
"\n"
"E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
"\n"
"E-post:\n"
-#: addressbook/backend/ebook/e-card.c:3419
+#: addressbook/backend/ebook/e-card.c:3641
msgid ""
"\n"
"E-mail:"
@@ -177,7 +177,7 @@ msgstr ""
"\n"
"E-post:"
-#: addressbook/backend/ebook/e-card.c:3438
+#: addressbook/backend/ebook/e-card.c:3660
msgid ""
"\n"
"Mailer: "
@@ -185,7 +185,7 @@ msgstr ""
"\n"
"E-post program: "
-#: addressbook/backend/ebook/e-card.c:3444
+#: addressbook/backend/ebook/e-card.c:3666
msgid ""
"\n"
"Time Zone: "
@@ -193,7 +193,7 @@ msgstr ""
"\n"
"Tidssone: "
-#: addressbook/backend/ebook/e-card.c:3452
+#: addressbook/backend/ebook/e-card.c:3674
msgid ""
"\n"
"Geo Location: "
@@ -201,7 +201,7 @@ msgstr ""
"\n"
"Geografisk lokasjon: "
-#: addressbook/backend/ebook/e-card.c:3456
+#: addressbook/backend/ebook/e-card.c:3678
msgid ""
"\n"
"Business Role: "
@@ -209,7 +209,7 @@ msgstr ""
"\n"
"Stilling: "
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3690
msgid ""
"\n"
"Org: "
@@ -217,7 +217,7 @@ msgstr ""
"\n"
"Org: "
-#: addressbook/backend/ebook/e-card.c:3469
+#: addressbook/backend/ebook/e-card.c:3691
msgid ""
"\n"
" Name: "
@@ -225,7 +225,7 @@ msgstr ""
"\n"
"Navn: "
-#: addressbook/backend/ebook/e-card.c:3470
+#: addressbook/backend/ebook/e-card.c:3692
msgid ""
"\n"
" Unit: "
@@ -233,7 +233,7 @@ msgstr ""
"\n"
"Enhet: "
-#: addressbook/backend/ebook/e-card.c:3471
+#: addressbook/backend/ebook/e-card.c:3693
msgid ""
"\n"
" Unit2: "
@@ -241,7 +241,7 @@ msgstr ""
"\n"
"Enhet2: "
-#: addressbook/backend/ebook/e-card.c:3472
+#: addressbook/backend/ebook/e-card.c:3694
msgid ""
"\n"
" Unit3: "
@@ -249,7 +249,7 @@ msgstr ""
"\n"
"Enhet3: "
-#: addressbook/backend/ebook/e-card.c:3473
+#: addressbook/backend/ebook/e-card.c:3695
msgid ""
"\n"
" Unit4: "
@@ -257,7 +257,7 @@ msgstr ""
"\n"
"Enhet4: "
-#: addressbook/backend/ebook/e-card.c:3477
+#: addressbook/backend/ebook/e-card.c:3699
msgid ""
"\n"
"Categories: "
@@ -265,7 +265,7 @@ msgstr ""
"\n"
"Kategorier: "
-#: addressbook/backend/ebook/e-card.c:3478
+#: addressbook/backend/ebook/e-card.c:3700
msgid ""
"\n"
"Comment: "
@@ -283,7 +283,7 @@ msgstr ""
#.
#. add_SoundType (string, crd->sound.type);
#. }
-#: addressbook/backend/ebook/e-card.c:3491
+#: addressbook/backend/ebook/e-card.c:3713
msgid ""
"\n"
"Unique String: "
@@ -291,7 +291,7 @@ msgstr ""
"\n"
"Unik streng: "
-#: addressbook/backend/ebook/e-card.c:3494
+#: addressbook/backend/ebook/e-card.c:3716
msgid ""
"\n"
"Public Key: "
@@ -299,16 +299,16 @@ msgstr ""
"\n"
"Offentlig nøkkel: "
-#: addressbook/backend/ebook/e-card.c:3756
+#: addressbook/backend/ebook/e-card.c:3978
msgid "Multiple VCards"
msgstr "Flere VCard"
-#: addressbook/backend/ebook/e-card.c:3764
+#: addressbook/backend/ebook/e-card.c:3986
#, c-format
msgid "VCard for %s"
msgstr "VCard for %s"
-#: addressbook/backend/ebook/e-destination.c:244
+#: addressbook/backend/ebook/e-destination.c:344
msgid "???"
msgstr "???"
@@ -392,7 +392,7 @@ msgid "Contact Editor"
msgstr "Kontaktredigering"
#: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:123
+#: calendar/gui/dialogs/task-editor.c:135
msgid "Details"
msgstr "Detaljer"
@@ -401,7 +401,7 @@ msgid "File As:"
msgstr "Lagre som:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
msgid "General"
msgstr "Generelt"
@@ -417,8 +417,9 @@ msgstr "No_tater:"
msgid "Phone Types"
msgstr "Telefontyper"
+#: addressbook/gui/component/e-address-popup.c:466
#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1432
+#: addressbook/gui/contact-editor/e-contact-editor.c:1486
msgid "Primary Email"
msgstr "Primær e-post"
@@ -456,9 +457,9 @@ msgid "_Company:"
msgstr "_Firma:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1215 mail/mail-config.glade.h:97
+#: mail/folder-browser.c:1220 mail/mail-config.glade.h:97
#: ui/evolution-mail-message.xml.h:76 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:46
msgid "_Delete"
msgstr "_Slett"
@@ -506,105 +507,107 @@ msgstr "Ekte_felle:"
msgid "_This is the mailing address"
msgstr "De_tte er postadressen"
-#: addressbook/gui/contact-editor/e-contact-editor.c:658
+#: addressbook/gui/contact-editor/e-contact-editor.c:669
msgid "This contact belongs to these categories:"
msgstr "Denne kontakten hører til disse kategoriene:"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1390
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:735
msgid "Assistant"
msgstr "Assistent"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1391
-#: addressbook/gui/contact-editor/e-contact-editor.c:1458
+#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
msgid "Business"
msgstr "Arbeid"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1392
+#: addressbook/gui/contact-editor/e-contact-editor.c:1446
msgid "Business 2"
msgstr "Arbeid 2"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1393
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1447
+#: addressbook/gui/widgets/e-addressbook-view.c:715
msgid "Business Fax"
msgstr "Faks på arbeid"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1394
+#: addressbook/gui/contact-editor/e-contact-editor.c:1448
msgid "Callback"
msgstr "Tilbakering"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1395
+#: addressbook/gui/contact-editor/e-contact-editor.c:1449
msgid "Car"
msgstr "Bil"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1396
+#: addressbook/gui/contact-editor/e-contact-editor.c:1450
msgid "Company"
msgstr "Firma"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1397
-#: addressbook/gui/contact-editor/e-contact-editor.c:1459
+#: addressbook/gui/contact-editor/e-contact-editor.c:1451
+#: addressbook/gui/contact-editor/e-contact-editor.c:1513
msgid "Home"
msgstr "Hjemme"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1398
+#: addressbook/gui/contact-editor/e-contact-editor.c:1452
msgid "Home 2"
msgstr "Hjemme 2"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1399
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1453
+#: addressbook/gui/widgets/e-addressbook-view.c:716
msgid "Home Fax"
msgstr "Faks hjemme"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1400
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1454
+#: addressbook/gui/widgets/e-addressbook-view.c:719
msgid "ISDN"
msgstr "ISDN"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1401
+#: addressbook/gui/contact-editor/e-contact-editor.c:1455
msgid "Mobile"
msgstr "Mobil"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1402
-#: addressbook/gui/contact-editor/e-contact-editor.c:1460
+#: addressbook/gui/contact-editor/e-contact-editor.c:1456
+#: addressbook/gui/contact-editor/e-contact-editor.c:1514
#: mail/mail-config.glade.h:57
msgid "Other"
msgstr "Andre"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1403
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1457
+#: addressbook/gui/widgets/e-addressbook-view.c:721
msgid "Other Fax"
msgstr "Annen faks"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1404
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1458
+#: addressbook/gui/widgets/e-addressbook-view.c:722
msgid "Pager"
msgstr "Personsøker"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1405
+#: addressbook/gui/contact-editor/e-contact-editor.c:1459
msgid "Primary"
msgstr "Primær"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1406
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1460
+#: addressbook/gui/widgets/e-addressbook-view.c:723
msgid "Radio"
msgstr "Radio"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1407
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1461
+#: addressbook/gui/widgets/e-addressbook-view.c:724
msgid "Telex"
msgstr "Teleks"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1408
+#: addressbook/gui/contact-editor/e-contact-editor.c:1462
msgid "TTY/TDD"
msgstr "TTY/TTD"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1433
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1487
+#: addressbook/gui/widgets/e-addressbook-view.c:727
msgid "Email 2"
msgstr "E-post 2"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1488
+#: addressbook/gui/widgets/e-addressbook-view.c:728
msgid "Email 3"
msgstr "E-post 3"
@@ -621,7 +624,7 @@ msgid "Edit Full"
msgstr "Rediger alt"
#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/widgets/e-addressbook-view.c:702
msgid "Full Name"
msgstr "Fullt navn"
@@ -945,7 +948,7 @@ msgstr "Adressebok-kilder"
#: addressbook/gui/component/addressbook-config.glade.h:3
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:606
#: calendar/gui/dialogs/alarm-page.glade.h:4
#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
@@ -971,24 +974,57 @@ msgstr "URI"
msgid "Other Contacts"
msgstr "Andre kontakter"
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Deaktiver spørringer"
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(ingen)"
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Aktiver spørringer (Farlig!)"
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
+msgstr "Velg en handling"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Opprett en ny kontakt \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Legg til adresse for eksisterende kontakt \"%s\""
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
+msgstr "Kjører spørring i adressebok..."
+
+#: addressbook/gui/component/e-address-popup.c:916
#: addressbook/gui/component/e-address-widget.c:388
#: addressbook/gui/component/select-names/e-select-names-popup.c:276
msgid "Edit Contact Info"
msgstr "Rediger kontaktinfo"
+#: addressbook/gui/component/e-address-popup.c:946
#: addressbook/gui/component/e-address-widget.c:424
#: addressbook/gui/component/select-names/e-select-names-popup.c:342
msgid "Add to Contacts"
msgstr "Legg til i kontakter"
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
+msgstr "Flett E-postadresse"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Deaktiver spørringer"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Aktiver spørringer (Farlig!)"
+
#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
msgid "A Bonobo control for an address popup."
msgstr "En Bonobo-kontroll for visning av en adresse."
@@ -1036,7 +1072,7 @@ msgstr "Factory for eksempelkontroll for adressebok"
#: addressbook/gui/component/select-names/e-select-names-popup.c:156
#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:267 shell/e-shortcuts-view.c:470
msgid "Remove"
msgstr "Fjern"
@@ -1057,24 +1093,25 @@ msgid "Factory for the Addressbook's name selection interface"
msgstr "Factory for adressebokens grensesnitt for navnevalg"
#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "="
-msgstr "="
+msgid "Message Recipients"
+msgstr "Meldingsmottakere:"
#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Find..."
-msgstr "Finn..."
+msgid "Select Names"
+msgstr "Velg navn"
#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Message Recipients"
-msgstr "Meldingsmottakere:"
+msgid "Select name from _folder:"
+msgstr "Velg navn fra _mappe:"
#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Velg navn"
+msgid "_Category:"
+msgstr "_Kategori:"
#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Select name from:"
-msgstr "Velg navn fra:"
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Søk"
#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
msgid "Add Anyway"
@@ -1236,163 +1273,163 @@ msgstr "z"
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:538
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
msgid "Save as VCard"
msgstr "Lagre som VCard"
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:602
msgid "Send contact to other"
msgstr "Send kontakt til andre"
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:603
msgid "Send message to contact"
msgstr "Send melding til kontakt"
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/gui/widgets/e-addressbook-view.c:604
#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:51
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:1
+#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
msgid "Print"
msgstr "Skriv ut"
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:605
msgid "Print Envelope"
msgstr "Skriv ut konvolutt"
-#: addressbook/gui/widgets/e-addressbook-view.c:697
+#: addressbook/gui/widgets/e-addressbook-view.c:700
msgid "* Click here to add a contact *"
msgstr "* Klikk her for å legge til en kontakt *"
-#: addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.c:701
msgid "File As"
msgstr "Lagre som"
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:703
msgid "Email"
msgstr "E-post"
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:704
msgid "Primary Phone"
msgstr "Primær telefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:705
msgid "Assistant Phone"
msgstr "Assistents telefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:706
msgid "Business Phone"
msgstr "Arbeidstelefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:707
msgid "Callback Phone"
msgstr "Telefon for tilbakeringing"
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:708
msgid "Company Phone"
msgstr "Firmatelefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:709
msgid "Home Phone"
msgstr "Hjemmetelefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:710
msgid "Organization"
msgstr "Organisasjon"
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:711
msgid "Business Address"
msgstr "Arbeidsadresse"
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:712
msgid "Home Address"
msgstr "Hjemmeadresse"
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:713
msgid "Mobile Phone"
msgstr "Mobiltelefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:714
msgid "Car Phone"
msgstr "Biltelefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:717
msgid "Business Phone 2"
msgstr "Arbeidstelefon 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:718
msgid "Home Phone 2"
msgstr "Hjemmetelefon 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:720
msgid "Other Phone"
msgstr "Annen telefon"
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:725
msgid "TTY"
msgstr "TTY"
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/widgets/e-addressbook-view.c:726
msgid "Other Address"
msgstr "Annen adresse"
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:729
msgid "Web Site"
msgstr "Nettside"
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:730
msgid "Department"
msgstr "Avdeling"
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/widgets/e-addressbook-view.c:731
msgid "Office"
msgstr "Kontor"
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:732
msgid "Title"
msgstr "Tittel"
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:733
msgid "Profession"
msgstr "Yrke"
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:734
msgid "Manager"
msgstr "Leder"
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:736
msgid "Nickname"
msgstr "Kallenavn"
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:737
msgid "Spouse"
msgstr "Ektefelle"
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:738
msgid "Note"
msgstr "Kommentar"
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:739
msgid "Free-busy URL"
msgstr "Fri-ledig URL"
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
msgid "Done."
msgstr "Ferdig."
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
msgid "Error removing card"
msgstr "Feil ved fjerning av kort"
-#: addressbook/gui/widgets/e-addressbook-view.c:1111
+#: addressbook/gui/widgets/e-addressbook-view.c:1114
msgid "Removing cards..."
msgstr "Fjerner kort..."
-#: addressbook/gui/widgets/e-minicard.c:436
+#: addressbook/gui/widgets/e-minicard.c:451
msgid "Error modifying card"
msgstr "Feil ved endring av kort"
@@ -1691,8 +1728,7 @@ msgstr "Ingen sammendrag tilgjengelig."
#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
#: ui/evolution-contact-list-editor.xml.h:1
#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution.xml.h:5
+#: ui/evolution-message-composer.xml.h:3 ui/evolution.xml.h:5
msgid "Close"
msgstr "Lukk"
@@ -1743,91 +1779,92 @@ msgstr ""
"Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
"konfigurasjon."
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:902
+#: calendar/gui/calendar-model.c:361 calendar/gui/calendar-model.c:951
#: calendar/gui/e-calendar-table.c:419
msgid "Public"
msgstr "Offentlig"
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:904
+#: calendar/gui/calendar-model.c:364 calendar/gui/calendar-model.c:953
#: calendar/gui/e-calendar-table.c:420
msgid "Private"
msgstr "Privat"
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:906
+#: calendar/gui/calendar-model.c:367 calendar/gui/calendar-model.c:955
#: calendar/gui/e-calendar-table.c:421
msgid "Confidential"
msgstr "Konfidensiell"
-#: calendar/gui/calendar-model.c:369 calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/calendar-model.c:370 calendar/gui/dialogs/alarm-page.c:320
#: calendar/gui/dialogs/alarm-page.c:356
#: camel/providers/smtp/camel-smtp-transport.c:222
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:418
msgid "Unknown"
msgstr "Ukjent"
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:458
msgid "N"
msgstr "N"
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:458
msgid "S"
msgstr "S"
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:460
msgid "E"
msgstr "Ø"
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:460
msgid "W"
msgstr "V"
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1070
+#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1119
#: calendar/gui/dialogs/task-page.glade.h:8
#: calendar/gui/e-calendar-table.c:441 mail/message-list.c:620
msgid "High"
msgstr "Høy"
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1072
-#: calendar/gui/calendar-model.c:1595
+#: calendar/gui/calendar-model.c:500 calendar/gui/calendar-model.c:1121
+#: calendar/gui/calendar-model.c:1644
#: calendar/gui/dialogs/task-page.glade.h:11
#: calendar/gui/e-calendar-table.c:442 mail/message-list.c:619
msgid "Normal"
msgstr "Normal"
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1074
+#: calendar/gui/calendar-model.c:502 calendar/gui/calendar-model.c:1123
#: calendar/gui/dialogs/task-page.glade.h:10
#: calendar/gui/e-calendar-table.c:443 mail/message-list.c:618
msgid "Low"
msgstr "Lav"
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1126
+#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1175
#: calendar/gui/e-calendar-table.c:495
msgid "Transparent"
msgstr "Gjennomsiktig"
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1128
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1177
#: calendar/gui/e-calendar-table.c:494
msgid "Opaque"
msgstr "Ugjennomsiktig"
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:690 calendar/gui/calendar-model.c:1229
#: calendar/gui/dialogs/task-page.glade.h:12
#: calendar/gui/e-calendar-table.c:515
msgid "Not Started"
msgstr "Ikke startet"
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:693 calendar/gui/calendar-model.c:1231
#: calendar/gui/dialogs/task-page.glade.h:9
#: calendar/gui/e-calendar-table.c:516
msgid "In Progress"
msgstr "Under arbeid"
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1184
+#: calendar/gui/calendar-model.c:696 calendar/gui/calendar-model.c:1233
#: calendar/gui/dialogs/task-page.glade.h:6
#: calendar/gui/e-calendar-table.c:517
msgid "Completed"
msgstr "Fullført"
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1186
+#: calendar/gui/calendar-model.c:699 calendar/gui/calendar-model.c:1235
#: calendar/gui/dialogs/task-page.glade.h:4
#: calendar/gui/e-calendar-table.c:518 camel/camel-service.c:544
#: camel/camel-service.c:580
@@ -1835,16 +1872,16 @@ msgid "Cancelled"
msgstr "Avbrutt"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:798 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:847 e-util/e-time-utils.c:267
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:801 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:850 e-util/e-time-utils.c:276
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %d.%m.%Y %H:%M:%S %p"
-#: calendar/gui/calendar-model.c:806
+#: calendar/gui/calendar-model.c:855
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -1855,7 +1892,7 @@ msgstr ""
"\n"
"%s"
-#: calendar/gui/calendar-model.c:886
+#: calendar/gui/calendar-model.c:935
msgid ""
"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
msgstr ""
@@ -1863,17 +1900,17 @@ msgstr ""
"'Ingen'"
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:900 calendar/gui/calendar-model.c:1124
-#: calendar/gui/calendar-model.c:1178 calendar/gui/e-calendar-table.c:418
-#: calendar/gui/e-calendar-table.c:493 mail/mail-account-gui.c:1287
-#: mail/mail-accounts.c:125 mail/mail-accounts.c:176
-#: mail/mail-config.glade.h:54 shell/e-shell-view.c:1379
+#: calendar/gui/calendar-model.c:949 calendar/gui/calendar-model.c:1173
+#: calendar/gui/calendar-model.c:1227 calendar/gui/e-calendar-table.c:418
+#: calendar/gui/e-calendar-table.c:493 mail/mail-account-gui.c:1295
+#: mail/mail-accounts.c:126 mail/mail-accounts.c:177
+#: mail/mail-config.glade.h:54 shell/e-shell-view.c:1398
#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
msgid "None"
msgstr "Ingen"
-#: calendar/gui/calendar-model.c:974
+#: calendar/gui/calendar-model.c:1023
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -1883,40 +1920,40 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/calendar-model.c:1014
+#: calendar/gui/calendar-model.c:1063
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1104
msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
msgstr "Prioriteten må være en av 'Høy', 'Normal', 'Lav' eller 'Udefinert'."
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1068
+#: calendar/gui/calendar-model.c:1117
#: calendar/gui/dialogs/task-page.glade.h:18
#: calendar/gui/e-calendar-table.c:444
msgid "Undefined"
msgstr "Udefinert"
-#: calendar/gui/calendar-model.c:1109
+#: calendar/gui/calendar-model.c:1158
msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
msgstr ""
"Gjennomsiktigheten må være en av 'Gjennomsiktig', 'Ugjennomsiktig' eller "
"\"Ingen'."
-#: calendar/gui/calendar-model.c:1597
+#: calendar/gui/calendar-model.c:1646
msgid "Recurring"
msgstr "Gjeninntreffer"
-#: calendar/gui/calendar-model.c:1599
+#: calendar/gui/calendar-model.c:1648
msgid "Assigned"
msgstr "Tildelt"
-#: calendar/gui/calendar-model.c:1605
+#: calendar/gui/calendar-model.c:1654
msgid "Yes"
msgstr "Ja"
-#: calendar/gui/calendar-model.c:1605
+#: calendar/gui/calendar-model.c:1654
msgid "No"
msgstr "Nei"
@@ -2019,7 +2056,7 @@ msgid "Date/Time:"
msgstr "Dato/klokke:"
#: calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
msgid "Reminders"
msgstr "Påminnelser"
@@ -2029,7 +2066,7 @@ msgstr "Innstillinger..."
#: calendar/gui/dialogs/alarm-page.glade.h:11
#: calendar/gui/dialogs/recurrence-page.glade.h:13
-#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/dialogs/task-details-page.glade.h:8
#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "Sammendrag:"
@@ -2093,225 +2130,174 @@ msgid "60 minutes"
msgstr "60 minutter"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Tidsavbrudd for alarm etter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Lyd-alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
msgid "Beep when alarm windows appear."
msgstr "Pip når alarmvinduet kommer til syne."
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
#: ui/evolution-calendar.xml.h:4
msgid "Calendar"
msgstr "Kalender"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
msgid "Calendar Preferences"
msgstr "Brukervalg for kalender"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr "Farge for utgåtte oppgaver"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr "Farge for oppgaver som går ut idag"
+
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farger"
+msgid "Colors for Tasks"
+msgstr "Farger for oppgaver"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
msgid "Compress weekends in month view"
msgstr "Komprimer helger i månedsvisning"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
-msgstr "Alternativer for datonavigator"
+msgid "Date Navigator"
+msgstr "Datonavigator"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
msgid "Defaults"
msgstr "Forvalg"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Vis alternativer"
+#: mail/mail-config.glade.h:29
+msgid "Display"
+msgstr "Vis"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:249
-msgid "Due Date"
-msgstr "Ferdig-dato"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Slå på utsetting for "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
msgid "End of day:"
msgstr "Dagen slutter:"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
msgid "First day of week:"
msgstr "Første dag i uken:"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
msgid "Fri"
msgstr "Fre"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
#: calendar/gui/dialogs/recurrence-page.c:918
msgid "Friday"
msgstr "Fredag"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Highlight"
-msgstr "Marker"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today"
-msgstr "Oppføringer som går ut idag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Due Today:"
-msgstr "Oppføringer som går ut i dag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due"
-msgstr "Oppføringer som ikke har gått ut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Items Not Yet Due:"
-msgstr "Oppføringer som ikke har gått ut:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
msgid "Mon"
msgstr "Man"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
#: calendar/gui/dialogs/recurrence-page.c:914
msgid "Monday"
msgstr "Mandag"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items"
-msgstr "Utgåtte oppføringer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Overdue Items:"
-msgstr "Utgåtte oppføringer:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: mail/mail-config.glade.h:63
-msgid "Pick a color"
-msgstr "Velg en farge"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr "Alternativer for notifisering"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/e-calendar-table.c:252
-msgid "Priority"
-msgstr "Prioritet"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
+msgstr "Utgåtte oppgaver"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
msgid "Remind me of all appointments"
msgstr "Påminnelse om alle avtaler"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
msgid "Sat"
msgstr "Lør"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
#: calendar/gui/dialogs/recurrence-page.c:919
msgid "Saturday"
msgstr "Lørdag"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show"
-msgstr "Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
msgid "Show appointment end times in week and month views"
msgstr "Vis tid for avtalers slutt i ukes- og månedsvisning"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
msgid "Show week numbers"
msgstr "Vis ukenummer"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
msgid "Start of day:"
msgstr "Dagen starter:"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
msgid "Sun"
msgstr "Søn"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
#: calendar/gui/dialogs/recurrence-page.c:920
msgid "Sunday"
msgstr "Søndag"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "TaskPad"
-msgstr "Oppgaveblokk"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Task List"
+msgstr "Oppgaveliste"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
+msgstr "Oppgaver som går ut idag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
msgid "Thu"
msgstr "Tor"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
#: calendar/gui/dialogs/recurrence-page.c:917
msgid "Thursday"
msgstr "Torsdag"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
msgid "Time"
msgstr "Tid"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time Until Due"
-msgstr "Tid før den går ut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
msgid "Time divisions:"
msgstr "Oppdeling av tid:"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
msgid "Time format:"
msgstr "Tidformat:"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
msgid "Time zone:"
msgstr "Tidssone:"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
msgid "Tue"
msgstr "Tir"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
#: calendar/gui/dialogs/recurrence-page.c:915
msgid "Tuesday"
msgstr "Tirsdag"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Visual Alarms"
-msgstr "Visuelle alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
msgid "Wed"
msgstr "Ons"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
#: calendar/gui/dialogs/recurrence-page.c:916
msgid "Wednesday"
msgstr "Onsdag"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Work Week"
msgstr "Arbeidsuke"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
msgid "minutes before they occur."
msgstr "minutter i forveien."
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-#: mail/mail-config.glade.h:101
-msgid "seconds."
-msgstr "sekunder"
-
#: calendar/gui/dialogs/delete-comp.c:84
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2367,7 +2353,7 @@ msgid "Recurrence"
msgstr "Gjeninntreffelse"
#: calendar/gui/dialogs/event-editor.c:151
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:223
msgid "Meeting"
msgstr "Møte"
@@ -2513,11 +2499,28 @@ msgstr "Vil du lagre endringene?"
msgid "Date Completed:"
msgstr "Fullført dato:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+msgid "Delegated By:"
+msgstr "Delegert av:"
+
#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Delegated To:"
+msgstr "Delegert til:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+msgid "No one"
+msgstr "Ingen"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organisator:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
msgid "URL:"
msgstr "URL:"
-#: calendar/gui/dialogs/task-editor.c:118
+#: calendar/gui/dialogs/task-editor.c:130
msgid "Task"
msgstr "Oppgave"
@@ -2562,6 +2565,10 @@ msgstr "Sluttdato"
msgid "Start Date"
msgstr "Startdato"
+#: calendar/gui/e-calendar-table.c:249
+msgid "Due Date"
+msgstr "Ferdig-dato"
+
#: calendar/gui/e-calendar-table.c:250
msgid "Geographical Position"
msgstr "Geografisk plassering"
@@ -2570,6 +2577,10 @@ msgstr "Geografisk plassering"
msgid "Percent complete"
msgstr "Prosent fullført"
+#: calendar/gui/e-calendar-table.c:252
+msgid "Priority"
+msgstr "Prioritet"
+
#: calendar/gui/e-calendar-table.c:253
msgid "Summary"
msgstr "Sammendrag"
@@ -2650,22 +2661,22 @@ msgid "Edit this task"
msgstr "Rediger denne oppgaven"
#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-calendar-table.c:961
-#: calendar/gui/e-day-view.c:3224 calendar/gui/e-week-view.c:3062
+#: calendar/gui/e-day-view.c:3268 calendar/gui/e-week-view.c:3100
#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
#: ui/evolution-mail-list.xml.h:4
msgid "Cut"
msgstr "Klipp ut"
#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-calendar-table.c:962
-#: calendar/gui/e-day-view.c:3226 calendar/gui/e-week-view.c:3064
+#: calendar/gui/e-day-view.c:3270 calendar/gui/e-week-view.c:3102
#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
msgid "Copy"
msgstr "Kopier"
#: calendar/gui/e-calendar-table.c:953 calendar/gui/e-calendar-table.c:963
-#: calendar/gui/e-day-view.c:3199 calendar/gui/e-day-view.c:3228
-#: calendar/gui/e-week-view.c:3038 calendar/gui/e-week-view.c:3066
+#: calendar/gui/e-day-view.c:3243 calendar/gui/e-day-view.c:3272
+#: calendar/gui/e-week-view.c:3076 calendar/gui/e-week-view.c:3104
#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
#: ui/evolution-mail-list.xml.h:12
msgid "Paste"
@@ -2701,59 +2712,60 @@ msgstr "pm"
#. 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:274 calendar/gui/e-day-view.c:1325
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1325
#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
msgid "%A %d %B"
msgstr "%A %d %B"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1339
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1339
#: calendar/gui/e-week-view-main-item.c:334
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:282 calendar/gui/e-day-view.c:1352
+#: calendar/gui/e-day-view-top-item.c:283 calendar/gui/e-day-view.c:1352
#: calendar/gui/e-week-view-main-item.c:348
msgid "%d %b"
msgstr "%d %b"
-#: calendar/gui/e-day-view.c:3204 ui/evolution-calendar.xml.h:21
+#: calendar/gui/e-day-view.c:3248 ui/evolution-calendar.xml.h:21
msgid "New Appointment"
msgstr "Ny avtale"
-#: calendar/gui/e-day-view.c:3206 calendar/gui/e-week-view.c:3045
+#: calendar/gui/e-day-view.c:3250 calendar/gui/e-week-view.c:3083
msgid "New All Day Event"
msgstr "Ny avtale som varer hele dagen"
-#: calendar/gui/e-day-view.c:3211 calendar/gui/e-week-view.c:3050
+#: calendar/gui/e-day-view.c:3255 calendar/gui/e-week-view.c:3088
msgid "Go to Today"
msgstr "Gå til idag"
-#: calendar/gui/e-day-view.c:3213 calendar/gui/e-week-view.c:3052
+#: calendar/gui/e-day-view.c:3257 calendar/gui/e-week-view.c:3090
msgid "Go to Date..."
msgstr "Gå til dato..."
-#: calendar/gui/e-day-view.c:3220 calendar/gui/e-week-view.c:3058
-#: ui/evolution-calendar.xml.h:24 ui/evolution-message-composer.xml.h:12
+#: calendar/gui/e-day-view.c:3264 calendar/gui/e-week-view.c:3096
+#: shell/e-shortcuts-view.c:463 ui/evolution-calendar.xml.h:24
+#: ui/evolution-message-composer.xml.h:12
msgid "Open"
msgstr "Åpne"
-#: calendar/gui/e-day-view.c:3222 calendar/gui/e-week-view.c:3060
+#: calendar/gui/e-day-view.c:3266 calendar/gui/e-week-view.c:3098
msgid "Delete this Appointment"
msgstr "Slett denne avtalen"
-#: calendar/gui/e-day-view.c:3237 calendar/gui/e-week-view.c:3080
+#: calendar/gui/e-day-view.c:3281 calendar/gui/e-week-view.c:3118
msgid "Make this Occurrence Movable"
msgstr "Gjør denne avtalen flyttbar"
-#: calendar/gui/e-day-view.c:3239 calendar/gui/e-week-view.c:3082
+#: calendar/gui/e-day-view.c:3283 calendar/gui/e-week-view.c:3120
msgid "Delete this Occurrence"
msgstr "Slett denne oppføringen"
-#: calendar/gui/e-day-view.c:3241
+#: calendar/gui/e-day-view.c:3285
msgid "Delete all Occurrences"
msgstr "Slett alle oppføringer"
@@ -2888,10 +2900,6 @@ msgstr "Laster kalender"
msgid "Loading calendar..."
msgstr "Laster kalender..."
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organisator:"
-
#: calendar/gui/e-itip-control.glade.h:10
msgid "Server Message:"
msgstr "Tjenermelding:"
@@ -2923,11 +2931,11 @@ 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:3043 calendar/gui/e-week-view.c:3071
+#: calendar/gui/e-week-view.c:3081 calendar/gui/e-week-view.c:3109
msgid "New Appointment..."
msgstr "Ny avtale..."
-#: calendar/gui/e-week-view.c:3084
+#: calendar/gui/e-week-view.c:3122
msgid "Delete All Occurrences"
msgstr "Slett alle oppføringer"
@@ -3241,7 +3249,7 @@ msgid "Print Calendar"
msgstr "Skriv ut kalender"
#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1665 my-evolution/e-summary.c:437
+#: mail/mail-callbacks.c:1780 my-evolution/e-summary.c:449
#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
#: ui/evolution-comp-editor.xml.h:10
msgid "Print Preview"
@@ -3415,56 +3423,56 @@ msgstr "Dekryptering er ikke støttet av dette cipheret"
msgid "You must be working online to complete this operation"
msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen"
-#: camel/camel-filter-driver.c:537 camel/camel-filter-driver.c:546
+#: camel/camel-filter-driver.c:526 camel/camel-filter-driver.c:535
msgid "Syncing folders"
msgstr "Synkroniserer mapper"
-#: camel/camel-filter-driver.c:646
+#: camel/camel-filter-driver.c:635
msgid "Unable to open spool folder"
msgstr "Kunne ikke åpne spool-mappen"
-#: camel/camel-filter-driver.c:655
+#: camel/camel-filter-driver.c:644
msgid "Unable to process spool folder"
msgstr "Kan ikke prosessere spool-mappen"
-#: camel/camel-filter-driver.c:669
+#: camel/camel-filter-driver.c:658
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Henter melding %d (%d%%)"
-#: camel/camel-filter-driver.c:673 camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
#, c-format
msgid "Failed on message %d"
msgstr "Feilet på melding %d"
-#: camel/camel-filter-driver.c:674
+#: camel/camel-filter-driver.c:663
msgid "Cannot open message"
msgstr "Kan ikke åpne melding"
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:805
+#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
msgid "Syncing folder"
msgstr "Synkroniserer mappe"
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:810
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
msgid "Complete"
msgstr "Fullført"
-#: camel/camel-filter-driver.c:764
+#: camel/camel-filter-driver.c:753
#, c-format
msgid "Getting message %d of %d"
msgstr "Henter melding %d av %d"
-#: camel/camel-filter-driver.c:769 camel/camel-filter-driver.c:787
+#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
#, c-format
msgid "Failed at message %d of %d"
msgstr "Feilet på melding %d av %d"
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:876
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Feil under lesing av filter: %s: %s"
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:882
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Feil under kjøring av filter: %s: %s"
@@ -3903,8 +3911,8 @@ msgid "Failed to verify certificates."
msgstr "Feil under verifisering av sertifikater."
#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1029 mail/mail-ops.c:1036
-#: mail/mail-ops.c:1054 mail/mail-ops.c:1055
+#: camel/camel-store.c:378 mail/mail-ops.c:955 mail/mail-ops.c:962
+#: mail/mail-ops.c:980 mail/mail-ops.c:981
msgid "Trash"
msgstr "Søppel"
@@ -4004,31 +4012,31 @@ msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
msgid "Unexpected OK response from IMAP server: %s"
msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:192
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Kan ikke opprette katalog %s: %s"
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:211
#, c-format
msgid "Could not load summary for %s"
msgstr "Kunne ikke laste sammendrag for %s"
-#: camel/providers/imap/camel-imap-folder.c:270
+#: camel/providers/imap/camel-imap-folder.c:275
msgid "Folder was destroyed and recreated on server."
msgstr "Mappen ble ødelagt og laget på nytt på tjeneren."
-#: camel/providers/imap/camel-imap-folder.c:425
+#: camel/providers/imap/camel-imap-folder.c:430
msgid "Scanning IMAP folder"
msgstr "Skanner IMAP-mappe"
-#: camel/providers/imap/camel-imap-folder.c:1463
-#: camel/providers/imap/camel-imap-folder.c:1716
+#: camel/providers/imap/camel-imap-folder.c:1468
+#: camel/providers/imap/camel-imap-folder.c:1744
msgid "This message is not currently available"
msgstr "Denne meldingen er ikke tilgjengelig"
-#: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1749
+#: camel/providers/imap/camel-imap-folder.c:1496
+#: camel/providers/imap/camel-imap-folder.c:1777
msgid "Could not find message body in FETCH response."
msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
@@ -4040,7 +4048,7 @@ msgstr "Ser etter nye meldinger"
msgid "Check for new messages in all folders"
msgstr "Se etter nye meldinger i alle mapper"
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:627
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:643
msgid "Folders"
msgstr "Mapper"
@@ -4106,7 +4114,7 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:335
+#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
#, c-format
msgid "No such folder %s"
msgstr "Mappen %s eksisterer ikke"
@@ -4367,7 +4375,7 @@ msgid "Cannot summarise folder: %s: %s"
msgstr "Kan ikke lage sammendrag for mappe: %s: %s"
#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1613
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1539
msgid "Synchronising folder"
msgstr "Synkroniserer mappe"
@@ -4973,7 +4981,7 @@ msgid "%.1fG"
msgstr "%.1fG"
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:125
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:126
msgid "attachment"
msgstr "vedlegg"
@@ -5005,7 +5013,7 @@ msgstr "MIME-type:"
msgid "Suggest automatic display of attachment"
msgstr "Foreslå automatisk visning av vedlegg"
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:653
#, c-format
msgid ""
"Could not open file %s:\n"
@@ -5014,7 +5022,7 @@ msgstr ""
"Kan ikke åpne fil %s:\n"
"%s"
-#: composer/e-msg-composer.c:664
+#: composer/e-msg-composer.c:666
#, c-format
msgid ""
"Error while reading file %s:\n"
@@ -5023,21 +5031,21 @@ msgstr ""
"Feil under lesing av fil %s:\n"
"%s"
-#: composer/e-msg-composer.c:854
+#: composer/e-msg-composer.c:856
msgid "Save as..."
msgstr "Lagre som..."
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:867
#, c-format
msgid "Error saving file: %s"
msgstr "Feil under lagring av fil: %s"
-#: composer/e-msg-composer.c:885
+#: composer/e-msg-composer.c:887
#, c-format
msgid "Error loading file: %s"
msgstr "Feil under lasting av fil: %s"
-#: composer/e-msg-composer.c:957
+#: composer/e-msg-composer.c:959
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -5045,12 +5053,12 @@ msgstr ""
"Kunne ikke åpne skisse-mappen for denne kontoen.\n"
"Vil du bruke standard skisse-mappe?"
-#: composer/e-msg-composer.c:1023 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1025 data/evolution.desktop.in.h:1
#: shell/e-shell-view-menu.c:231
msgid "Evolution"
msgstr "Evolution"
-#: composer/e-msg-composer.c:1029
+#: composer/e-msg-composer.c:1031
msgid ""
"This message has not been sent.\n"
"\n"
@@ -5060,68 +5068,68 @@ msgstr ""
"\n"
"Vil du lagre endringene?"
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1056
msgid "Open file"
msgstr "Åpne fil"
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1206
msgid "Insert File"
msgstr "Sett inn fil"
-#: composer/e-msg-composer.c:1539 composer/e-msg-composer.c:1928
+#: composer/e-msg-composer.c:1543 composer/e-msg-composer.c:1932
msgid "Compose a message"
msgstr "Skriv en melding"
-#: composer/e-msg-composer.c:2022
+#: composer/e-msg-composer.c:2026
msgid "Could not create composer window."
msgstr "Kan ikke opprette komponeringsvinduet."
-#: composer/e-msg-composer-hdrs.c:324
+#: composer/e-msg-composer-hdrs.c:325
msgid "Click here for the address book"
msgstr "Klikk her for å få opp adresseboken"
#.
#. * From:
#.
-#: composer/e-msg-composer-hdrs.c:355
+#: composer/e-msg-composer-hdrs.c:356
msgid "From:"
msgstr "Fra:"
#.
#. * Reply-To:
#.
-#: composer/e-msg-composer-hdrs.c:361
+#: composer/e-msg-composer-hdrs.c:362
msgid "Reply-To:"
msgstr "Svar-til:"
#.
#. * Subject:
#.
-#: composer/e-msg-composer-hdrs.c:372
+#: composer/e-msg-composer-hdrs.c:373
msgid "Subject:"
msgstr "Emne:"
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:387
msgid "To:"
msgstr "Til:"
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:388
msgid "Enter the recipients of the message"
msgstr "Skriv inn mottakerene for meldingen"
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:391
msgid "Cc:"
msgstr "Cc:"
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:392
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:395
msgid "Bcc:"
msgstr "Bcc:"
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:396
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -5364,8 +5372,8 @@ msgstr ""
"Du glemte å velge en meppe.\n"
"Vennligst gå tilbake og spesifiser en gyldig mappe for levering av e-post."
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:693
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
+#: mail/mail-account-gui.c:701
msgid "Select Folder"
msgstr "Velg mappe"
@@ -5619,7 +5627,7 @@ msgstr "Svart til"
msgid "Score"
msgstr "Poenggi"
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1048
msgid "Sender"
msgstr "Avsender"
@@ -5730,7 +5738,7 @@ msgstr ""
msgid "Settings"
msgstr "Innstillinger"
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1577
+#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1692
msgid "Filters"
msgstr "Filtre"
@@ -5766,131 +5774,131 @@ msgstr "Kan ikke initiere Evolutions e-postkomponent."
msgid "Cannot register storage with shell"
msgstr "Kan ikke registrere lagring i skallet"
-#: mail/folder-browser.c:808
+#: mail/folder-browser.c:813
msgid "Store search as vFolder"
msgstr "Lagre søk som vMappe"
-#: mail/folder-browser.c:1151
+#: mail/folder-browser.c:1156
msgid "VFolder on _Subject"
msgstr "VFolder på e_mne"
-#: mail/folder-browser.c:1154
+#: mail/folder-browser.c:1159
msgid "VFolder on Se_nder"
msgstr "VFolder for se_nder"
-#: mail/folder-browser.c:1157
+#: mail/folder-browser.c:1162
msgid "VFolder on _Recipients"
msgstr "VFolder for mottake_re"
-#: mail/folder-browser.c:1160
+#: mail/folder-browser.c:1165
msgid "VFolder on Mailing _List"
msgstr "VFolder på e-post_liste"
-#: mail/folder-browser.c:1166
+#: mail/folder-browser.c:1171
msgid "Filter on Sub_ject"
msgstr "Filtrer på em_ne"
-#: mail/folder-browser.c:1169
+#: mail/folder-browser.c:1174
msgid "Filter on Sen_der"
msgstr "Filtrer på sen_der"
-#: mail/folder-browser.c:1172
+#: mail/folder-browser.c:1177
msgid "Filter on Re_cipients"
msgstr "Filtrer på motta_ker"
-#: mail/folder-browser.c:1175
+#: mail/folder-browser.c:1180
msgid "Filter on _Mailing List"
msgstr "Filtrer på e-_postliste"
-#: mail/folder-browser.c:1184
+#: mail/folder-browser.c:1189
msgid "_Open"
msgstr "_Åpne"
-#: mail/folder-browser.c:1186
+#: mail/folder-browser.c:1191
msgid "Resend"
msgstr "Send på nytt"
-#: mail/folder-browser.c:1188 ui/evolution-calendar.xml.h:52
+#: mail/folder-browser.c:1193 ui/evolution-calendar.xml.h:52
#: ui/evolution-mail-message.xml.h:84 ui/evolution-tasks.xml.h:17
msgid "_Save As..."
msgstr "Lagre _som..."
-#: mail/folder-browser.c:1190 ui/evolution-tasks.xml.h:16
+#: mail/folder-browser.c:1195 ui/evolution-tasks.xml.h:16
msgid "_Print"
msgstr "S_kriv ut"
-#: mail/folder-browser.c:1195 ui/evolution-mail-message.xml.h:83
+#: mail/folder-browser.c:1200 ui/evolution-mail-message.xml.h:83
msgid "_Reply to Sender"
msgstr "Sva_r til sender"
-#: mail/folder-browser.c:1197 ui/evolution-mail-message.xml.h:59
+#: mail/folder-browser.c:1202 ui/evolution-mail-message.xml.h:59
msgid "Reply to _List"
msgstr "Svar til _listen"
-#: mail/folder-browser.c:1199 ui/evolution-mail-message.xml.h:58
+#: mail/folder-browser.c:1204 ui/evolution-mail-message.xml.h:58
msgid "Reply to _All"
msgstr "Svar til _alle"
-#: mail/folder-browser.c:1201
+#: mail/folder-browser.c:1206
msgid "_Forward"
msgstr "_Videresend"
-#: mail/folder-browser.c:1204
+#: mail/folder-browser.c:1209
msgid "Mar_k as Read"
msgstr "Mer_k som lest"
-#: mail/folder-browser.c:1206
+#: mail/folder-browser.c:1211
msgid "Mark as U_nread"
msgstr "Merk som _ulest"
-#: mail/folder-browser.c:1211
+#: mail/folder-browser.c:1216
msgid "_Move to Folder..."
msgstr "Fl_ytt til mappe..."
-#: mail/folder-browser.c:1213
+#: mail/folder-browser.c:1218
msgid "_Copy to Folder..."
msgstr "K_opier til mappe..."
-#: mail/folder-browser.c:1217 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1222 ui/evolution-mail-message.xml.h:85
msgid "_Undelete"
msgstr "A_ngre slett"
-#. { _("Add Sender to Address Book"), NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender), NULL, 0 },
-#. { "", NULL,
-#. GTK_SIGNAL_FUNC (NULL), NULL, 0 },
#: mail/folder-browser.c:1227
+msgid "Add Sender to Address Book"
+msgstr "Legg til sender i adressebok"
+
+#: mail/folder-browser.c:1232
msgid "Apply Filters"
msgstr "Påfør filtre"
-#: mail/folder-browser.c:1231
+#: mail/folder-browser.c:1236
msgid "Create Ru_le From Message"
msgstr "Lage rege_l fra melding"
-#: mail/folder-browser.c:1370
+#: mail/folder-browser.c:1375
msgid "Filter on Mailing List"
msgstr "Filtrer etter e-postliste"
-#: mail/folder-browser.c:1371
+#: mail/folder-browser.c:1376
msgid "VFolder on Mailing List"
msgstr "VFolder på e-postliste"
-#: mail/folder-browser.c:1373
+#: mail/folder-browser.c:1378
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr "Filtrer etter e-postliste (%s)"
-#: mail/folder-browser.c:1374
+#: mail/folder-browser.c:1379
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr "VFolder på e-postliste (%s)"
-#: mail/folder-browser-ui.c:248
+#: mail/folder-browser-ui.c:252
#, c-format
msgid "Properties for \"%s\""
msgstr "Egenskaper for \"%s\""
-#: mail/folder-browser-ui.c:250
+#: mail/folder-browser-ui.c:254
msgid "Properties"
msgstr "Egenskaper"
@@ -5989,11 +5997,11 @@ msgstr "Du har ikke fylt ut all nødvendig informasjon."
msgid "Evolution Account Editor"
msgstr "Kontoredigering for Evolution"
-#: mail/mail-account-gui.c:883
+#: mail/mail-account-gui.c:891
msgid "Save signature"
msgstr "Lagre signatur"
-#: mail/mail-account-gui.c:889
+#: mail/mail-account-gui.c:897
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
@@ -6003,28 +6011,28 @@ msgstr ""
"\n"
"Vil du lagre endringene?"
-#: mail/mail-accounts.c:126 mail/mail-accounts.c:177
+#: mail/mail-accounts.c:127 mail/mail-accounts.c:178
msgid " (default)"
msgstr " (forvalgt)"
-#: mail/mail-accounts.c:209
+#: mail/mail-accounts.c:210
msgid "Disable"
msgstr "Deaktiver"
-#: mail/mail-accounts.c:211 mail/mail-config.glade.h:36
+#: mail/mail-accounts.c:212 mail/mail-config.glade.h:36
msgid "Enable"
msgstr "Aktiver"
-#: mail/mail-accounts.c:299 mail/mail-accounts.c:303
+#: mail/mail-accounts.c:300 mail/mail-accounts.c:304
msgid "Are you sure you want to delete this account?"
msgstr "Er du sikker på at du vil slette denne kontoen?"
-#: mail/mail-accounts.c:463 mail/mail-accounts.c:467
+#: mail/mail-accounts.c:464 mail/mail-accounts.c:468
msgid "Are you sure you want to delete this news account?"
msgstr "Er du sikker på at du vil slette denne diskusjonsgruppekontoen?"
#. give our dialog an OK button and title
-#: mail/mail-accounts.c:650
+#: mail/mail-accounts.c:651
msgid "Evolution Account Manager"
msgstr "Kontohåndtering for Evolution"
@@ -6052,7 +6060,7 @@ msgstr "%s e-postliste"
msgid "Add Filter Rule"
msgstr "Legg til filterregel"
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -6064,7 +6072,7 @@ msgstr ""
"motta eller skrive meldinger.\n"
"Vil du konfigurere den nå?"
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -6072,7 +6080,7 @@ msgstr ""
"Du må konfigurere en identitet\n"
"før du kan skrive e-post."
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -6080,11 +6088,11 @@ msgstr ""
"Du må konfigurere en e-post-transport\n"
"før du kan skrive e-post."
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
msgid "You have not set a mail transport method"
msgstr "Du har ikke satt en transportmetode for e-post"
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -6092,37 +6100,48 @@ msgstr ""
"Denne meldingen har ikke emne.\n"
"Send likevel?"
-#: mail/mail-callbacks.c:319
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"Denne meldingen inneholder kun Bcc mottakere.\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
msgid "You must specify recipients in order to send this message."
msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
-#: mail/mail-callbacks.c:362
+#: mail/mail-callbacks.c:410
msgid "You must configure an account before you can send this email."
msgstr "Du må konfigurere en konto før du kan sender denne meldingen."
-#: mail/mail-callbacks.c:604
+#: mail/mail-callbacks.c:655
#, c-format
msgid "On %s, %s wrote:"
msgstr "Den %s, skrev %s:"
-#: mail/mail-callbacks.c:823
+#: mail/mail-callbacks.c:874
msgid "Forwarded message:\n"
msgstr "Videresendt melding:\n"
-#: mail/mail-callbacks.c:917
+#: mail/mail-callbacks.c:968
msgid "Move message(s) to"
msgstr "Flytt melding(er) til"
-#: mail/mail-callbacks.c:919
+#: mail/mail-callbacks.c:970
msgid "Copy message(s) to"
msgstr "Kopier melding(er) til"
-#: mail/mail-callbacks.c:1209
+#: mail/mail-callbacks.c:1324
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "Er du sikker på at du vil redigere alle %d meldingene?"
-#: mail/mail-callbacks.c:1231
+#: mail/mail-callbacks.c:1346
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -6130,7 +6149,7 @@ msgstr ""
"Du kan kun redigere meldinger lagret\n"
"i Skisser-katalogen."
-#: mail/mail-callbacks.c:1265
+#: mail/mail-callbacks.c:1380
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -6138,20 +6157,20 @@ msgstr ""
"Du kan kun sende meldinger på nytt\n"
"som er lagret i sendt-katalogen."
-#: mail/mail-callbacks.c:1277
+#: mail/mail-callbacks.c:1392
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "Er du sikker på at du vil sende alle %d meldingene på nytt?"
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1413
msgid "No Message Selected"
msgstr "Ingen melding valgt"
-#: mail/mail-callbacks.c:1332 mail/mail-display.c:95
+#: mail/mail-callbacks.c:1447 mail/mail-display.c:96
msgid "Overwrite file?"
msgstr "Overskriv fil?"
-#: mail/mail-callbacks.c:1336 mail/mail-display.c:99
+#: mail/mail-callbacks.c:1451 mail/mail-display.c:100
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -6159,15 +6178,15 @@ msgstr ""
"En fil med samme navn eksisterer allerede.\n"
"Overskriv den?"
-#: mail/mail-callbacks.c:1380
+#: mail/mail-callbacks.c:1495
msgid "Save Message As..."
msgstr "Lagre melding som..."
-#: mail/mail-callbacks.c:1382
+#: mail/mail-callbacks.c:1497
msgid "Save Messages As..."
msgstr "Lagre meldinger som..."
-#: mail/mail-callbacks.c:1567
+#: mail/mail-callbacks.c:1682
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -6176,20 +6195,20 @@ msgstr ""
"Feil under lasting av filter-informasjon:\n"
"%s"
-#: mail/mail-callbacks.c:1625
+#: mail/mail-callbacks.c:1740
msgid "Print Message"
msgstr "Skriv ut melding"
-#: mail/mail-callbacks.c:1672
+#: mail/mail-callbacks.c:1787
msgid "Printing of message failed"
msgstr "Feil under utskrift av melding"
-#: mail/mail-callbacks.c:1767
+#: mail/mail-callbacks.c:1882
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "Er du sikker på at du vil åpne alle %d meldingene i separate vinduer?"
-#: mail/mail-config.c:1476 mail/mail-config.c:1479
+#: mail/mail-config.c:1503 mail/mail-config.c:1506
msgid "Connecting to server..."
msgstr "Kobler til tjener..."
@@ -6334,10 +6353,6 @@ msgstr "Standard tegnsett: "
msgid "Digital IDs..."
msgstr "Digitale IDer..."
-#: mail/mail-config.glade.h:29
-msgid "Display"
-msgstr "Vis"
-
#: mail/mail-config.glade.h:30
msgid "Done"
msgstr "Ferdig"
@@ -6435,6 +6450,10 @@ msgstr "PGP-nøkkel ID:"
msgid "PGP binary path:"
msgstr "Sti til PGP-binærfil:"
+#: mail/mail-config.glade.h:63
+msgid "Pick a color"
+msgstr "Velg en farge"
+
#: mail/mail-config.glade.h:64
msgid "Pretty Good Privacy"
msgstr "Pretty Good Privacy"
@@ -6552,7 +6571,7 @@ msgstr ""
#: mail/mail-config.glade.h:98 ui/evolution-comp-editor.xml.h:20
#: ui/evolution-mail-messagedisplay.xml.h:9
#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:47
msgid "_Edit"
msgstr "R_ediger"
@@ -6560,6 +6579,10 @@ msgstr "R_ediger"
msgid "placeholder"
msgstr "plassholder"
+#: mail/mail-config.glade.h:101
+msgid "seconds."
+msgstr "sekunder"
+
#: mail/mail-crypto.c:59
msgid "Could not create a PGP signature context."
msgstr "Kunne ikke opprette PGP signaturkontekst."
@@ -6596,54 +6619,54 @@ msgstr "Kunne ikke opprette S/MIME \"envelope\" kontekst."
msgid "Could not create a S/MIME decode context."
msgstr "Kunne ikke opprette S/MIME dekodingskontekst."
-#: mail/mail-display.c:199
+#: mail/mail-display.c:200
msgid "Save Attachment"
msgstr "Lagre vedlegg"
-#: mail/mail-display.c:239
+#: mail/mail-display.c:240
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "Kunne ikke opprette midlertidig katalog: %s"
-#: mail/mail-display.c:300
+#: mail/mail-display.c:301
msgid "Save to Disk..."
msgstr "Lagre til disk..."
-#: mail/mail-display.c:302
+#: mail/mail-display.c:303
#, c-format
msgid "Open in %s..."
msgstr "Åpne i %s..."
-#: mail/mail-display.c:304
+#: mail/mail-display.c:305
msgid "View Inline"
msgstr "Vis \"inline\""
-#: mail/mail-display.c:339
+#: mail/mail-display.c:340
msgid "External Viewer"
msgstr "Ekstern visning"
-#: mail/mail-display.c:362
+#: mail/mail-display.c:363
#, c-format
msgid "View Inline (via %s)"
msgstr "Vis \"inline\" (via %s)"
-#: mail/mail-display.c:366
+#: mail/mail-display.c:367
msgid "Hide"
msgstr "Skjul"
-#: mail/mail-display.c:991
+#: mail/mail-display.c:961
msgid "Loading message content"
msgstr "Laster meldingsinnhold"
-#: mail/mail-display.c:1310
+#: mail/mail-display.c:1280
msgid "Open Link in Browser"
msgstr "Åpne lenke i nettleser"
-#: mail/mail-display.c:1312
+#: mail/mail-display.c:1282
msgid "Save as (FIXME)"
msgstr "Lagre som"
-#: mail/mail-display.c:1314
+#: mail/mail-display.c:1284
msgid "Copy Link Location"
msgstr "Kopier lokasjon for lenke"
@@ -6724,43 +6747,43 @@ msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
msgid "Malformed external-body part."
msgstr "Feilutformet del for ekstern-kropp."
-#: mail/mail-local.c:506
+#: mail/mail-local.c:455
#, c-format
msgid "Opening '%s'"
msgstr "Åpner '%s'"
-#: mail/mail-local.c:805
+#: mail/mail-local.c:755
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "Endrer mappe \"%s\" til \"%s\"-format"
-#: mail/mail-local.c:809
+#: mail/mail-local.c:759
#, c-format
msgid "Change folder \"%s\" to \"%s\" format"
msgstr "Endre mappe \"%s\" til \"%s\"-format"
-#: mail/mail-local.c:832
+#: mail/mail-local.c:782
msgid "Reconfiguring folder"
msgstr "Omkonfigurerer mappe"
#. first, 'close' the old folder
-#: mail/mail-local.c:861
+#: mail/mail-local.c:811
msgid "Closing current folder"
msgstr "Lukker aktiv mappe"
-#: mail/mail-local.c:893
+#: mail/mail-local.c:838
msgid "Renaming old folder and opening"
msgstr "Endrer navn på gammel mappe og gjenåpner"
-#: mail/mail-local.c:911
+#: mail/mail-local.c:856
msgid "Creating new folder"
msgstr "Oppretter en ny mappe"
-#: mail/mail-local.c:925
+#: mail/mail-local.c:870
msgid "Copying messages"
msgstr "Kopierer meldinger"
-#: mail/mail-local.c:942
+#: mail/mail-local.c:887
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6769,7 +6792,7 @@ msgstr ""
"Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
"ikke kunne åpne denne mappen igjen: %s"
-#: mail/mail-local.c:981
+#: mail/mail-local.c:926
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
@@ -6777,7 +6800,7 @@ msgstr ""
"Hvis du ikke kan åpne denne postboksen igjen må\n"
"du reparere den manuelt."
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1012
#, c-format
msgid "Reconfigure %s"
msgstr "Omkonfigurer %s"
@@ -6808,112 +6831,112 @@ msgstr "Arbeider"
msgid "Evolution progress"
msgstr "Evolution fremgang"
-#: mail/mail-ops.c:616
+#: mail/mail-ops.c:547
#, c-format
msgid "Sending \"%s\""
msgstr "Sender \"%s\""
-#: mail/mail-ops.c:620
+#: mail/mail-ops.c:551
msgid "Sending message"
msgstr "Sender melding"
-#: mail/mail-ops.c:735
+#: mail/mail-ops.c:662
#, c-format
msgid "Sending message %d of %d"
msgstr "Sender melding %d av %d"
-#: mail/mail-ops.c:754
+#: mail/mail-ops.c:681
#, c-format
msgid "Failed on message %d of %d"
msgstr "Feilet på melding %d av %d"
-#: mail/mail-ops.c:756 mail/mail-send-recv.c:493
+#: mail/mail-ops.c:683 mail/mail-send-recv.c:492
msgid "Complete."
msgstr "Fullført."
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:768
msgid "Saving message to folder"
msgstr "Lagrer melding til mappe"
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:843
#, c-format
msgid "Moving messages to %s"
msgstr "Flytter melding(er) til %s"
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:843
#, c-format
msgid "Copying messages to %s"
msgstr "Kopierer meldinger til %s"
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:860
msgid "Moving"
msgstr "Flytter"
-#: mail/mail-ops.c:937
+#: mail/mail-ops.c:863
msgid "Copying"
msgstr "Kopierer"
-#: mail/mail-ops.c:1014
+#: mail/mail-ops.c:940
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Skanner mapper i \"%s\""
-#: mail/mail-ops.c:1176
+#: mail/mail-ops.c:1102
msgid "Forwarded messages"
msgstr "Videresendte meldinger"
-#: mail/mail-ops.c:1217 mail/mail-ops.c:1355
+#: mail/mail-ops.c:1143 mail/mail-ops.c:1281
#, c-format
msgid "Opening folder %s"
msgstr "Åpner mappe %s"
-#: mail/mail-ops.c:1284
+#: mail/mail-ops.c:1210
#, c-format
msgid "Opening store %s"
msgstr "Åpner lager %s"
-#: mail/mail-ops.c:1423
+#: mail/mail-ops.c:1349
#, c-format
msgid "Removing folder %s"
msgstr "Fjerner mappe %s"
-#: mail/mail-ops.c:1510
+#: mail/mail-ops.c:1436
#, c-format
msgid "Moving folder %s to %s"
msgstr "Flytter mappe %s til %s"
-#: mail/mail-ops.c:1512
+#: mail/mail-ops.c:1438
#, c-format
msgid "Copying folder %s to %s"
msgstr "Kopierer mappe %s til %s"
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1591
msgid "Refreshing folder"
msgstr "Oppfrisker mappe"
-#: mail/mail-ops.c:1701
+#: mail/mail-ops.c:1627
msgid "Expunging folder"
msgstr "Tømmer mappe"
-#: mail/mail-ops.c:1750
+#: mail/mail-ops.c:1676
#, c-format
msgid "Retrieving message %s"
msgstr "Henter melding %s"
-#: mail/mail-ops.c:1817
+#: mail/mail-ops.c:1743
msgid "Retrieving messages"
msgstr "Henter meldinger"
-#: mail/mail-ops.c:1827
+#: mail/mail-ops.c:1753
#, c-format
msgid "Retrieving message number %d of %d (uid \"%s\")"
msgstr "Henter melding nummer %d av %d (uid \"%s\")"
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1827
msgid "Saving messages"
msgstr "Lagrer meldinger"
-#: mail/mail-ops.c:1980
+#: mail/mail-ops.c:1906
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -6922,12 +6945,12 @@ msgstr ""
"Kunne ikke opprette utdatafil: %s\n"
" %s"
-#: mail/mail-ops.c:1993
+#: mail/mail-ops.c:1919
#, c-format
msgid "Saving message %d of %d (uid \"%s\")"
msgstr "Lagrer melding %d av %d (uid \"%s\")"
-#: mail/mail-ops.c:2007
+#: mail/mail-ops.c:1933
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -6936,11 +6959,11 @@ msgstr ""
"Feil under lagring av av meldinger til: %s:\n"
" %s"
-#: mail/mail-ops.c:2081
+#: mail/mail-ops.c:2007
msgid "Saving attachment"
msgstr "Lagrer vedlegg"
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2022
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -6949,12 +6972,12 @@ msgstr ""
"Kunne ikke opprette utdatafil: %s\n"
" %s"
-#: mail/mail-ops.c:2124
+#: mail/mail-ops.c:2050
#, c-format
msgid "Could not write data: %s"
msgstr "Kan ikke skrive data: %s"
-#: mail/mail-ops.c:2191
+#: mail/mail-ops.c:2117
#, c-format
msgid "Disconnecting from %s"
msgstr "Kobler fra %s"
@@ -6983,62 +7006,58 @@ msgstr "Finn:"
msgid "Matches:"
msgstr "Treff:"
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Søk"
-
-#: mail/mail-send-recv.c:142
+#: mail/mail-send-recv.c:141
msgid "Cancelling..."
msgstr "Avbryter..."
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:250
msgid "Send & Receive mail"
msgstr "Send & motta e-post"
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:253
msgid "Receiving"
msgstr "Mottar"
-#: mail/mail-send-recv.c:303
+#: mail/mail-send-recv.c:302
msgid "Updating..."
msgstr "Oppdaterer..."
-#: mail/mail-send-recv.c:305 mail/mail-send-recv.c:351
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
msgid "Waiting..."
msgstr "Venter..."
-#: mail/mail-send-recv.c:324
+#: mail/mail-send-recv.c:323
msgid "Sending"
msgstr "Sender"
-#: mail/mail-send-recv.c:489
+#: mail/mail-send-recv.c:488
msgid "Cancelled."
msgstr "Avbrutt"
-#: mail/mail-tools.c:158
+#: mail/mail-tools.c:159
#, c-format
msgid "Couldn't create temporary mbox `%s': %s"
msgstr "Kunne ikke opprette midlertidig mbox `%s': %s"
-#: mail/mail-tools.c:206
+#: mail/mail-tools.c:207
#, c-format
msgid "[%s] (forwarded message)"
msgstr "[%s] (videresendt melding)"
-#: mail/mail-tools.c:216
+#: mail/mail-tools.c:217
msgid "Fwd: (no subject)"
msgstr "Fwd: (uten emne)"
-#: mail/mail-tools.c:233
+#: mail/mail-tools.c:234
#, c-format
msgid "Forwarded message - %s"
msgstr "Videresendt melding - %s"
-#: mail/mail-tools.c:235
+#: mail/mail-tools.c:236
msgid "Forwarded message (no subject)"
msgstr "Videresendt melding (uten emne)"
-#: mail/mail-tools.c:549
+#: mail/mail-tools.c:457
#, c-format
msgid ""
"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
@@ -7127,7 +7146,7 @@ msgstr "Mottatt"
msgid "Size"
msgstr "Størrelse"
-#: mail/mail-session.c:161
+#: mail/mail-session.c:170
msgid "User canceled operation."
msgstr "Operasjon avbrutt av bruker."
@@ -7171,23 +7190,51 @@ msgstr "Evolution-komponent for sammendrag."
msgid "Factory for the Evolution executive summary component."
msgstr "Factory for Evolutions sammendrag-komponent."
-#: my-evolution/component-factory.c:128
+#: my-evolution/component-factory.c:140
msgid "Cannot initialize Evolution's Executive Summary component."
msgstr "Kan ikke initiere Evolutions sammendragskomponent."
-#: my-evolution/e-summary-calendar.c:193 my-evolution/e-summary-calendar.c:199
+#: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
+msgid "Appointments"
+msgstr "Avtaler"
+
+#: my-evolution/e-summary-calendar.c:159
+msgid "No appointments"
+msgstr "Ingen avtaler"
+
+#: my-evolution/e-summary-calendar.c:203 my-evolution/e-summary-calendar.c:209
msgid "%I:%M%p"
msgstr "%I:%M%p"
-#: my-evolution/e-summary.c:398 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary-mail.c:100
+msgid "Mail summary"
+msgstr "E-post sammendrag"
+
+#: my-evolution/e-summary-rdf.c:378 my-evolution/e-summary-rdf.c:404
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Feil under nedlasting av RDF</b>"
+
+#: my-evolution/e-summary-weather.c:56
+msgid "My Weather"
+msgstr "Min værmelding"
+
+#: my-evolution/e-summary-weather.c:296
+msgid "<b>Error downloading Metar</b>"
+msgstr "<b>Feil under nedlasting av Metar</b>"
+
+#: my-evolution/e-summary-weather.c:600
+msgid "Regions"
+msgstr "Regioner"
+
+#: my-evolution/e-summary.c:410 ui/my-evolution.xml.h:3
msgid "Print My Evolution"
msgstr "Skriv ut Min Evolution"
-#: my-evolution/e-summary.c:444
+#: my-evolution/e-summary.c:456
msgid "Printing of My Evolution failed"
msgstr "Utskrift av Min Evolution feilet"
-#: my-evolution/main.c:51
+#: my-evolution/main.c:52
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr "Executive summary komponent kunne ikke initialisere Bonobo.\n"
@@ -8341,9 +8388,13 @@ msgstr "Blåsende støvvirvler"
msgid "Drifting dust whirls"
msgstr "Drivende støvvirvler"
-#: shell/e-activity-handler.c:174 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Avbryt"
+#: shell/e-activity-handler.c:198
+msgid "Show Details"
+msgstr "Vis detaljer"
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr "Alys operasjon"
#: shell/e-setup.c:125 shell/e-setup.c:198
msgid "Evolution installation"
@@ -8501,7 +8552,7 @@ msgstr "Spesifisert mappe er ikke gyldig."
msgid "Evolution - Create new folder"
msgstr "Evolution - Lag ny mappe"
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
msgid ""
"The type of the selected folder is not valid for\n"
"the requested operation."
@@ -8509,7 +8560,7 @@ msgstr ""
"Typen for valgt mappe er ikke gyldig for den\n"
"forespurte operasjonen."
-#: shell/e-shell-folder-selection-dialog.c:329
+#: shell/e-shell-folder-selection-dialog.c:332
msgid "New..."
msgstr "Ny..."
@@ -8622,35 +8673,35 @@ msgstr "Velg en målmappe for å importere data"
msgid "Closing connections..."
msgstr "Lukker forbindelser..."
-#: shell/e-shell-view.c:170
+#: shell/e-shell-view.c:174
msgid "(No folder displayed)"
msgstr "(Ingen mappe vist)"
#. Special case for My Evolution
-#: shell/e-shell-view.c:1368 shell/e-storage-set-view.c:1439
+#: shell/e-shell-view.c:1387 shell/e-storage-set-view.c:1441
msgid "My Evolution"
msgstr "Min Evolution"
-#: shell/e-shell-view.c:1385
+#: shell/e-shell-view.c:1404
#, c-format
msgid "%s - Evolution %s"
msgstr "%s - Evolution %s"
-#: shell/e-shell-view.c:1387
+#: shell/e-shell-view.c:1406
#, c-format
msgid "%s - Evolution %s [%s]"
msgstr "%s - Evolution - %s [%s]"
-#: shell/e-shell-view.c:1425
+#: shell/e-shell-view.c:1444
msgid "Evolution is currently online. Click on this button to work offline."
msgstr ""
"Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
-#: shell/e-shell-view.c:1432
+#: shell/e-shell-view.c:1451
msgid "Evolution is in the process of going offline."
msgstr "Evolution er i ferd med å koble fra."
-#: shell/e-shell-view.c:1438
+#: shell/e-shell-view.c:1457
msgid "Evolution is currently offline. Click on this button to work online."
msgstr ""
"Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
@@ -8677,35 +8728,43 @@ msgstr ""
"for e-post, kalender og kontaktdatabaser for\n"
"GNOME skrivebordsmiljøet."
-#: shell/e-shell-view-menu.c:468
+#: shell/e-shell-view-menu.c:464
msgid "Go to folder..."
msgstr "Gå til mappe..."
-#: shell/e-shell-view-menu.c:469
+#: shell/e-shell-view-menu.c:465
msgid "Select the folder that you want to open"
msgstr "Velg mappen du ønsker å åpne"
-#: shell/e-shell-view-menu.c:655
+#: shell/e-shell-view-menu.c:610
+msgid "Create a new shortcut"
+msgstr "Opprett en ny snarvei"
+
+#: shell/e-shell-view-menu.c:611
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "Velg mappen du ønsker snarveien skal peke til:"
+
+#: shell/e-shell-view-menu.c:718
msgid "Work online"
msgstr "Arbeid \"online\""
-#: shell/e-shell-view-menu.c:667 shell/e-shell-view-menu.c:679
+#: shell/e-shell-view-menu.c:730 shell/e-shell-view-menu.c:742
msgid "Work offline"
msgstr "Arbeid \"offline\""
-#: shell/e-shortcuts.c:382
+#: shell/e-shortcuts.c:596
msgid "Error saving shortcuts."
msgstr "Feil under lagring av snarveier."
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:136
msgid "Create new shortcut group"
msgstr "Opprett ny snarveigruppe"
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:139
msgid "Group name:"
msgstr "Gruppenavn:"
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:262
#, c-format
msgid ""
"Do you really want to remove group\n"
@@ -8714,59 +8773,95 @@ msgstr ""
"Vil du virkelig fjerne gruppen\n"
"`%s' fra snarveilinjen?"
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:267
msgid "Don't remove"
msgstr "Ikke fjern"
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:292
+msgid "Rename Shortcut Group"
+msgstr "Endre navn på snarveigruppen"
+
+#: shell/e-shortcuts-view.c:293
+msgid "Rename selected shortcut group to:"
+msgstr "Endre valgt snarveigruppe til:"
+
+#: shell/e-shortcuts-view.c:303
msgid "_Small Icons"
msgstr "_Små ikoner"
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:304
msgid "Show the shortcuts as small icons"
msgstr "Vis snarveier som små ikoner"
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:306
msgid "_Large Icons"
msgstr "Store i_koner"
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:307
msgid "Show the shortcuts as large icons"
msgstr "Vis snarveier som store ikoner"
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:318
msgid "_New Group..."
msgstr "_Ny gruppe..."
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:319
msgid "Create a new shortcut group"
msgstr "Opprett en ny snarveigruppe"
-#: shell/e-shortcuts-view.c:294
+#: shell/e-shortcuts-view.c:321
msgid "_Remove This Group..."
msgstr "Fje_rn denne gruppen..."
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:322
msgid "Remove this shortcut group"
msgstr "Fjern denne snarveigruppen"
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:324
+msgid "Re_name This Group..."
+msgstr "E_ndre navn på denne gruppen..."
+
+#: shell/e-shortcuts-view.c:325
+msgid "Rename this shortcut group"
+msgstr "Endre navn på denne snarveigruppen"
+
+#: shell/e-shortcuts-view.c:330
msgid "_Hide the Shortcut Bar"
msgstr "Sk_jul snarveilinjen"
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:331
msgid "Hide the shortcut bar"
msgstr "Skjul snarveilinjen"
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Aktiver"
+#: shell/e-shortcuts-view.c:450
+msgid "Rename shortcut"
+msgstr "Endre navn på snarvei"
+
+#: shell/e-shortcuts-view.c:451
+msgid "Rename selected shortcut to:"
+msgstr "Endre navn på valgt snarvei til:"
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Aktiver denne snarveien"
+#: shell/e-shortcuts-view.c:463
+msgid "Open the folder linked to this shortcut"
+msgstr "Åpne mappen som er lenket til denne snarveien"
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:465 ui/evolution.xml.h:24
+msgid "Open in New Window"
+msgstr "Åpne i nytt vindu"
+
+#: shell/e-shortcuts-view.c:465
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Åpne mappen som er lenket til denne snarveien i et nytt vindu"
+
+#: shell/e-shortcuts-view.c:468
+msgid "Rename"
+msgstr "Endre navn"
+
+#: shell/e-shortcuts-view.c:468
+msgid "Rename this shortcut"
+msgstr "Endre navn på denne snarveien"
+
+#: shell/e-shortcuts-view.c:470
msgid "Remove this shortcut from the shortcut bar"
msgstr "Fjern denne snarveien fra snarveilinjen"
@@ -8924,15 +9019,15 @@ msgstr ""
msgid "Cannot access the Evolution shell."
msgstr "Kan ikke aksessere Evolution-skallet."
-#: shell/main.c:211
+#: shell/main.c:212
msgid "Disable splash screen"
msgstr "Deaktiver splash"
-#: shell/main.c:212
+#: shell/main.c:213
msgid "Send the debugging output of all components to a file."
msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
-#: shell/main.c:246
+#: shell/main.c:248
msgid "Cannot initialize the Bonobo component system."
msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
@@ -9021,7 +9116,7 @@ msgstr "_Lim inn"
#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:51
#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
msgid "_Print..."
msgstr "S_kriv ut..."
@@ -9171,7 +9266,7 @@ msgstr "_Dag"
msgid "_Month"
msgstr "_Måned"
-#: ui/evolution-calendar.xml.h:48 ui/evolution.xml.h:58
+#: ui/evolution-calendar.xml.h:48 ui/evolution.xml.h:57
msgid "_New"
msgstr "_Ny"
@@ -9196,7 +9291,7 @@ msgid "Delete this appointment"
msgstr "Slett denne avtalen"
#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
msgid "Main toolbar"
msgstr "Hovedverktøylinje"
@@ -9252,12 +9347,11 @@ msgstr "H_andling"
#: ui/evolution-contact-list-editor.xml.h:12
#: ui/evolution-mail-messagedisplay.xml.h:10
#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:48
msgid "_File"
msgstr "_Fil"
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution-message-composer.xml.h:50
-#: ui/evolution.xml.h:53
+#: ui/evolution-comp-editor.xml.h:22 ui/evolution.xml.h:52
msgid "_Help"
msgstr "_Hjelp"
@@ -9303,7 +9397,7 @@ msgstr "Send _melding til kontakt..."
#: ui/evolution-contact-editor.xml.h:16
#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
msgid "_Save"
msgstr "_Lagre"
@@ -9356,7 +9450,7 @@ msgid "Schedule a meeting for this item"
msgstr "Sett opp møte for denne oppføringen"
#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:42
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:41
msgid "_Actions"
msgstr "H_andlinger"
@@ -9364,6 +9458,10 @@ msgstr "H_andlinger"
msgid "Customise My Evolution"
msgstr "Tilpass min Evolution"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Avbryt"
+
#: ui/evolution-mail-global.xml.h:2
msgid "Cancel the current mail operation"
msgstr "Avbryt aktiv e-postoperasjon"
@@ -9493,7 +9591,7 @@ msgstr "Lim inn melding fra utklippstavlen"
msgid "Permanently remove all deleted messages from this folder"
msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
msgid "Select _All"
msgstr "Velg _alle"
@@ -9537,7 +9635,7 @@ msgstr "Meldingsliste med tråder"
msgid "_Expunge"
msgstr "_Tøm"
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:49
msgid "_Folder"
msgstr "_Mappe"
@@ -9545,7 +9643,7 @@ msgstr "_Mappe"
msgid "_Invert Selection"
msgstr "Re_verser utvalg"
-#: ui/evolution-mail-list.xml.h:28 ui/evolution.xml.h:60
+#: ui/evolution-mail-list.xml.h:28 ui/evolution.xml.h:59
msgid "_Properties..."
msgstr "Egenska_per..."
@@ -9870,12 +9968,13 @@ msgid "Customize toolbars"
msgstr "Tilpass verktøylinjer"
#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44 ui/evolution.xml.h:44
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
msgid "_Close"
msgstr "L_ukk"
#: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:57 ui/evolution.xml.h:65
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:65
msgid "_View"
msgstr "_Vis"
@@ -10047,23 +10146,23 @@ msgstr "_Slett alle"
msgid "_From Field"
msgstr "_Fra-felt"
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:50
msgid "_Insert"
msgstr "Sett _inn"
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
msgid "_Insert text file..."
msgstr "Sett _inn tekstfil..."
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
msgid "_Open..."
msgstr "_Åpne..."
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:53
msgid "_Reply-To Field"
msgstr "Svar-til felt"
-#: ui/evolution-message-composer.xml.h:56
+#: ui/evolution-message-composer.xml.h:55
msgid "_Security"
msgstr "_Sikkerhet"
@@ -10071,27 +10170,27 @@ msgstr "_Sikkerhet"
msgid "Add folder to your list of subscribed folders"
msgstr "Legg til mappe på listen over abonnerte mapper"
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
msgid "F_older"
msgstr "M_appe"
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
msgid "Refresh List"
msgstr "Les listen på nytt"
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
msgid "Refresh List of Folders"
msgstr "Les mappelisten på nytt"
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
msgid "Remove folder from your list of subscribed folders"
msgstr "Fjern mappe fra din liste over abbonerte mapper"
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
msgid "Subscribe"
msgstr "Abonner"
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
msgid "Unsubscribe"
msgstr "Fjern abonnement"
@@ -10192,137 +10291,133 @@ msgid "Evolution _Window"
msgstr "Evolution vindu"
#: ui/evolution.xml.h:19
-msgid "Evolution bar _shortcut"
-msgstr "Evolution-linje _snarvei"
-
-#: ui/evolution.xml.h:20
msgid "Exit the program"
msgstr "Avslutt programmet"
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
msgid "Getting _Started"
msgstr "Kom _igang"
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
msgid "Import an external file format"
msgstr "Importer et eksternt filformat"
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
msgid "Move this folder to another place"
msgstr "Flytt denne mappen til et annet sted"
#: ui/evolution.xml.h:25
-msgid "Open in New Window"
-msgstr "Åpne i nytt vindu"
-
-#: ui/evolution.xml.h:26
msgid "Open in New _Window"
msgstr "Åpne i nytt _vindu"
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
msgid "Open this folder in an other window"
msgstr "Åpne denne mappen i et annet vindu"
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
msgid "Show information about Evolution"
msgstr "Vis informasjon om Evolution"
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
msgid "Submit Bug Report"
msgstr "Send inn feilrapport"
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
msgid "Submit _Bug Report"
msgstr "Sen_d inn feilrapport"
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:30
msgid "Submit bug report using Bug Buddy."
msgstr "Send inn feilrapport ved bruk av Bug Buddy."
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:31
msgid "Toggle"
msgstr "Bytt"
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:32
msgid "Toggle whether to show the folder bar"
msgstr "Slå av/på visning av mappelinjen"
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:33
msgid "Toggle whether to show the shortcut bar"
msgstr "Slå av/på visning av snarveilinjen"
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:34
msgid "Toggle whether we are working offline."
msgstr "Skift til \"offline\" arbeidsmodus."
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:35
msgid "Using the C_ontact Manager"
msgstr "Bruk av k_ontaktdatabasen"
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
msgid "Using the _Calendar"
msgstr "Bruk av _kalenderen"
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:37
msgid "Using the _Mailer"
msgstr "Bruk av e-_postprogrammet"
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:38
msgid "View the selected folder"
msgstr "Vis den valgte mappen"
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:39
msgid "Work Offline"
msgstr "Arbeid \"offline\""
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:40
msgid "_About Evolution..."
msgstr "_Om Evolution..."
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:42
msgid "_Appointment (FIXME)"
msgstr "_Avtale"
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
msgid "_Contact (FIXME)"
msgstr "_Kontakt"
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:45
msgid "_Copy..."
msgstr "_Kopier..."
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:50
msgid "_Folder Bar"
msgstr "_Mappelinje"
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:51
msgid "_Go to Folder..."
msgstr "_Gå til mappe..."
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:53
msgid "_Import file..."
msgstr "_Importer fil..."
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:54
msgid "_Index"
msgstr "_Indeks"
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:55
msgid "_Mail message"
msgstr "Send _melding"
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:56
msgid "_Move..."
msgstr "_Flytt..."
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:58
msgid "_New Folder"
msgstr "_Ny mappe"
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:60
msgid "_Rename..."
msgstr "_Gi nytt navn..."
+#: ui/evolution.xml.h:61
+msgid "_Shortcut"
+msgstr "_Snarvei"
+
#: ui/evolution.xml.h:62
msgid "_Shortcut Bar"
msgstr "_Snarveilinje"
@@ -10335,6 +10430,14 @@ msgstr "_Oppgave"
msgid "_Work Offline"
msgstr "Ar_beid \"offline\""
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr "Endre innstilingene for Min Evolution"
+
+#: ui/my-evolution.xml.h:4
+msgid "_My Evolution Settings..."
+msgstr "Innstillinger for _Min Evolution..."
+
#: views/addressbook/galview.xml.h:1
msgid "Address Cards"
msgstr "Adressekort"
@@ -10498,6 +10601,79 @@ msgstr "OK"
msgid "The time must be in the format: %s"
msgstr "Datoen må skrives inn på formatet: %s"
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr "Baltisk"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr "Sentral-europeisk"
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr "Kinesisk"
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr "Kyrillisk"
+
+#: widgets/misc/e-charset-picker.c:63
+msgid "Greek"
+msgstr "Gresk"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr "Japansk"
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr "Koreansk"
+
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
+msgstr "Tyrkisk"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr "Unicode"
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr "Vest-europeisk"
+
+#: widgets/misc/e-charset-picker.c:85
+msgid "Traditional"
+msgstr "Tradisjonell"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr "Forenklet"
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr "Ukrainsk"
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Ny"
+
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
+msgstr "Ukjent tegnsett: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr "Skriv inn tegnsett som skal brukes"
+
+#: widgets/misc/e-charset-picker.c:277
+msgid "Other..."
+msgstr "Andre..."
+
+#: widgets/misc/e-charset-picker.c:378
+msgid "Character Encoding"
+msgstr "Tegnkoding"
+
#: widgets/misc/e-clipped-label.c:112
msgid "..."
msgstr "..."
@@ -10567,6 +10743,66 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
+#~ msgid "="
+#~ msgstr "="
+
+#~ msgid "Find..."
+#~ msgstr "Finn..."
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Tidsavbrudd for alarm etter"
+
+#~ msgid "Audio Alarms"
+#~ msgstr "Lyd-alarmer"
+
+#~ msgid "Colors"
+#~ msgstr "Farger"
+
+#~ msgid "Display options"
+#~ msgstr "Vis alternativer"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Slå på utsetting for "
+
+#~ msgid "Highlight"
+#~ msgstr "Marker"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Oppføringer som går ut i dag:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Oppføringer som ikke har gått ut"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Oppføringer som ikke har gått ut:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Utgåtte oppføringer:"
+
+#~ msgid "Show"
+#~ msgstr "Vis"
+
+#~ msgid "TaskPad"
+#~ msgstr "Oppgaveblokk"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tid før den går ut"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Visuelle alarmer"
+
+#~ msgid "Work week"
+#~ msgstr "Arbeidsuke"
+
+#~ msgid "Activate"
+#~ msgstr "Aktiver"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Aktiver denne snarveien"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution-linje _snarvei"
+
#~ msgid "Clock Settings"
#~ msgstr "Innstillinger for klokke"
@@ -10808,9 +11044,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Default List"
#~ msgstr "Standard liste"
-#~ msgid "Character Picker Settings"
-#~ msgstr "Innstillinger for tegnvelger"
-
#~ msgid "Clipboard Applet"
#~ msgstr "Utklippstavle applet"
@@ -11207,9 +11440,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Bulgaria"
#~ msgstr "Bulgaria"
-#~ msgid "Caribic"
-#~ msgstr "Karibien"
-
#~ msgid "France"
#~ msgstr "Frankrike"
@@ -11303,9 +11533,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Hungarian"
#~ msgstr "Ungarsk"
-#~ msgid "Norwegian"
-#~ msgstr "Norsk"
-
#~ msgid "Polish"
#~ msgstr "Polsk"
@@ -11327,9 +11554,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Thai"
#~ msgstr "Thai"
-#~ msgid "Turkish"
-#~ msgstr "Tyrkisk"
-
#~ msgid "Wallon"
#~ msgstr "Wallon"
@@ -11583,9 +11807,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Update"
#~ msgstr "Oppdater"
-#~ msgid "GNOME Weather"
-#~ msgstr "GNOME Værmelding"
-
#~ msgid "Location:"
#~ msgstr "Plassering:"
@@ -11662,9 +11883,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ "Proxy-URL er ikke av formen http://vert:port/\n"
#~ "Egenskapene forblir uendret."
-#~ msgid "Regions"
-#~ msgstr "Regioner"
-
#~ msgid "GNOME Weather Properties"
#~ msgstr "Egenskaper for GNOME værmelding"
@@ -12126,9 +12344,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Buffers"
#~ msgstr "Buffere"
-#~ msgid "Free"
-#~ msgstr "Ledig"
-
#~ msgid "Used"
#~ msgstr "Brukt"
@@ -13299,9 +13514,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Update Calendar"
#~ msgstr "Oppdater kalender"
-#~ msgid "Cancel Meeting"
-#~ msgstr "Alys møte"
-
#~ msgid ""
#~ "Could not open signature file %s:\n"
#~ "%s"
@@ -13367,18 +13579,9 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "%A, %e %B %Y"
#~ msgstr "%A, %e %B %Y"
-#~ msgid "Appointments"
-#~ msgstr "Avtaler"
-
-#~ msgid "<b>Error loading calendar</b>"
-#~ msgstr "<b>Feil under lasting av kalender</b>"
-
#~ msgid "<b>Error loading calendar:<br>Method not supported"
#~ msgstr "<b>Feil under lasting av kalender:<br>Metoden er ikke støttet"
-#~ msgid "Show appointments"
-#~ msgstr "Vis avtaler"
-
#~ msgid "Schedule Meeting"
#~ msgstr "Sett opp møte"
@@ -13558,9 +13761,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Incomplete message written on pipe!"
#~ msgstr "Uferdig melding skrevet på rør!"
-#~ msgid "Mail Summary"
-#~ msgstr "E-post sammendrag"
-
#~ msgid "About this application"
#~ msgstr "Om denne applikasjonen"
@@ -14130,9 +14330,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Mail Configuration Druid"
#~ msgstr "E-post-konfigurasjonsdruide"
-#~ msgid "Optional"
-#~ msgstr "Valgfri"
-
#~ msgid "Plain Text"
#~ msgstr "Vanlig tekst"
@@ -14338,9 +14535,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Account Properties"
#~ msgstr "Egenskaper for konto"
-#~ msgid "E-Mail Address:"
-#~ msgstr "E-post adresse:"
-
#~ msgid "Include in \"Get Mail\" operations."
#~ msgstr "Ta med i \"Hent e-post\"-operasjoner."
@@ -14416,9 +14610,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Edit this appointment..."
#~ msgstr "Rediger denne avtalen..."
-#~ msgid "New"
-#~ msgstr "Ny"
-
#~ msgid "Saving changes to message..."
#~ msgstr "Lagre endringer i meldingen..."
@@ -14865,9 +15056,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "To-Do item that is not yet due:"
#~ msgstr "Oppgavelisteoppføring som ikke har gått ut ennå:"
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Oppgavelisteoppføring som går ut idag:"
-
#~ msgid "To-Do item that is overdue:"
#~ msgstr "Oppgavelisteoppføring som har gått ut:"
@@ -15170,9 +15358,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
#~ msgid "Day end:"
#~ msgstr "Dagens slutt:"
-#~ msgid "Colors for display"
-#~ msgstr "Farger i visning"
-
#~ msgid "Show on TODO List:"
#~ msgstr "Vis på oppgavelisten:"