aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/ChangeLog5
-rw-r--r--po/nb.po1098
-rw-r--r--po/no.po1098
3 files changed, 1199 insertions, 1002 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index de19eb66dd..2448efff28 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-13 Kjartan Maraas <kmaraas@gnome.org>
+
+ * nb.po: Updated Norwegian bokmål translation.
+ * no.po: Same.
+
2006-02-01 Ankit Patel <ankit644@yahoo.com>
* gu.po: Updated Gujarati Translation.
diff --git a/po/nb.po b/po/nb.po
index 0219dcc15d..e35946b117 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: evolution 2.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-30 14:14+0100\n"
-"PO-Revision-Date: 2006-01-30 14:23+0100\n"
+"POT-Creation-Date: 2006-02-13 00:26+0100\n"
+"PO-Revision-Date: 2006-02-13 00:35+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
"MIME-Version: 1.0\n"
@@ -535,30 +535,30 @@ msgstr "Konfigurer automatisk fullføring her"
#. Create the contacts group
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../addressbook/gui/component/addressbook-view.c:1334
#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:626
+#: ../plugins/exchange-operations/exchange-folder.c:585
msgid "Contacts"
msgstr "Kontakter"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
+msgid "Evolution Address Book"
msgstr "Evolution adressebok"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
+msgid "Evolution Address Book address pop-up"
msgstr "Evolution adressebok adressedialog"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
+msgid "Evolution Address Book address viewer"
msgstr "Evolution adressebok adressevisning"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
+msgid "Evolution Address Book card viewer"
msgstr "Evolution adressebok kortvisning"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
+msgid "Evolution Address Book component"
msgstr "Evolution adressebok-komponent"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
@@ -598,8 +598,7 @@ msgstr "På denne datamaskinen"
#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1054 ../mail/mail-config.c:87
-#: ../mail/mail-config.glade.h:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
msgid "Personal"
msgstr "Personlig"
@@ -639,7 +638,7 @@ msgid "Create a new address book"
msgstr "Opprett en ny adressebok"
#: ../addressbook/gui/component/addressbook-component.c:382
-msgid "Failed upgrading Addressbook settings or folders."
+msgid "Failed upgrading Address Book settings or folders."
msgstr "Feil under oppgradering av innstillinger eller mapper for adressebok."
#: ../addressbook/gui/component/addressbook-config.c:329
@@ -663,13 +662,15 @@ msgstr "Kopier innholdet i adresseboken lokalt for frakoblet operasjon"
#: ../calendar/gui/dialogs/calendar-setup.c:380
#: ../calendar/gui/dialogs/calendar-setup.c:391
#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "Generelt"
#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
#: ../mail/importers/pine-importer.c:392
-msgid "Addressbook"
+msgid "Address Book"
msgstr "Adressebok"
#: ../addressbook/gui/component/addressbook-config.c:986
@@ -760,36 +761,36 @@ msgstr ""
"\n"
"Vennligst vent mens Evolution migrerer dine mapper..."
-#: ../addressbook/gui/component/addressbook-view.c:435
+#: ../addressbook/gui/component/addressbook-view.c:434
#: ../mail/em-folder-utils.c:503
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "Endre navn på mappen «%s» til:"
-#: ../addressbook/gui/component/addressbook-view.c:438
+#: ../addressbook/gui/component/addressbook-view.c:437
#: ../mail/em-folder-utils.c:505
msgid "Rename Folder"
msgstr "Gi nytt navn på mappe"
-#: ../addressbook/gui/component/addressbook-view.c:443
+#: ../addressbook/gui/component/addressbook-view.c:442
#: ../mail/em-folder-utils.c:511
msgid "Folder names cannot contain '/'"
msgstr "Mappenavn kan ikke inneholde tegnet «/»"
-#: ../addressbook/gui/component/addressbook-view.c:446
+#: ../addressbook/gui/component/addressbook-view.c:445
msgid "A Folder with this name already exists"
msgstr "En mappe med dette navnet eksisterer allerede"
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:953
msgid "_New Address Book"
msgstr "_Ny adressebok"
#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:955
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
#: ../calendar/gui/calendar-component.c:538
#: ../calendar/gui/e-calendar-table.c:1194
-#: ../calendar/gui/e-calendar-view.c:1625 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:30
@@ -797,17 +798,17 @@ msgstr "_Ny adressebok"
msgid "_Delete"
msgstr "_Slett"
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:956
msgid "Save As Vcard..."
msgstr "Lagre som VCard..."
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:958
#: ../calendar/gui/calendar-component.c:539
#: ../calendar/gui/tasks-component.c:444
msgid "_Properties..."
msgstr "E_genskaper ..."
-#: ../addressbook/gui/component/addressbook-view.c:1346
+#: ../addressbook/gui/component/addressbook-view.c:1345
msgid "Contact Source Selector"
msgstr "Valg av kontaktkilde"
@@ -924,7 +925,7 @@ msgid "Add Address Book"
msgstr "Legg til adressebok"
#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:767
+#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:769
msgid "Always"
msgstr "Alltid"
@@ -959,7 +960,7 @@ msgid "Lo_gin:"
msgstr "Lo_gin"
#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:766
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:768
msgid "Never"
msgstr "Aldri"
@@ -1030,7 +1031,7 @@ msgstr "Støttede søkebaser"
#: ../addressbook/gui/component/ldap-config.glade.h:36
msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
+"The search base is the distinguished name (DN) of the entry where your "
"searches will begin. If you leave this blank, the search will begin at the "
"root of the directory tree."
msgstr ""
@@ -1129,7 +1130,6 @@ msgid "_Name:"
msgstr "_Navn:"
#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
msgid "_Port:"
msgstr "_Port:"
@@ -1157,13 +1157,13 @@ msgstr "kort"
#: ../addressbook/gui/component/ldap-config.glade.h:57
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/alarm-notify/util.c:67
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:1987
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
+#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:1989
#: ../plugins/calendar-http/calendar-http.c:286
#: ../plugins/calendar-weather/calendar-weather.c:563
msgid "minutes"
@@ -1288,7 +1288,7 @@ msgstr "Telefon"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
-#: ../mail/mail-config.c:86 ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:154
msgid "Work"
msgstr "Arbeid"
@@ -2398,7 +2398,7 @@ msgstr "Zimbabwe"
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
#: ../plugins/exchange-operations/exchange-delegates.c:934
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
#: ../plugins/plugin-manager/plugin-manager.c:42
#: ../plugins/save-attachments/save-attachments.c:369
#: ../widgets/menus/gal-view-new-dialog.c:73
@@ -2495,15 +2495,15 @@ msgstr "Endret"
msgid "Contact Editor - %s"
msgstr "Kontaktredigering - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2757
msgid "Please select an image for this contact"
msgstr "Vennligst velg et bilde for denne kontakten"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2736
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2758
msgid "No image"
msgstr "Uten bilde"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3015
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3042
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2511,7 +2511,7 @@ msgstr ""
"Kontaktdata er ugyldig:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3067
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
msgid "Invalid contact."
msgstr "Ugyldig kontakt."
@@ -2669,7 +2669,7 @@ msgstr "_IM-tjeneste:"
#: ../addressbook/gui/contact-editor/im.glade.h:5
#: ../plugins/calendar-weather/calendar-weather.c:409
#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:216
+#: ../plugins/exchange-operations/exchange-contacts.c:222
msgid "_Location:"
msgstr "_Lokasjon:"
@@ -2717,7 +2717,7 @@ msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
#: ../addressbook/gui/widgets/e-addressbook-model.c:296
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
#: ../addressbook/gui/widgets/e-minicard-view.c:506
msgid "Book"
@@ -2772,32 +2772,26 @@ msgstr ""
"Navnet eller e-post adressen for denne kontakten eksisterer allerede\n"
"i denne mappen. Vil du legge den til likevel?"
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:165
-#: ../widgets/misc/e-filter-bar.c:163
-msgid "Advanced Search"
-msgstr "Avansert søk"
-
#. We attach subitems below
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
#: ../calendar/gui/cal-search-bar.c:53
msgid "Any field contains"
msgstr "Et felt inneholder"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
#: ../calendar/gui/cal-search-bar.c:50
msgid "Category is"
msgstr "Kategorien er"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
msgid "Email begins with"
msgstr "E-post begynner med"
#: ../addressbook/gui/widgets/addresstypes.xml.h:4
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
msgid "Name begins with"
msgstr "Navn begynner med"
@@ -2814,7 +2808,7 @@ msgstr[1] "%d kontakter"
#: ../addressbook/gui/widgets/e-addressbook-model.c:303
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
#: ../addressbook/gui/widgets/e-minicard-view.c:513
msgid "Query"
@@ -2838,11 +2832,11 @@ msgstr "Modell"
msgid "Error modifying card"
msgstr "Feil ved endring av kort"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
msgid "Source"
msgstr "Kilde"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:245
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
#: ../calendar/gui/e-calendar-table.etspec.h:13
#: ../calendar/gui/e-meeting-list-view.c:480
@@ -2851,78 +2845,74 @@ msgstr "Kilde"
msgid "Type"
msgstr "Type"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:564
-msgid "Address Book"
-msgstr "Adressebok"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:835
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2069
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2068
#: ../ui/evolution-addressbook.xml.h:31
msgid "Save as VCard..."
msgstr "Lagre som VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
-#: ../calendar/gui/dialogs/comp-editor.c:1084
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1086
#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "_Åpne"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
msgid "_New Contact..."
msgstr "_Ny kontakt..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:961
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
msgid "New Contact _List..."
msgstr "Ny kontakt_liste..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
msgid "_Save as VCard..."
msgstr "Lagre _som VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
msgid "_Forward Contact"
msgstr "_Videresend kontakt"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
msgid "_Forward Contacts"
msgstr "_Videresend kontakter"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
msgid "Send _Message to Contact"
msgstr "Send _melding til kontakt"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
msgid "Send _Message to List"
msgstr "Send _melding til liste"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
msgid "Send _Message to Contacts"
msgstr "Send _melding til kontakter"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
msgid "_Print"
msgstr "_Skriv ut"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
msgid "Cop_y to Address Book..."
msgstr "_Kopier til adressebok..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
msgid "Mo_ve to Address Book..."
msgstr "_Flytt til adressebok..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
msgid "Cu_t"
msgstr "Klipp u_t"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
#: ../calendar/gui/calendar-component.c:537
#: ../calendar/gui/dialogs/comp-editor.c:445
#: ../calendar/gui/e-calendar-table.c:1182
-#: ../calendar/gui/e-calendar-view.c:1610 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
@@ -2932,18 +2922,18 @@ msgstr "Klipp u_t"
msgid "_Copy"
msgstr "_Kopier"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
msgid "P_aste"
msgstr "_Lim inn"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1602
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
#: ../calendar/gui/cal-search-bar.c:343
msgid "Any Category"
msgstr "Enhver kategori"
#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1804
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1803
msgid "Print cards"
msgstr "Skriv ut kontakter"
@@ -3084,7 +3074,7 @@ msgstr "Radio"
#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
#: ../calendar/gui/e-meeting-list-view.c:491
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
msgid "Role"
msgstr "Rolle"
@@ -3362,7 +3352,7 @@ msgstr "Kunne ikke avbryte"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
#: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/comp-editor-factory.c:434
+#: ../calendar/gui/comp-editor-factory.c:433
msgid "Authentication Failed"
msgstr "Autentisering feilet"
@@ -3840,7 +3830,7 @@ msgstr "Skyggelegging"
#: ../addressbook/printing/e-contact-print.glade.h:36
#: ../plugins/exchange-operations/exchange-account-setup.c:955
#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:199
+#: ../plugins/exchange-operations/exchange-contacts.c:205
msgid "Size:"
msgstr "Størrelse:"
@@ -4334,7 +4324,7 @@ msgid "_Save Changes"
msgstr "_Lagre endringer"
#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
msgid "_Send"
msgstr "_Send"
@@ -4390,7 +4380,7 @@ msgid "Could not write pilot's ToDo application block"
msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for oppgaveliste"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:1968
+#: ../plugins/itip-formatter/itip-formatter.c:1969
msgid "Calendar and Tasks"
msgstr "Kalender og oppgaver"
@@ -4436,18 +4426,19 @@ msgid "Memo_s"
msgstr "_Notater"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1084 ../calendar/gui/memos-component.c:530
-#: ../calendar/gui/memos-component.c:997 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
msgid "Memos"
msgstr "Notater"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1329 ../calendar/gui/print.c:1828
-#: ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:472
#: ../calendar/importers/icalendar-importer.c:80
#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:632
+#: ../plugins/exchange-operations/exchange-folder.c:591
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4468,9 +4459,9 @@ msgid "Evolution Calendar alarm notification service"
msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
+#: ../calendar/gui/misc.c:114
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minutt"
@@ -4499,8 +4490,8 @@ msgstr "Avtaler"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1266
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1272
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
#: ../calendar/gui/e-itip-control.c:1113
#: ../plugins/itip-formatter/itip-view.c:880
msgid "Location:"
@@ -4511,10 +4502,10 @@ msgid "Snooze _time:"
msgstr "Utsett-_tid:"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:39
#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
@@ -4533,32 +4524,32 @@ msgstr "Ut_sett"
msgid "location of appointment"
msgstr "lokasjon for avtalen"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1105
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1248
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
msgid "No summary available."
msgstr "Sammendrag er ikke tilgjengelig."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1114
#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
msgid "No description available."
msgstr "Ingen beskrivelse tilgjengelig."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1124
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
msgid "No location information available."
msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1182
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
#, c-format
msgid "You have %d alarms"
msgstr "Du har %d alarmer"
#. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1342
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1366
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
msgid "Warning"
msgstr "Advarsel"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1346
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4570,7 +4561,7 @@ msgstr ""
"å sende e-post. Evolution vil vise en vanlig dialog\n"
"for påminnelse i stedet."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1372
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4587,7 +4578,7 @@ msgstr ""
"\n"
"Er du sikker på at du ønsker å kjøre dette programmet?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1386
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
msgid "Do not ask me about this program again."
msgstr "Ikke spør meg om dette programmet igjen."
@@ -4609,52 +4600,58 @@ msgstr "ugyldig tid"
msgid "(%ld seconds)"
msgstr "%ld sekunder"
-#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
#, c-format
msgid "(%d %s %d %s)"
msgstr "(%d %s %d %s)"
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/dialogs/recurrence-page.c:987 ../calendar/gui/misc.c:111
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
msgid "second"
msgstr "sekund"
-#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
msgid "seconds"
msgstr " sekunder"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
#, c-format
msgid "(%d %s)"
msgstr "(%d %s)"
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
+#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
#, c-format
msgid " %u second"
msgstr "%u sekund"
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
+#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
#, c-format
msgid " %u seconds"
msgstr "%u sekunder"
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
#, c-format
msgid " %u minute"
msgstr "%u minutt"
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
#, c-format
msgid " %u minutes"
msgstr "%u minutt"
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
#, c-format
msgid "%u hour"
msgstr "%u time"
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
#, c-format
msgid "%u hours"
msgstr "%u timer"
@@ -5072,7 +5069,7 @@ msgstr "Skriv ut"
#: ../calendar/gui/calendar-component.c:709
#: ../calendar/gui/dialogs/calendar-setup.c:370
#: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:620
+#: ../plugins/exchange-operations/exchange-folder.c:579
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
@@ -5210,19 +5207,19 @@ msgstr "Ukevisning"
msgid "Month View"
msgstr "Månedsvisning"
-#: ../calendar/gui/comp-editor-factory.c:416
+#: ../calendar/gui/comp-editor-factory.c:415
msgid "Error while opening the calendar"
msgstr "Feil under åpning av kalenderen"
-#: ../calendar/gui/comp-editor-factory.c:422
+#: ../calendar/gui/comp-editor-factory.c:421
msgid "Method not supported when opening the calendar"
msgstr "Metoden er ikke støttet under åpning av kalender"
-#: ../calendar/gui/comp-editor-factory.c:428
+#: ../calendar/gui/comp-editor-factory.c:427
msgid "Permission denied to open the calendar"
msgstr "Tilgang nektet ved åpning av kalender"
-#: ../calendar/gui/comp-editor-factory.c:440 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
msgid "Unknown error"
msgstr "Ukjent feil"
@@ -5306,8 +5303,10 @@ msgstr "etter"
msgid "before"
msgstr "før"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
msgid "day(s)"
msgstr "dag(er)"
@@ -5342,7 +5341,7 @@ msgstr "Le_gg til"
#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
#: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:1
msgid "Alarms"
msgstr "Varsel"
@@ -5423,7 +5422,6 @@ msgstr "<span weight=\"bold\">Forvalgt ledig/opptatt-tjener</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
#: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
#: ../plugins/publish-calendar/publish-calendar.glade.h:1
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">Generelt</span>"
@@ -5455,7 +5453,7 @@ msgid "Free/Busy"
msgstr "Ledig/opptatt"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
#: ../calendar/gui/e-itip-control.c:730
msgid "Friday"
msgstr "Fredag"
@@ -5471,7 +5469,7 @@ msgstr ""
"Dager"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/recurrence-page.c:1042
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
#: ../calendar/gui/e-itip-control.c:726
msgid "Monday"
msgstr "Mandag"
@@ -5505,7 +5503,7 @@ msgid "S_un"
msgstr "S_ø."
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
#: ../calendar/gui/e-itip-control.c:731
msgid "Saturday"
msgstr "Lørdag"
@@ -5523,7 +5521,7 @@ msgid "Show week _numbers in date navigator"
msgstr "Vis uke_nummer i datonavigasjon"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
#: ../calendar/gui/e-itip-control.c:725
msgid "Sunday"
msgstr "Søndag"
@@ -5541,7 +5539,7 @@ msgid "Template:"
msgstr "Mal:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
#: ../calendar/gui/e-itip-control.c:729
msgid "Thursday"
msgstr "Torsdag"
@@ -5556,13 +5554,13 @@ msgid "Time format:"
msgstr "Tidformat:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1081
#: ../calendar/gui/e-itip-control.c:727
msgid "Tuesday"
msgstr "Tirsdag"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
#: ../calendar/gui/e-itip-control.c:728
msgid "Wednesday"
msgstr "Onsdag"
@@ -5820,17 +5818,17 @@ msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> vedlegg"
msgstr[1] "<b>%d</b> vedlegg"
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:975
msgid "Hide Attachment _Bar"
msgstr "Skjul ve_dleggsfelt"
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:978
#: ../calendar/gui/dialogs/comp-editor.c:1442
msgid "Show Attachment _Bar"
msgstr "Vis ve_dleggsfelt"
-#: ../calendar/gui/dialogs/comp-editor.c:1085
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/comp-editor.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1897
#: ../calendar/gui/dialogs/meeting-page.c:899
#: ../calendar/gui/dialogs/task-page.c:1202
#: ../composer/e-msg-composer-attachment-bar.c:470
@@ -5841,78 +5839,83 @@ msgstr "Vis ve_dleggsfelt"
msgid "_Remove"
msgstr "Fje_rn"
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
#: ../composer/e-msg-composer-attachment-bar.c:471
#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
msgid "_Properties"
msgstr "Egenska_per..."
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
#: ../composer/e-msg-composer-attachment-bar.c:473
#: ../composer/e-msg-composer.c:3600
msgid "_Add attachment..."
msgstr "_Legg til vedlegg..."
#: ../calendar/gui/dialogs/comp-editor.c:1466
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr "Vedleggsknapp: Trykk mellomrom for å aktivere vedleggsfeltet"
+#: ../mail/em-format-html-display.c:2063
+msgid "Show Attachments"
+msgstr "Vis vedlegg"
-#: ../calendar/gui/dialogs/comp-editor.c:2073
-#: ../calendar/gui/dialogs/comp-editor.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1467
+msgid "Press space key to toggle attachment bar"
+msgstr "Trykk mellomrom for å slå av/på vedleggsfeltet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2074
+#: ../calendar/gui/dialogs/comp-editor.c:2117
msgid "Edit Appointment"
msgstr "Rediger avtale"
-#: ../calendar/gui/dialogs/comp-editor.c:2079
-#: ../calendar/gui/dialogs/comp-editor.c:2122
+#: ../calendar/gui/dialogs/comp-editor.c:2080
+#: ../calendar/gui/dialogs/comp-editor.c:2123
#, c-format
msgid "Meeting - %s"
msgstr "Møte- %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2081
-#: ../calendar/gui/dialogs/comp-editor.c:2124
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
#, c-format
msgid "Appointment - %s"
msgstr "Avtale - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2085
-#: ../calendar/gui/dialogs/comp-editor.c:2128
+#: ../calendar/gui/dialogs/comp-editor.c:2086
+#: ../calendar/gui/dialogs/comp-editor.c:2129
#, c-format
msgid "Assigned Task - %s"
msgstr "Tildelt oppgave - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2087
-#: ../calendar/gui/dialogs/comp-editor.c:2130
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
#, c-format
msgid "Task - %s"
msgstr "Oppgave - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/dialogs/comp-editor.c:2133
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/comp-editor.c:2134
#, c-format
msgid "Journal entry - %s"
msgstr "Journaloppføring - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2101
-#: ../calendar/gui/dialogs/comp-editor.c:2143
+#: ../calendar/gui/dialogs/comp-editor.c:2102
+#: ../calendar/gui/dialogs/comp-editor.c:2144
msgid "No summary"
msgstr "Ingen sammendrag"
-#: ../calendar/gui/dialogs/comp-editor.c:2651
+#: ../calendar/gui/dialogs/comp-editor.c:2652
#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
msgid "attachment"
msgstr "vedlegg"
-#: ../calendar/gui/dialogs/comp-editor.c:2740
-#: ../calendar/gui/dialogs/comp-editor.c:2794
-#: ../calendar/gui/dialogs/comp-editor.c:2818
+#: ../calendar/gui/dialogs/comp-editor.c:2741
+#: ../calendar/gui/dialogs/comp-editor.c:2795
+#: ../calendar/gui/dialogs/comp-editor.c:2819
msgid "Changes made to this item may be discarded if an update arrives"
msgstr ""
"Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
"enoppdatering"
-#: ../calendar/gui/dialogs/comp-editor.c:2842
+#: ../calendar/gui/dialogs/comp-editor.c:2843
msgid "Unable to use current version!"
msgstr "Kan ikke bruke denne versjonen!"
@@ -5999,106 +6002,106 @@ msgid "Recurrence"
msgstr "Gjeninntreffelse"
#: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:2717
msgid "This event has alarms"
msgstr "Denne hendelsen har varsel"
-#: ../calendar/gui/dialogs/event-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:875
#: ../calendar/gui/dialogs/event-page.glade.h:7
msgid "Cale_ndar:"
msgstr "Kale_nder:"
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:881
#: ../calendar/gui/dialogs/event-page.glade.h:13
#: ../calendar/gui/dialogs/meeting-page.glade.h:5
#: ../calendar/gui/dialogs/task-page.c:446
msgid "Or_ganizer:"
msgstr "Or_ganisator:"
-#: ../calendar/gui/dialogs/event-page.c:917
+#: ../calendar/gui/dialogs/event-page.c:919
msgid "_Delegatees"
msgstr "_Delegater"
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:921
msgid "Atte_ndees"
msgstr "De_ltakere"
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1089
msgid "Event with no start date"
msgstr "Hendelse uten startdato"
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1092
msgid "Event with no end date"
msgstr "Hendelse uten sluttdato"
-#: ../calendar/gui/dialogs/event-page.c:1258
+#: ../calendar/gui/dialogs/event-page.c:1260
#: ../calendar/gui/dialogs/task-page.c:852
msgid "Start date is wrong"
msgstr "Startdato er feil"
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1270
msgid "End date is wrong"
msgstr "Sluttdato er feil"
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1293
msgid "Start time is wrong"
msgstr "Tid for start er feil"
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1300
msgid "End time is wrong"
msgstr "Tid for slutt er feil"
-#: ../calendar/gui/dialogs/event-page.c:1453
+#: ../calendar/gui/dialogs/event-page.c:1455
#: ../calendar/gui/dialogs/meeting-page.c:469
#: ../calendar/gui/dialogs/task-page.c:909
msgid "The organizer selected no longer has an account."
msgstr "Valgt organisator har ingen konto lenger."
-#: ../calendar/gui/dialogs/event-page.c:1459
+#: ../calendar/gui/dialogs/event-page.c:1461
#: ../calendar/gui/dialogs/meeting-page.c:475
#: ../calendar/gui/dialogs/task-page.c:915
msgid "An organizer is required."
msgstr "En organisator kreves."
-#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/event-page.c:1476
#: ../calendar/gui/dialogs/meeting-page.c:490
#: ../calendar/gui/dialogs/task-page.c:930
msgid "At least one attendee is required."
msgstr "Minst en deltaker kreves."
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1898
#: ../calendar/gui/dialogs/meeting-page.c:900
#: ../calendar/gui/dialogs/task-page.c:1203
msgid "_Add "
msgstr "_Legg til"
-#: ../calendar/gui/dialogs/event-page.c:2622
+#: ../calendar/gui/dialogs/event-page.c:2624
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "Kunne ikke åpne kalender «%s»."
-#: ../calendar/gui/dialogs/event-page.c:2917
+#: ../calendar/gui/dialogs/event-page.c:2920
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "%d dag før avtalen"
msgstr[1] "%d dager før avtalen"
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2928
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "%d time før avtalen"
msgstr[1] "%d timer før avtalen"
-#: ../calendar/gui/dialogs/event-page.c:2933
+#: ../calendar/gui/dialogs/event-page.c:2936
#, c-format
msgid "%d minute before appointement"
msgid_plural "%d minutes before appointment"
msgstr[0] "%d minutt før avtalen"
msgstr[1] "%d minutter før avtalen"
-#: ../calendar/gui/dialogs/event-page.c:2949
+#: ../calendar/gui/dialogs/event-page.c:2952
msgid "Customize"
msgstr "Tilpass"
@@ -6107,14 +6110,14 @@ msgstr "Tilpass"
#. When "None" is selected we want the field to be cleared.
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
-#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/event-page.c:2957
#: ../calendar/gui/dialogs/meeting-page.c:321
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
#: ../calendar/gui/e-cal-model-tasks.c:649
#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
-#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:691
-#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:468
-#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:693
+#: ../mail/em-account-editor.c:1358 ../mail/em-account-prefs.c:475
+#: ../mail/em-junk-hook.c:78
#: ../plugins/calendar-weather/calendar-weather.c:370
#: ../plugins/calendar-weather/calendar-weather.c:424
#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
@@ -6126,17 +6129,17 @@ msgid "None"
msgstr "Ingen"
#: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid "1 day before appointment"
+msgstr "1 dag før avtalen"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:2
msgid "1 hour before appointment"
msgstr "en time før avtalen"
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:3
msgid "15 minutes before appointment"
msgstr "femten minutter før avtalen"
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "1 dag før avtalen"
-
#: ../calendar/gui/dialogs/event-page.glade.h:5
#: ../calendar/gui/dialogs/task-page.glade.h:1
msgid "Atte_ndees..."
@@ -6177,13 +6180,17 @@ msgstr "_Varsel"
msgid "_Time:"
msgstr "_Tid:"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
msgid "for"
msgstr "for"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
#: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
msgid "until"
msgstr "til"
@@ -6363,43 +6370,90 @@ msgstr ""
msgid "Recurrence date is invalid"
msgstr "Gjenintreffingsdato er ugyldig"
-#: ../calendar/gui/dialogs/recurrence-page.c:926
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:928
msgid "on"
msgstr "på"
-#: ../calendar/gui/dialogs/recurrence-page.c:986
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:992
msgid "first"
msgstr "første"
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
msgid "third"
msgstr "tredje"
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
msgid "fourth"
msgstr "fjerde"
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
msgid "last"
msgstr "siste"
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
msgid "Other Date"
msgstr "Annen dato"
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+msgid "1st to 10th"
+msgstr "Første til tiende"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
+msgid "11th to 20th"
+msgstr "ellevte til tjuende"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
+msgid "21st to 31st"
+msgstr "tjueførste til trettiførste"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
msgid "day"
msgstr "dag"
-#: ../calendar/gui/dialogs/recurrence-page.c:1178
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1219
msgid "on the"
msgstr "den"
-#: ../calendar/gui/dialogs/recurrence-page.c:1367
+#: ../calendar/gui/dialogs/recurrence-page.c:1408
msgid "occurrences"
msgstr "gjentakelser"
-#: ../calendar/gui/dialogs/recurrence-page.c:2336
+#: ../calendar/gui/dialogs/recurrence-page.c:2377
msgid "Date/Time"
msgstr "Dato/klokkeslett"
@@ -6416,27 +6470,37 @@ msgstr "<b>Forhåndsvis</b>"
msgid "<b>Recurrence</b>"
msgstr "<b>Gjeninntreffelse</b>"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
msgid "Every"
msgstr "Hver"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
msgid "This appointment rec_urs"
msgstr "Denne avtalen _gjeninntreffer"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
msgid "forever"
msgstr "for alltid"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
msgid "month(s)"
msgstr "måned(er)"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
msgid "week(s)"
msgstr "uke(r)"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
msgid "year(s)"
msgstr "år"
@@ -6531,12 +6595,12 @@ msgstr "_Prioritet:"
msgid "_Web Page:"
msgstr "_Nettside:"
-#: ../calendar/gui/dialogs/task-editor.c:420
+#: ../calendar/gui/dialogs/task-editor.c:426
#: ../calendar/gui/tasks-component.c:1171
msgid "_Task"
msgstr "_Oppgave"
-#: ../calendar/gui/dialogs/task-editor.c:424
+#: ../calendar/gui/dialogs/task-editor.c:430
msgid "Task Details"
msgstr "Oppgavedetaljer"
@@ -6594,7 +6658,7 @@ msgid "_Manual"
msgstr "_Manuell"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
msgid "_Password:"
msgstr "_Passord:"
@@ -6863,7 +6927,7 @@ msgid "untitled_image.%s"
msgstr "bilde_uten_navn.%s"
#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1604 ../calendar/gui/e-memo-table.c:854
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
msgid "_Save As..."
msgstr "Lagre _som..."
@@ -6926,10 +6990,6 @@ msgstr "90%"
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:525
-msgid "Task Table"
-msgstr "Oppgavetabell"
-
#: ../calendar/gui/e-calendar-table.c:703
#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
msgid "Deleting selected objects"
@@ -6951,8 +7011,8 @@ msgid "Open _Web Page"
msgstr "_Åpne nettside"
#: ../calendar/gui/e-calendar-table.c:1177
-#: ../calendar/gui/e-calendar-view.c:1589
-#: ../calendar/gui/e-calendar-view.c:1605 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
#: ../mail/em-folder-view.c:1088
#: ../plugins/print-message/org-gnome-print-message.xml.h:3
#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:42
@@ -6962,15 +7022,15 @@ msgid "_Print..."
msgstr "S_kriv ut..."
#: ../calendar/gui/e-calendar-table.c:1181
-#: ../calendar/gui/e-calendar-view.c:1609 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "Kli_pp ut"
#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1592
-#: ../calendar/gui/e-calendar-view.c:1611 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:41
#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
@@ -7041,97 +7101,97 @@ msgstr "Flytter oppføringer"
msgid "Copying items"
msgstr "Kopierer oppføringer"
-#: ../calendar/gui/e-calendar-view.c:1583
+#: ../calendar/gui/e-calendar-view.c:1575
msgid "New _Appointment..."
msgstr "Ny _avtale..."
-#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1576
msgid "New All Day _Event"
msgstr "Ny avtale som varer h_ele dagen"
-#: ../calendar/gui/e-calendar-view.c:1585
+#: ../calendar/gui/e-calendar-view.c:1577
msgid "New _Meeting"
msgstr "Nytt _møte"
-#: ../calendar/gui/e-calendar-view.c:1586
+#: ../calendar/gui/e-calendar-view.c:1578
msgid "New _Task"
msgstr "Ny _oppgave"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1596
+#: ../calendar/gui/e-calendar-view.c:1588
msgid "_Current View"
msgstr "_Aktiv visning"
-#: ../calendar/gui/e-calendar-view.c:1598
+#: ../calendar/gui/e-calendar-view.c:1590
msgid "Select T_oday"
msgstr "Velg i_dag"
-#: ../calendar/gui/e-calendar-view.c:1599
+#: ../calendar/gui/e-calendar-view.c:1591
msgid "_Select Date..."
msgstr "_Velg dato..."
-#: ../calendar/gui/e-calendar-view.c:1615
+#: ../calendar/gui/e-calendar-view.c:1607
msgid "Cop_y to Calendar..."
msgstr "Kop_ier til kalender..."
-#: ../calendar/gui/e-calendar-view.c:1616
+#: ../calendar/gui/e-calendar-view.c:1608
msgid "Mo_ve to Calendar..."
msgstr "Fl_ytt til kalender..."
-#: ../calendar/gui/e-calendar-view.c:1617
+#: ../calendar/gui/e-calendar-view.c:1609
msgid "_Delegate Meeting..."
msgstr "_Deleger møte..."
-#: ../calendar/gui/e-calendar-view.c:1618
+#: ../calendar/gui/e-calendar-view.c:1610
msgid "_Schedule Meeting..."
msgstr "_Sett opp møte..."
-#: ../calendar/gui/e-calendar-view.c:1619
+#: ../calendar/gui/e-calendar-view.c:1611
msgid "_Forward as iCalendar..."
msgstr "_Videresend som iCalendar..."
-#: ../calendar/gui/e-calendar-view.c:1620
+#: ../calendar/gui/e-calendar-view.c:1612
msgid "_Reply"
msgstr "Sva_r"
-#: ../calendar/gui/e-calendar-view.c:1621 ../mail/em-folder-view.c:1082
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _All"
msgstr "Svar til _alle"
-#: ../calendar/gui/e-calendar-view.c:1626
+#: ../calendar/gui/e-calendar-view.c:1618
msgid "Make this Occurrence _Movable"
msgstr "Gjør denne hendelsen _flyttbar"
-#: ../calendar/gui/e-calendar-view.c:1627
+#: ../calendar/gui/e-calendar-view.c:1619
msgid "Delete this _Occurrence"
msgstr "Slett denne _hendelsen"
-#: ../calendar/gui/e-calendar-view.c:1628
+#: ../calendar/gui/e-calendar-view.c:1620
msgid "Delete _All Occurrences"
msgstr "Slett _alle hendelser"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2038
+#: ../calendar/gui/e-calendar-view.c:2030
#, c-format
msgid "Organizer: %s <%s>"
msgstr "Organisator: %s <%s>"
#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2042
+#: ../calendar/gui/e-calendar-view.c:2034
#, c-format
msgid "Organizer: %s"
msgstr "Organisator: %s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2057 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2049 ../calendar/gui/print.c:2336
#, c-format
msgid "Location: %s"
msgstr "Plassering: %s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2088
+#: ../calendar/gui/e-calendar-view.c:2080
#, c-format
msgid "Time: %s %s"
msgstr "Tidspunkt: %s %s"
@@ -7730,15 +7790,15 @@ msgstr "%d.%m.%Y"
#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
msgid "Out of Office"
-msgstr "Ute"
+msgstr "Borte fra kontoret"
#: ../calendar/gui/e-meeting-time-sel.c:413
msgid "No Information"
msgstr "Ingen informasjon"
#: ../calendar/gui/e-meeting-time-sel.c:427
-msgid "Con_tacts..."
-msgstr "Kon_takter..."
+msgid "A_ttendees..."
+msgstr "Del_takere..."
#: ../calendar/gui/e-meeting-time-sel.c:444
msgid "O_ptions"
@@ -7792,10 +7852,6 @@ msgstr "_Start-tid:"
msgid "_End time:"
msgstr "S_lutt-tid:"
-#: ../calendar/gui/e-memo-table.c:274
-msgid "Memo Table"
-msgstr "Notat-tabell"
-
#: ../calendar/gui/e-memo-table.c:870
msgid "_Delete Selected Memos"
msgstr "Sle_tt valgte notater"
@@ -7854,8 +7910,8 @@ msgid "Expunging"
msgstr "Tømmer"
#: ../calendar/gui/e-timezone-entry.c:133
-msgid "Timezone Button"
-msgstr "Tidssone-knapp"
+msgid "Select Timezone"
+msgstr "Velg tidssone"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
@@ -10196,8 +10252,8 @@ msgstr "Melding uten navn"
msgid "Open File"
msgstr "Åpne fil"
-#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:596
-#: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:598
+#: ../mail/em-account-editor.c:643 ../mail/em-account-editor.c:710
msgid "Autogenerated"
msgstr "Generert automatisk"
@@ -10345,7 +10401,7 @@ msgid "You need to configure an account before you can compose mail."
msgstr "Du må konfigurere en konto før du kan skrive meldinger."
#: ../composer/mail-composer.error.xml.h:28
-msgid "_Don't Recover"
+msgid "_Do not Recover"
msgstr "Ikke _gjenopprett"
#: ../composer/mail-composer.error.xml.h:29
@@ -10362,7 +10418,11 @@ msgstr "_Lagre melding"
msgid "Evolution"
msgstr "Evolution"
-#: ../data/evolution.desktop.in.in.h:2
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+msgid "Groupware Suite"
+msgstr "Gruppevareløsning"
+
+#: ../data/evolution.desktop.in.in.h:3
msgid "The Evolution Groupware Suite"
msgstr "Gruppevaresuiten Evolution"
@@ -10508,11 +10568,10 @@ msgid "Evolution Query"
msgstr "Evolution spørring"
#. setup a dummy error
-#: ../e-util/e-error.c:442
+#: ../e-util/e-error.c:443
#, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">Intern feil, ukjent feil «%s» etterspurt</span>"
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Intern feil, ukjent feil «%s» forespurt"
#: ../e-util/e-system.error.xml.h:2
msgid "Cannot open file &quot;{0}&quot;."
@@ -10530,7 +10589,7 @@ msgstr "Vil du overskrive den?"
msgid "File exists &quot;{0}&quot;."
msgstr "Filen &quot;{0}&quot; eksisterer."
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
msgid "_Overwrite"
msgstr "_Overskriv"
@@ -10609,20 +10668,19 @@ msgid "Choose a file"
msgstr "Velg en fil"
#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1052 ../mail/mail-config.c:85
-#: ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
msgid "Important"
msgstr "Viktig"
#. forest green
#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
-#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:146
msgid "To Do"
msgstr "Oppgaver"
#. blue
#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.c:89 ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:96
msgid "Later"
msgstr "Senere"
@@ -10699,7 +10757,7 @@ msgstr "Mangler dato."
msgid "Missing file name."
msgstr "Mangler filnavn."
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
msgid "Missing name."
msgstr "Mangler navn."
@@ -10847,6 +10905,7 @@ msgid "Mail"
msgstr "E-post"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:531
msgid "Mail Accounts"
msgstr "E-post-konti"
@@ -10877,92 +10936,88 @@ msgstr ""
"under nøye\n"
"og kryss av i ruten for å akseptere den\n"
-#: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:474 ../mail/em-filter-folder-element.c:237
#: ../mail/em-vfolder-rule.c:496
msgid "Select Folder"
msgstr "Velg mappe"
-#: ../mail/em-account-editor.c:768
+#: ../mail/em-account-editor.c:770
msgid "Ask for each message"
msgstr "Spør for hver melding"
-#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1749 ../mail/mail-config.glade.h:91
msgid "Identity"
msgstr "Identitet"
-#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:118
+#: ../mail/em-account-editor.c:1798 ../mail/mail-config.glade.h:118
msgid "Receiving Email"
msgstr "Innkommende e-post"
-#: ../mail/em-account-editor.c:1979
+#: ../mail/em-account-editor.c:1981
msgid "Automatically check for _new mail every"
msgstr "Se etter _nye meldinger automatisk"
-#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:130
msgid "Sending Email"
msgstr "Utgående e-post"
-#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2221 ../mail/mail-config.glade.h:68
msgid "Defaults"
msgstr "Forvalg"
#. Security settings
-#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2287 ../mail/mail-config.glade.h:123
#: ../plugins/exchange-operations/exchange-account-setup.c:317
msgid "Security"
msgstr "Sikkerhet"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2413
+#: ../mail/em-account-editor.c:2324 ../mail/em-account-editor.c:2415
msgid "Receiving Options"
msgstr "Alternativer for mottak"
-#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2414
+#: ../mail/em-account-editor.c:2325 ../mail/em-account-editor.c:2416
msgid "Checking for New Mail"
msgstr "Ser etter nye meldinger"
-#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2755 ../mail/mail-config.glade.h:34
msgid "Account Editor"
msgstr "Kontoredigering"
-#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2755 ../mail/mail-config.glade.h:80
msgid "Evolution Account Assistant"
msgstr "Evolution kontoassistent"
#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:407
+#: ../mail/em-account-prefs.c:409
msgid "Disable"
msgstr "Deaktiver"
#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
+#: ../mail/em-account-prefs.c:411
msgid "Enable"
msgstr "Aktiver"
#. translators: default account indicator
-#: ../mail/em-account-prefs.c:459
+#: ../mail/em-account-prefs.c:466
msgid "[Default]"
msgstr "[Forvalg]"
#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:512 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
#: ../plugins/plugin-manager/plugin-manager.c:205
#: ../plugins/publish-calendar/publish-calendar.c:474
msgid "Enabled"
msgstr "Aktivert"
-#: ../mail/em-account-prefs.c:518
+#: ../mail/em-account-prefs.c:524
msgid "Account name"
msgstr "Kontonavn"
-#: ../mail/em-account-prefs.c:520
+#: ../mail/em-account-prefs.c:526
msgid "Protocol"
msgstr "Protokoll"
-#: ../mail/em-account-prefs.c:525
-msgid "Mail Accounts Table"
-msgstr "Tabell med e-post-konti"
-
#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
#: ../mail/mail-config.c:967
msgid "Unnamed"
@@ -11137,8 +11192,7 @@ msgstr "Uønsket e-post"
msgid "Junk Test"
msgstr "Uønsket e-posttest"
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
msgid "Label"
msgstr "Etikett"
@@ -11264,7 +11318,7 @@ msgstr "Nullstill status"
msgid "<b>Then</b>"
msgstr "<b>Så</b> "
-#: ../mail/em-folder-browser.c:143
+#: ../mail/em-folder-browser.c:144
msgid "C_reate Search Folder From Search..."
msgstr "Opp_rett søkemappe fra søk..."
@@ -11316,7 +11370,7 @@ msgstr "Skisser"
#. translators: standard local mailbox names
#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:638
+#: ../plugins/exchange-operations/exchange-folder.c:597
msgid "Inbox"
msgstr "Innboks"
@@ -11402,7 +11456,7 @@ msgstr "_Ny mappe..."
msgid "_Rename..."
msgstr "End_re navn..."
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
msgid "_Empty Trash"
msgstr "_Tøm papirkurven"
@@ -11422,20 +11476,20 @@ msgid "C_opy"
msgstr "K_opier"
#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../plugins/groupwise-features/share-folder-common.c:145
#, c-format
msgid "Creating folder `%s'"
msgstr "Oppretter mappe «%s»"
#: ../mail/em-folder-utils.c:730
#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:388
msgid "Create folder"
msgstr "Opprett mappe"
#: ../mail/em-folder-utils.c:730
#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:388
msgid "Specify where to create the folder:"
msgstr "Spesifiser hvor mappen skal opprettes:"
@@ -11492,6 +11546,14 @@ msgstr "Merk som _gyldig melding"
msgid "Mark for Follo_w Up..."
msgstr "Merk for oppføl_ging..."
+#: ../mail/em-folder-view.c:1105
+msgid "_Label"
+msgstr "_Etikett"
+
+#: ../mail/em-folder-view.c:1106
+msgid "_None"
+msgstr "I_ngen"
+
#: ../mail/em-folder-view.c:1111
msgid "Fla_g Completed"
msgstr "Mer_k som fullført"
@@ -11713,17 +11775,18 @@ msgstr "_Tilpass bredde"
msgid "Show _Original Size"
msgstr "Vis _opprinnelig størrelse"
-#: ../mail/em-format-html-display.c:1665
-msgid "Attachment Button"
-msgstr "Vedleggsknapp"
+#: ../mail/em-format-html-display.c:1665 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Vedlegg"
#: ../mail/em-format-html-display.c:1872
msgid "Select folder to save all attachments..."
msgstr "Velg mappe å lagre alle vedlegg i..."
#: ../mail/em-format-html-display.c:1919
-msgid "Save Selected..."
-msgstr "Lagre valgte..."
+msgid "_Save Selected..."
+msgstr "_Lagre valgte..."
#. Cant i put in the number of attachments here ?
#: ../mail/em-format-html-display.c:1986
@@ -11741,10 +11804,6 @@ msgstr "L_agre"
msgid "S_ave All"
msgstr "L_agre alle"
-#: ../mail/em-format-html-display.c:2063
-msgid "Toggle Attachment Bar"
-msgstr "Slå av/på visning av vedleggsfelt"
-
#: ../mail/em-format-html-display.c:2065
msgid "No Attachment"
msgstr "Ingen vedlegg"
@@ -11825,7 +11884,7 @@ msgstr "Bcc"
#. pseudo-header
#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1000
+#: ../mail/em-mailer-prefs.c:1001
msgid "Mailer"
msgstr "E-postprogram"
@@ -11841,7 +11900,8 @@ msgstr "<I> (%R %Z)</I>"
#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:2
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
+#: ../widgets/misc/e-dateedit.c:363
msgid "Date"
msgstr "Dato"
@@ -12006,8 +12066,8 @@ msgid "Do not show this message again."
msgstr "Ikke vis denne meldingen igjen."
#: ../mail/em-utils.c:319
-msgid "Filters"
-msgstr "Filtre"
+msgid "Message Filters"
+msgstr "Meldingsfiltre"
#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
msgid "message"
@@ -12750,6 +12810,30 @@ msgstr "Opprett en ny e-postmappe"
msgid "Failed upgrading Mail settings or folders."
msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
+#: ../mail/mail-config.c:85
+msgid "I_mportant"
+msgstr "V_iktig"
+
+#. red
+#: ../mail/mail-config.c:86
+msgid "_Work"
+msgstr "Ar_beid"
+
+#. orange
+#: ../mail/mail-config.c:87
+msgid "_Personal"
+msgstr "_Personlig"
+
+#. forest green
+#: ../mail/mail-config.c:88
+msgid "_To Do"
+msgstr "_Oppgaver"
+
+#. blue
+#: ../mail/mail-config.c:89
+msgid "_Later"
+msgstr "_Senere"
+
#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
@@ -12914,10 +12998,6 @@ msgstr "Alltid krypter til _meg selv ved sending av kryptert e-post"
msgid "Attach original message"
msgstr "Legg ved opprinnelig melding"
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Vedlegg"
-
#: ../mail/mail-config.glade.h:46
msgid "Automatically insert _smiley images"
msgstr "Sett inn _smilefjes automatisk"
@@ -13352,23 +13432,24 @@ msgstr "Sva_rstil:"
msgid "_Script:"
msgstr "_Skript:"
-#: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
-msgstr "Vi_s animerte bilder"
-
+#. If enabled, show animation; if disabled, only display a static image without any animation
#: ../mail/mail-config.glade.h:173
+msgid "_Show image animations"
+msgstr "Vi_s animasjoner"
+
+#: ../mail/mail-config.glade.h:174
msgid "_Use Secure Connection:"
msgstr "Br_uk sikker forbindelse:"
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
msgid "_Use the same fonts as other applications"
msgstr "Br_uk samme skrifter som andre programmer"
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
msgid "color"
msgstr "farge"
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
msgid "description"
msgstr "beskrivelse"
@@ -13997,38 +14078,42 @@ msgid "Do you want the operation to be performed in the subfolders?"
msgstr "Vil du at operasjonen skal utføres i undermapper?"
#: ../mail/mail.error.xml.h:49
+msgid "Do you want to mark all messages as read?"
+msgstr "Vil du merke alle meldinger som lest?"
+
+#: ../mail/mail.error.xml.h:50
msgid "Do you wish to save your changes?"
msgstr "Vil du lagre dine endringer?"
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
msgid "Enter password."
msgstr "Oppgi passord."
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
msgid "Error loading filter definitions."
msgstr "Feil under lasting av filterdefinisjoner."
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
msgid "Error while performing operation."
msgstr "Feil under utføring av operasjon."
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
msgid "Error while {0}."
msgstr "Feil under {0}."
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
msgid "File exists but cannot overwrite it."
msgstr "Filen eksisterer men kan ikke overskrives."
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:56
msgid "File exists but is not a regular file."
msgstr "Filen eksisterer, men den er ikke en vanlig fil."
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:57
msgid "If you continue, you will not be able to recover these messages."
msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
msgid ""
"If you delete the folder, all of its contents and its subfolders contents "
"will be deleted permanently."
@@ -14036,11 +14121,11 @@ msgstr ""
"Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
"permanent."
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
msgid "If you proceed, all proxy accounts will be deleted permanently."
msgstr "Hvis du fortsetter vil stedfortrederkontoer bli slettet permanent."
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
@@ -14048,11 +14133,11 @@ msgstr ""
"Hvis du fortsetter vil all kontoinformasjon og\n"
"mellomtjenerinformasjon bli slettet permanent."
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
msgid "If you proceed, the account information will be deleted permanently."
msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
msgid ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
@@ -14060,19 +14145,19 @@ msgstr ""
"Hvis du avslutter vil ikke disse meldingene sendes før Evolution startes "
"igjen."
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
msgid "Ignore"
msgstr "Ignorer"
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
msgid "Invalid authentication"
msgstr "Ugyldig autentisering"
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
msgid "Mail filters automatically updated."
msgstr "E-postfiltre oppdatert automatisk."
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
msgid ""
"Many email systems add an Apparently-To header to messages that only have "
"BCC recipients. This header, if added, will list all of your recipients to "
@@ -14084,35 +14169,35 @@ msgstr ""
"meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
"Til: eller Cc:."
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
msgid "Mark all messages as read"
msgstr "Merk alle meldinger som lest"
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
msgid "Mark all messages as read in the selected folder"
msgstr "Merk alle meldinger i valgt mappe som lest"
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
msgid "Missing folder."
msgstr "Mangler mappe."
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
msgid "No sources selected."
msgstr "Ingen kilder valgt."
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
msgid "Opening too many messages at once may take a long time."
msgstr "Hvis du åpner for mange meldinger på en gang kan dette ta lang tid."
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
msgid "Please check your account settings and try again."
msgstr "Vennligst sjekk innstillingene for kontoen og prøv igjen."
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
msgid "Please enable the account or send using another account."
msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
msgid ""
"Please enter a valid email address in the To: field. You can search for "
"email addresses by clicking on the To: button next to the entry box."
@@ -14120,7 +14205,7 @@ msgstr ""
"Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan søke etter e-"
"postadresser ved å klikke på Til:-knappen ved siden av inntastingsfeltet."
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
msgid ""
"Please make sure the following recipients are willing and able to receive "
"HTML email:\n"
@@ -14132,50 +14217,50 @@ msgstr ""
"{0}\n"
"Send likevel?"
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
msgid "Please provide an unique name to identify this signature."
msgstr "Oppgi et unikt navn for å identifisere denne signaturen."
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
msgid "Please wait."
msgstr "Vennligst vent."
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
msgid "Problem migrating old mail folder &quot;{0}&quot;."
msgstr ""
"Det oppsto et problem under migrering av gammel meldingsmappe &quot;{0}"
"&quot;."
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
msgid "Querying server"
msgstr "Spør tjener"
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
msgid "Read receipt requested."
msgstr "Lesekvittering etterspurt."
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
msgstr ""
"Vil du virkelig slette mappen &quot;{0}&quot; og alle dens undermapper?"
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
msgid "Search Folders automatically updated."
msgstr "Søkemapper oppdatert automatisk."
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
msgid "Send Receipt"
msgstr "Send kvittering"
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
msgid "Signature Already Exists"
msgstr "Signaturen eksisterer allerede"
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
"cannot be renamed, moved, or deleted."
@@ -14183,7 +14268,7 @@ msgstr ""
"Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
"endre navn på, flytte eller slette disse."
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -14199,7 +14284,7 @@ msgstr ""
"meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
"Til: eller Cc:."
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
msgid ""
"The following Search Folder(s):\n"
"{0}\n"
@@ -14213,7 +14298,7 @@ msgstr ""
" &quot;{1}&quot;\n"
"og er nå oppdatert."
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
msgid ""
"The following filter rule(s):\n"
"{0}\n"
@@ -14227,7 +14312,7 @@ msgstr ""
" &quot;{1}&quot;\n"
"og er nå oppdatert."
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
msgid ""
"The message was sent via the &quot;sendmail&quot; external application. "
"Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14238,11 +14323,11 @@ msgstr ""
"Sendmail rapporterer den følgende feilmeldingen: status 67: mail not sent.\n"
"Meldingen er lagret i mappen Utboks. Sjekk meldingen for feil og send igjen."
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
msgid "The script file must exist and be executable."
msgstr "Skriptfilen må eksistere og være kjørbar."
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
@@ -14250,19 +14335,20 @@ msgstr ""
"Denne mappen er lagt til implisitt. Gå til redigering av søkemapper og legg "
"den inn eksplisitt hvis det er nødvendig."
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:109
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
msgstr ""
"Denne meldingen kan ikke sendes fordi kontoen du sender med ikke er aktiv"
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:110
msgid ""
"This message cannot be sent because you have not specified any recipients"
-msgstr "Denne meldingen kan ikke sendes fordi du ikke har oppgitt noen mottakere"
+msgstr ""
+"Denne meldingen kan ikke sendes fordi du ikke har oppgitt noen mottakere"
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
msgid ""
"This server does not support this type of authentication and may not support "
"authentication at all."
@@ -14270,15 +14356,21 @@ msgstr ""
"Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
"støtter autentisering i det hele tatt."
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
msgid "This signature has been changed, but has not been saved."
msgstr "Denne signaturen er endret, men er ikke lagret."
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr "Dette vil merke alle meldinger i valgt mappe med undermapper som lest."
+
+#: ../mail/mail.error.xml.h:114
msgid "Unable to connect to the GroupWise server."
msgstr "Kunne ikke koble til GroupWise-tjener."
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:115
msgid ""
"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
@@ -14286,39 +14378,39 @@ msgstr ""
"Kan ikke åpne skisse-mappen for denne kontoen. Vil du bruke forvalgt mappe "
"for skisser i stedet?"
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
msgid "Unable to read license file."
msgstr "Kan ikke lese lisensfilen."
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
msgid "Use _Default"
msgstr "Bruk _forvalg"
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
msgid "Use default drafts folder?"
msgstr "Bruk forvalgt mappe for skisser?"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
msgid "You have not filled in all of the required information."
msgstr "Du har ikke fylt ut all nødvendig informasjon."
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
msgid "You may not create two accounts with the same name."
msgstr "Du kan ikke opprette to kontoer med samme navn."
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
msgid "You must name this Search Folder."
msgstr "Du må gi navn til denne søkemappen."
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
msgid "You must specify a folder."
msgstr "Du må oppgi en mappe."
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -14328,27 +14420,27 @@ msgstr ""
"Enten ved å velge mappene individuelt og/eller å velge alle lokale mapper, "
"alle eksterne mapper eller begge deler."
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
msgstr "Din pålogging på tjener &quot;{0}&quot; som &quot;{0}&quot; feilet."
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
msgid "Your message with the subject &quot;{0}&quot; was not delivered."
msgstr "Din melding med emne &quot;{0}&quot; ble ikke levert."
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
msgid "_Append"
msgstr "_Legg til"
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
msgid "_Discard changes"
msgstr "_Forkast endringene"
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
msgid "_Expunge"
msgstr "T_øm"
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
msgid "_Open Messages"
msgstr "_Åpne meldinger"
@@ -14416,8 +14508,8 @@ msgid "%b %d %Y"
msgstr "%d %b %Y"
#: ../mail/message-list.c:2063
-msgid "Message List"
-msgstr "Meldingsliste"
+msgid "Messages"
+msgstr "Meldinger"
#: ../mail/message-list.c:3441
msgid "Generating message list"
@@ -14588,33 +14680,30 @@ msgstr ""
msgid "Restore Settings..."
msgstr "Gjenopprett innstillinger..."
-#: ../plugins/bbdb/bbdb.c:429
+#: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "Automatiske kontakter"
-#: ../plugins/bbdb/bbdb.c:438
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<span weight=\"bold\">Automatiske kontakter</span>"
-
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:451
+#: ../plugins/bbdb/bbdb.c:454
msgid ""
"_Automatically create entries in the addressbook when responding to mail"
msgstr "Opprett oppføringer i adresseboken _automatisk når du svarer på e-post"
-#: ../plugins/bbdb/bbdb.c:472
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">Kontakter for lynmeldinger</span>"
+#: ../plugins/bbdb/bbdb.c:475
+msgid "Instant Messaging Contacts"
+msgstr "Kontakter for lynmeldinger"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:485
+#: ../plugins/bbdb/bbdb.c:490
msgid ""
"Periodically synchronize contact information and images from gaim buddy list"
-msgstr "Synkroniser kontaktinformasjon og bilder fra vennelisten i Gaim periodisk"
+msgstr ""
+"Synkroniser kontaktinformasjon og bilder fra vennelisten i Gaim periodisk"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:502
+#: ../plugins/bbdb/bbdb.c:507
msgid "Synchronize with _buddy list now"
msgstr "Synkroniser med _vennelisten nå"
@@ -14753,8 +14842,8 @@ msgstr "Vil du bruke Evolution som forvalgt e-postprogram?"
#: ../plugins/default-source/default-source.c:82
#: ../plugins/default-source/default-source.c:109
-msgid "Mark as default folder"
-msgstr "Sett som forvalgt mappe"
+msgid "Mark as _default folder"
+msgstr "Merk som _forvalgt mappe"
#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
msgid "Default Sources"
@@ -14887,7 +14976,7 @@ msgid "Ch_eck for Supported Types"
msgstr "Sj_ekk støttede typer"
#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:164
+#: ../plugins/exchange-operations/exchange-contacts.c:165
msgid ""
"Evolution is in offline mode. You cannot create or modify folders now.\n"
"Please switch to online mode for such operations."
@@ -14932,7 +15021,7 @@ msgid "Your password will expire in the next %d days"
msgstr "Passordet ditt vil utløpe i løpet av de neste %d dagene"
#: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
msgid "Custom"
msgstr "Egendefinert"
@@ -15052,7 +15141,7 @@ msgstr "Mappenavn"
msgid "Folder Size"
msgstr "Mappestørrelse"
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:192
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
msgid "Subscribe to Other User's Folder"
msgstr "Abonner på annen brukers mappe"
@@ -15095,15 +15184,15 @@ msgstr "En_dre passord"
msgid "ok_button"
msgstr "ok_button"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
msgid "(Permission denied.)"
msgstr "(Tilgang nektet.)"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
msgid "Add User:"
msgstr "Legg til bruker:"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
msgid "Add User"
msgstr "Legg til bruker"
@@ -15168,7 +15257,7 @@ msgid "Select User"
msgstr "Velg bruker"
#: ../plugins/exchange-operations/exchange-user-dialog.c:182
-msgid "Addressbook..."
+msgid "Address Book..."
msgstr "Adressebok..."
#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
@@ -15696,19 +15785,19 @@ msgstr "Proxy-fanen vil kun være tilgjengelig når kontoen er tilkoblet."
msgid "The Proxy tab will be available only when the account is enabled."
msgstr "Proxyfanen vil kun være tilgjengelig når kontoen er aktivert."
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:322
msgid "Users"
msgstr "Brukere"
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:323
msgid "Enter the users and set permissions"
msgstr "Oppgi brukere og sett rettigheter"
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:342
msgid "New _Shared Folder..."
msgstr "Ny _delt mappe..."
-#: ../plugins/groupwise-features/share-folder-common.c:446
+#: ../plugins/groupwise-features/share-folder-common.c:450
msgid "Sharing"
msgstr "Deling"
@@ -15935,23 +16024,20 @@ msgstr ""
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:1994
msgid "_Delete message after acting"
msgstr "_Slett melding etter utført handling"
-#: ../plugins/itip-formatter/itip-formatter.c:2001
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">Søk etter konflikter</span>"
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
+msgid "Conflict Search"
+msgstr "Søk etter konflikter"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2019
msgid "Select the calendars to search for meeting conflicts"
msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr "Tabell for søk etter konflikter"
-
#. strftime format of a weekday and a date.
#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:32
#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
@@ -16758,14 +16844,18 @@ msgstr ""
"Manuell (via menyen Handlinger)"
#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr "P_ort:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
msgid "Publishing Location"
msgstr "Lokasjon for publisering"
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
msgid "Publishing _Frequency:"
msgstr "Publiserings_frekvens<"
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
msgid ""
"SSH\n"
"Public FTP\n"
@@ -16783,11 +16873,11 @@ msgstr ""
"Sikker WebDAV (HTTPS)\n"
"Egendefinert lokasjon"
-#: ../plugins/publish-calendar/publish-calendar.glade.h:19
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
msgid "Service _type:"
msgstr "_Type tjeneste:"
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
msgid "_File:"
msgstr "_Fil:"
@@ -17109,7 +17199,9 @@ msgstr "Start i frakoblet modus"
msgid ""
"The configuration version of Evolution, with major/minor/configuration level "
"(for example \"2.6.0\")."
-msgstr "Konfigurasjonsversjon for Evolution med større/mindre/konfigurasjonsnivå (for eksempel «2.6.0»)."
+msgstr ""
+"Konfigurasjonsversjon for Evolution med større/mindre/konfigurasjonsnivå "
+"(for eksempel «2.6.0»)."
#: ../shell/apps_evolution_shell.schemas.in.in.h:14
msgid "The default height for the main window, in pixels."
@@ -17127,7 +17219,9 @@ msgstr "Forvalgt bredde på sidelinjen i piksler."
msgid ""
"The last upgraded configuration version of Evolution, with major/minor/"
"configuration level (for example \"2.6.0\")."
-msgstr "Sist oppgradert konfigurasjonsversjon for Evolution, med major/minor/konfigurasjonsnivå (for eksempel «2.6.0»)."
+msgstr ""
+"Sist oppgradert konfigurasjonsversjon for Evolution, med major/minor/"
+"konfigurasjonsnivå (for eksempel «2.6.0»)."
#: ../shell/apps_evolution_shell.schemas.in.in.h:18
msgid ""
@@ -17294,10 +17388,6 @@ msgstr "Bug buddy kunne ikke kjøres."
msgid "translator-credits"
msgstr "Kjartan Maraas <kmaraas@gnome.org>"
-#: ../shell/e-shell-window-commands.c:544
-msgid "Groupware Suite"
-msgstr "Gruppevareløsning"
-
#: ../shell/e-shell-window-commands.c:775
msgid "_Work Online"
msgstr "Ar_beid tilkoblet"
@@ -17565,7 +17655,7 @@ msgstr "Oppgradering fra forrige versjon feilet: {0}"
#: ../shell/shell.error.xml.h:20
msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
"you only have {1} available.\n"
"\n"
"You will need to make more space available in your home directory before you "
@@ -17913,7 +18003,7 @@ msgid "_Edit CA Trust"
msgstr "R_ediger tillit til CA"
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:657
+#: ../smime/lib/e-cert-db.c:664
msgid "Certificate already exists"
msgstr "Sertifikatet eksisterer allerede"
@@ -18381,6 +18471,7 @@ msgid "Previews the calendar to be printed"
msgstr "Forhåndsviser av kalenderen som skal skrives ut"
#: ../ui/evolution-calendar.xml.h:17 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
msgid "Previous"
msgstr "Forrige"
@@ -18535,13 +18626,13 @@ msgstr "Sett _inn"
msgid "_Options"
msgstr "_Alternativer"
-#: ../ui/evolution-event-editor.xml.h:1
-msgid "Alar_ms"
-msgstr "_Varsel"
+#: ../ui/evolution-event-editor.xml.h:2
+msgid "All Day Event"
+msgstr "Avtale som varer hele dagen"
#: ../ui/evolution-event-editor.xml.h:3
-msgid "All day Event"
-msgstr "Avtale som varer hele dagen"
+msgid "All _Day Event"
+msgstr "Avtale som varer hele _dagen"
#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
#: ../ui/evolution-task-editor.xml.h:1
@@ -18584,7 +18675,7 @@ msgid "R_ole Field"
msgstr "R_olle-felt"
#: ../ui/evolution-event-editor.xml.h:16
-msgid "Show time as b_usy"
+msgid "Show time as _busy"
msgstr "Vis tiden som _opptatt"
#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
@@ -18617,7 +18708,7 @@ msgid "Toggles whether to display categories"
msgstr "Slår av/på visning av kategorier"
#: ../ui/evolution-event-editor.xml.h:24
-msgid "Toggles whether to have All day Event"
+msgid "Toggles whether to have All Day Event"
msgstr "Slår av/på hendelser som varer hele dagen"
#: ../ui/evolution-event-editor.xml.h:25
@@ -18625,8 +18716,8 @@ msgid "Toggles whether to show time as busy"
msgstr "Slår av/på visning av tid som opptatt"
#: ../ui/evolution-event-editor.xml.h:26
-msgid "_All day Event"
-msgstr "_Avtale som varer hele dagen"
+msgid "_Alarms"
+msgstr "V_arsel"
#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
#: ../ui/evolution-task-editor.xml.h:19
@@ -18756,12 +18847,12 @@ msgstr "Slå sammen alle _tråder"
msgid "Collapse all message threads"
msgstr "Slå sammen alle meldingstråder"
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:5
msgid "Copy selected message(s) to the clipboard"
msgstr "Kopier valgt(e) melding(er) til utklippstavlen"
#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7 ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:7
msgid "Cut selected message(s) to the clipboard"
msgstr "Klipp ut valgt(e) melding(er) til utklippstavlen"
@@ -18795,10 +18886,10 @@ msgid ""
msgstr "Skjul slettede meldinger heller enn å vise dem gjennomstreket"
#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k Messages as Read"
-msgstr "Mer_k meldinger som lest"
+msgid "Mar_k All Messages as Read"
+msgstr "Mer_k alle meldinger som lest"
-#: ../ui/evolution-mail-list.xml.h:17 ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-list.xml.h:17
msgid "Paste message(s) from the clipboard"
msgstr "Lim inn melding(er) fra utklippstavlen"
@@ -18900,10 +18991,14 @@ msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
msgid "Compose a reply to the sender of the selected message"
msgstr "Skriv et svar til avsender av den valgte meldingen"
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:12
msgid "Copy selected messages to another folder"
msgstr "Kopier valgte meldinger til en annen mappe"
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "Kopier valgte meldinger til utklippstavlen"
+
#: ../ui/evolution-mail-message.xml.h:14
msgid "Create R_ule"
msgstr "Opprett _regel"
@@ -18940,6 +19035,10 @@ msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
msgid "Create a rule to filter messages with this subject"
msgstr "Lag en regel for filtrering av meldinger med dette emnet"
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "Klipp ut valgte meldinger til utklippstavlen"
+
#: ../ui/evolution-mail-message.xml.h:24
msgid "Decrease the text size"
msgstr "Mindre skrift"
@@ -18953,12 +19052,12 @@ msgid "Display the next message"
msgstr "Vis neste melding"
#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next unread message"
-msgstr "Vis neste uleste melding"
+msgid "Display the next thread"
+msgstr "Vis neste tråd"
#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread thread"
-msgstr "Vis neste uleste tråd"
+msgid "Display the next unread message"
+msgstr "Vis neste uleste melding"
#: ../ui/evolution-mail-message.xml.h:30
msgid "Display the previous important message"
@@ -18997,8 +19096,8 @@ msgid "Filter the selected messages for junk status"
msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
-msgstr "Merk valgt(e) melding(er) for oppfølging"
+msgid "Flag selected messages for follow-up"
+msgstr "Merk valgte meldinger for oppfølging"
#: ../ui/evolution-mail-message.xml.h:40
msgid "Follow _Up..."
@@ -19033,36 +19132,36 @@ msgid "Mar_k as"
msgstr "Mer_k som"
#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
-msgstr "Merk valgt(e) melding(er) som lest"
+msgid "Mark the selected messages as having been read"
+msgstr "Merk valgte meldinger som lest"
#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
-msgstr "Merk valgt(e) melding(er) som viktige"
+msgid "Mark the selected messages as important"
+msgstr "Merk valgte meldinger som viktige"
#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as junk"
-msgstr "Merk valgt(e) melding(er) som uønsket e-post"
+msgid "Mark the selected messages as junk"
+msgstr "Merk valgte meldinger som uønsket e-post"
#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not being junk"
-msgstr "Merk valgt(e) melding(er) som ikke uønsket e-post"
+msgid "Mark the selected messages as not being junk"
+msgstr "Merk valgte meldinger som ønsket e-post"
#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
-msgstr "Merk valgt(e) melding(er) som ulest"
+msgid "Mark the selected messages as not having been read"
+msgstr "Merk valgte meldinger som ulest"
#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
-msgstr "Merk valgt(e) melding(er) som uviktige"
+msgid "Mark the selected messages as unimportant"
+msgstr "Merk valgte meldinger som uviktige"
#: ../ui/evolution-mail-message.xml.h:56
msgid "Mark the selected messages for deletion"
msgstr "Merk valgte meldinger for sletting"
#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected message(s) to another folder"
-msgstr "Flytt valgt(e) melding(er) til en annen mappe"
+msgid "Move selected messages to another folder"
+msgstr "Flytt valgte meldinger til en annen mappe"
#: ../ui/evolution-mail-message.xml.h:59
msgid "Next _Important Message"
@@ -19085,17 +19184,21 @@ msgid "Open a window for composing a mail message"
msgstr "Åpne et vindu for å skrive en e-post melding"
#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected message in a new window"
-msgstr "Åpne valgt melding i et nytt vindu"
+msgid "Open the selected messages in a new window"
+msgstr "Åpne valgte meldinger i et nytt vindu"
#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected message in the composer for editing"
-msgstr "Åpne valgt melding for redigering"
+msgid "Open the selected messages in the composer for editing"
+msgstr "Åpne valgte meldinger i redigeringskomponenten"
#: ../ui/evolution-mail-message.xml.h:66
msgid "P_revious Unread Message"
msgstr "Fo_rrige uleste melding"
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "Lim inn meldinger fra utklippstavlen"
+
#: ../ui/evolution-mail-message.xml.h:68
msgid "Pos_t New Message to Folder"
msgstr "Pos_t ny melding til mappe"
@@ -19137,8 +19240,8 @@ msgid "Reset the text to its original size"
msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
#: ../ui/evolution-mail-message.xml.h:85
-msgid "Save the message as a text file"
-msgstr "Lagre meldingen som en tekstfil"
+msgid "Save the selected messages as a text file"
+msgstr "Lagre valgte meldinger som tekstfiler"
#: ../ui/evolution-mail-message.xml.h:86
msgid "Search Folder from Mailing _List..."
@@ -19177,19 +19280,19 @@ msgid "Show a blinking cursor in the body of displayed messages"
msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show message in the normal style"
-msgstr "Vis melding i normal stil"
+msgid "Show messages in the normal style"
+msgstr "Vis meldinger med vanlig stil"
#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message with all email headers"
-msgstr "Vis melding med fulle e-post headere"
+msgid "Show messages with all email headers"
+msgstr "Vis meldinger med alle meldingshoder"
#: ../ui/evolution-mail-message.xml.h:97
msgid "Show the raw email source of the message"
msgstr "Vis e-post meldingen i sin råe form"
#: ../ui/evolution-mail-message.xml.h:98
-msgid "Un-delete the selected messages"
+msgid "Undelete the selected messages"
msgstr "Angre sletting av valgte meldinger"
#: ../ui/evolution-mail-message.xml.h:99
@@ -19589,12 +19692,12 @@ msgid "_Status Details"
msgstr "Detaljert _status"
#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr "Kopier valgt oppgave"
+msgid "Copy selected tasks"
+msgstr "Kopier valgte oppgaver"
#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
-msgstr "Klipp ut valgt oppgave"
+msgid "Cut selected tasks"
+msgstr "Klipp ut valgte oppgaver"
#: ../ui/evolution-tasks.xml.h:7
msgid "Delete completed tasks"
@@ -19613,8 +19716,8 @@ msgid "Mark selected tasks as complete"
msgstr "Merk valgte oppgaver som fullført"
#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
-msgstr "Lim inn oppgave fra utklippstavlen"
+msgid "Paste tasks from the clipboard"
+msgstr "Lim inn oppgaver fra utklippstavlen"
#: ../ui/evolution-tasks.xml.h:13
msgid "Previews the list of tasks to be printed"
@@ -20014,10 +20117,6 @@ msgstr "MTOTFLS"
msgid "%B %Y"
msgstr "%B %Y"
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-msgid "Previous Button"
-msgstr "Forrige knapp"
-
#: ../widgets/misc/e-calendar.c:226
msgid "Month Calendar"
msgstr "Månedskalender"
@@ -20191,32 +20290,24 @@ msgid "..."
msgstr "..."
#: ../widgets/misc/e-dateedit.c:321
-msgid "Date and Time Entry"
-msgstr "Felt for dato & klokkeslett"
+msgid "Date and Time"
+msgstr "Dato og klokkeslett"
#: ../widgets/misc/e-dateedit.c:340
msgid "Text entry to input date"
msgstr "Tekstfelt for å oppgi dato"
-#: ../widgets/misc/e-dateedit.c:341
-msgid "Text Date Entry"
-msgstr "Oppføring for datotekst"
-
#: ../widgets/misc/e-dateedit.c:362
msgid "Click this button to show a calendar"
msgstr "Klikk på denne knappen for å vise en kalender"
-#: ../widgets/misc/e-dateedit.c:363
-msgid "Date Button"
-msgstr "Datoknapp"
-
#: ../widgets/misc/e-dateedit.c:384
msgid "Combo box to select time"
msgstr "Kombinasjonsboks for å velge tid"
#: ../widgets/misc/e-dateedit.c:385
-msgid "Time Combo Box"
-msgstr "Tidskombinasjonsboks"
+msgid "Time"
+msgstr "Tid"
#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
@@ -20280,6 +20371,11 @@ msgstr "Indikatormellomrom"
msgid "Spacing around expander arrow"
msgstr "Mellomrom rundt utviderpilen"
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:163
+msgid "Advanced Search"
+msgstr "Avansert søk"
+
#: ../widgets/misc/e-filter-bar.c:202
msgid "_Searches"
msgstr "_Søk"
@@ -20348,8 +20444,8 @@ msgstr "Kolonnebredde"
#. To translators: This is the accessibility name of
#. the search bar's text entry widget
#: ../widgets/misc/e-search-bar.c:371
-msgid "Search Text Entry"
-msgstr "Felt for søketekst"
+msgid "Search"
+msgstr "Søk"
#: ../widgets/misc/e-search-bar.c:588
msgid "_Search"
diff --git a/po/no.po b/po/no.po
index 0219dcc15d..e35946b117 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: evolution 2.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-30 14:14+0100\n"
-"PO-Revision-Date: 2006-01-30 14:23+0100\n"
+"POT-Creation-Date: 2006-02-13 00:26+0100\n"
+"PO-Revision-Date: 2006-02-13 00:35+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
"MIME-Version: 1.0\n"
@@ -535,30 +535,30 @@ msgstr "Konfigurer automatisk fullføring her"
#. Create the contacts group
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../addressbook/gui/component/addressbook-view.c:1334
#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:626
+#: ../plugins/exchange-operations/exchange-folder.c:585
msgid "Contacts"
msgstr "Kontakter"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
+msgid "Evolution Address Book"
msgstr "Evolution adressebok"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
+msgid "Evolution Address Book address pop-up"
msgstr "Evolution adressebok adressedialog"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
+msgid "Evolution Address Book address viewer"
msgstr "Evolution adressebok adressevisning"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
+msgid "Evolution Address Book card viewer"
msgstr "Evolution adressebok kortvisning"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
+msgid "Evolution Address Book component"
msgstr "Evolution adressebok-komponent"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
@@ -598,8 +598,7 @@ msgstr "På denne datamaskinen"
#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1054 ../mail/mail-config.c:87
-#: ../mail/mail-config.glade.h:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
msgid "Personal"
msgstr "Personlig"
@@ -639,7 +638,7 @@ msgid "Create a new address book"
msgstr "Opprett en ny adressebok"
#: ../addressbook/gui/component/addressbook-component.c:382
-msgid "Failed upgrading Addressbook settings or folders."
+msgid "Failed upgrading Address Book settings or folders."
msgstr "Feil under oppgradering av innstillinger eller mapper for adressebok."
#: ../addressbook/gui/component/addressbook-config.c:329
@@ -663,13 +662,15 @@ msgstr "Kopier innholdet i adresseboken lokalt for frakoblet operasjon"
#: ../calendar/gui/dialogs/calendar-setup.c:380
#: ../calendar/gui/dialogs/calendar-setup.c:391
#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "Generelt"
#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
#: ../mail/importers/pine-importer.c:392
-msgid "Addressbook"
+msgid "Address Book"
msgstr "Adressebok"
#: ../addressbook/gui/component/addressbook-config.c:986
@@ -760,36 +761,36 @@ msgstr ""
"\n"
"Vennligst vent mens Evolution migrerer dine mapper..."
-#: ../addressbook/gui/component/addressbook-view.c:435
+#: ../addressbook/gui/component/addressbook-view.c:434
#: ../mail/em-folder-utils.c:503
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "Endre navn på mappen «%s» til:"
-#: ../addressbook/gui/component/addressbook-view.c:438
+#: ../addressbook/gui/component/addressbook-view.c:437
#: ../mail/em-folder-utils.c:505
msgid "Rename Folder"
msgstr "Gi nytt navn på mappe"
-#: ../addressbook/gui/component/addressbook-view.c:443
+#: ../addressbook/gui/component/addressbook-view.c:442
#: ../mail/em-folder-utils.c:511
msgid "Folder names cannot contain '/'"
msgstr "Mappenavn kan ikke inneholde tegnet «/»"
-#: ../addressbook/gui/component/addressbook-view.c:446
+#: ../addressbook/gui/component/addressbook-view.c:445
msgid "A Folder with this name already exists"
msgstr "En mappe med dette navnet eksisterer allerede"
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:953
msgid "_New Address Book"
msgstr "_Ny adressebok"
#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:955
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
#: ../calendar/gui/calendar-component.c:538
#: ../calendar/gui/e-calendar-table.c:1194
-#: ../calendar/gui/e-calendar-view.c:1625 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:30
@@ -797,17 +798,17 @@ msgstr "_Ny adressebok"
msgid "_Delete"
msgstr "_Slett"
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:956
msgid "Save As Vcard..."
msgstr "Lagre som VCard..."
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:958
#: ../calendar/gui/calendar-component.c:539
#: ../calendar/gui/tasks-component.c:444
msgid "_Properties..."
msgstr "E_genskaper ..."
-#: ../addressbook/gui/component/addressbook-view.c:1346
+#: ../addressbook/gui/component/addressbook-view.c:1345
msgid "Contact Source Selector"
msgstr "Valg av kontaktkilde"
@@ -924,7 +925,7 @@ msgid "Add Address Book"
msgstr "Legg til adressebok"
#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:767
+#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:769
msgid "Always"
msgstr "Alltid"
@@ -959,7 +960,7 @@ msgid "Lo_gin:"
msgstr "Lo_gin"
#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:766
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:768
msgid "Never"
msgstr "Aldri"
@@ -1030,7 +1031,7 @@ msgstr "Støttede søkebaser"
#: ../addressbook/gui/component/ldap-config.glade.h:36
msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
+"The search base is the distinguished name (DN) of the entry where your "
"searches will begin. If you leave this blank, the search will begin at the "
"root of the directory tree."
msgstr ""
@@ -1129,7 +1130,6 @@ msgid "_Name:"
msgstr "_Navn:"
#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
msgid "_Port:"
msgstr "_Port:"
@@ -1157,13 +1157,13 @@ msgstr "kort"
#: ../addressbook/gui/component/ldap-config.glade.h:57
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/alarm-notify/util.c:67
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:1987
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
+#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:1989
#: ../plugins/calendar-http/calendar-http.c:286
#: ../plugins/calendar-weather/calendar-weather.c:563
msgid "minutes"
@@ -1288,7 +1288,7 @@ msgstr "Telefon"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
-#: ../mail/mail-config.c:86 ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:154
msgid "Work"
msgstr "Arbeid"
@@ -2398,7 +2398,7 @@ msgstr "Zimbabwe"
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
#: ../plugins/exchange-operations/exchange-delegates.c:934
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
#: ../plugins/plugin-manager/plugin-manager.c:42
#: ../plugins/save-attachments/save-attachments.c:369
#: ../widgets/menus/gal-view-new-dialog.c:73
@@ -2495,15 +2495,15 @@ msgstr "Endret"
msgid "Contact Editor - %s"
msgstr "Kontaktredigering - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2757
msgid "Please select an image for this contact"
msgstr "Vennligst velg et bilde for denne kontakten"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2736
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2758
msgid "No image"
msgstr "Uten bilde"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3015
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3042
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2511,7 +2511,7 @@ msgstr ""
"Kontaktdata er ugyldig:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3067
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
msgid "Invalid contact."
msgstr "Ugyldig kontakt."
@@ -2669,7 +2669,7 @@ msgstr "_IM-tjeneste:"
#: ../addressbook/gui/contact-editor/im.glade.h:5
#: ../plugins/calendar-weather/calendar-weather.c:409
#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:216
+#: ../plugins/exchange-operations/exchange-contacts.c:222
msgid "_Location:"
msgstr "_Lokasjon:"
@@ -2717,7 +2717,7 @@ msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
#: ../addressbook/gui/widgets/e-addressbook-model.c:296
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
#: ../addressbook/gui/widgets/e-minicard-view.c:506
msgid "Book"
@@ -2772,32 +2772,26 @@ msgstr ""
"Navnet eller e-post adressen for denne kontakten eksisterer allerede\n"
"i denne mappen. Vil du legge den til likevel?"
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:165
-#: ../widgets/misc/e-filter-bar.c:163
-msgid "Advanced Search"
-msgstr "Avansert søk"
-
#. We attach subitems below
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
#: ../calendar/gui/cal-search-bar.c:53
msgid "Any field contains"
msgstr "Et felt inneholder"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
#: ../calendar/gui/cal-search-bar.c:50
msgid "Category is"
msgstr "Kategorien er"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
msgid "Email begins with"
msgstr "E-post begynner med"
#: ../addressbook/gui/widgets/addresstypes.xml.h:4
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
msgid "Name begins with"
msgstr "Navn begynner med"
@@ -2814,7 +2808,7 @@ msgstr[1] "%d kontakter"
#: ../addressbook/gui/widgets/e-addressbook-model.c:303
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
#: ../addressbook/gui/widgets/e-minicard-view.c:513
msgid "Query"
@@ -2838,11 +2832,11 @@ msgstr "Modell"
msgid "Error modifying card"
msgstr "Feil ved endring av kort"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
msgid "Source"
msgstr "Kilde"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:245
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
#: ../calendar/gui/e-calendar-table.etspec.h:13
#: ../calendar/gui/e-meeting-list-view.c:480
@@ -2851,78 +2845,74 @@ msgstr "Kilde"
msgid "Type"
msgstr "Type"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:564
-msgid "Address Book"
-msgstr "Adressebok"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:835
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2069
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2068
#: ../ui/evolution-addressbook.xml.h:31
msgid "Save as VCard..."
msgstr "Lagre som VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:958
-#: ../calendar/gui/dialogs/comp-editor.c:1084
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1086
#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "_Åpne"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
msgid "_New Contact..."
msgstr "_Ny kontakt..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:961
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
msgid "New Contact _List..."
msgstr "Ny kontakt_liste..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
msgid "_Save as VCard..."
msgstr "Lagre _som VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
msgid "_Forward Contact"
msgstr "_Videresend kontakt"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
msgid "_Forward Contacts"
msgstr "_Videresend kontakter"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
msgid "Send _Message to Contact"
msgstr "Send _melding til kontakt"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
msgid "Send _Message to List"
msgstr "Send _melding til liste"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
msgid "Send _Message to Contacts"
msgstr "Send _melding til kontakter"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
msgid "_Print"
msgstr "_Skriv ut"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
msgid "Cop_y to Address Book..."
msgstr "_Kopier til adressebok..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
msgid "Mo_ve to Address Book..."
msgstr "_Flytt til adressebok..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
msgid "Cu_t"
msgstr "Klipp u_t"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
#: ../calendar/gui/calendar-component.c:537
#: ../calendar/gui/dialogs/comp-editor.c:445
#: ../calendar/gui/e-calendar-table.c:1182
-#: ../calendar/gui/e-calendar-view.c:1610 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
@@ -2932,18 +2922,18 @@ msgstr "Klipp u_t"
msgid "_Copy"
msgstr "_Kopier"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
msgid "P_aste"
msgstr "_Lim inn"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1602
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
#: ../calendar/gui/cal-search-bar.c:343
msgid "Any Category"
msgstr "Enhver kategori"
#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1804
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1803
msgid "Print cards"
msgstr "Skriv ut kontakter"
@@ -3084,7 +3074,7 @@ msgstr "Radio"
#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
#: ../calendar/gui/e-meeting-list-view.c:491
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
msgid "Role"
msgstr "Rolle"
@@ -3362,7 +3352,7 @@ msgstr "Kunne ikke avbryte"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
#: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/comp-editor-factory.c:434
+#: ../calendar/gui/comp-editor-factory.c:433
msgid "Authentication Failed"
msgstr "Autentisering feilet"
@@ -3840,7 +3830,7 @@ msgstr "Skyggelegging"
#: ../addressbook/printing/e-contact-print.glade.h:36
#: ../plugins/exchange-operations/exchange-account-setup.c:955
#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:199
+#: ../plugins/exchange-operations/exchange-contacts.c:205
msgid "Size:"
msgstr "Størrelse:"
@@ -4334,7 +4324,7 @@ msgid "_Save Changes"
msgstr "_Lagre endringer"
#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
msgid "_Send"
msgstr "_Send"
@@ -4390,7 +4380,7 @@ msgid "Could not write pilot's ToDo application block"
msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for oppgaveliste"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:1968
+#: ../plugins/itip-formatter/itip-formatter.c:1969
msgid "Calendar and Tasks"
msgstr "Kalender og oppgaver"
@@ -4436,18 +4426,19 @@ msgid "Memo_s"
msgstr "_Notater"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1084 ../calendar/gui/memos-component.c:530
-#: ../calendar/gui/memos-component.c:997 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
msgid "Memos"
msgstr "Notater"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1329 ../calendar/gui/print.c:1828
-#: ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:472
#: ../calendar/importers/icalendar-importer.c:80
#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:632
+#: ../plugins/exchange-operations/exchange-folder.c:591
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4468,9 +4459,9 @@ msgid "Evolution Calendar alarm notification service"
msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
+#: ../calendar/gui/misc.c:114
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minutt"
@@ -4499,8 +4490,8 @@ msgstr "Avtaler"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1266
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1272
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
#: ../calendar/gui/e-itip-control.c:1113
#: ../plugins/itip-formatter/itip-view.c:880
msgid "Location:"
@@ -4511,10 +4502,10 @@ msgid "Snooze _time:"
msgstr "Utsett-_tid:"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:39
#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
@@ -4533,32 +4524,32 @@ msgstr "Ut_sett"
msgid "location of appointment"
msgstr "lokasjon for avtalen"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1105
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1248
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
msgid "No summary available."
msgstr "Sammendrag er ikke tilgjengelig."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1114
#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
msgid "No description available."
msgstr "Ingen beskrivelse tilgjengelig."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1124
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
msgid "No location information available."
msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1182
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
#, c-format
msgid "You have %d alarms"
msgstr "Du har %d alarmer"
#. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1342
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1366
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
msgid "Warning"
msgstr "Advarsel"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1346
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4570,7 +4561,7 @@ msgstr ""
"å sende e-post. Evolution vil vise en vanlig dialog\n"
"for påminnelse i stedet."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1372
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4587,7 +4578,7 @@ msgstr ""
"\n"
"Er du sikker på at du ønsker å kjøre dette programmet?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1386
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
msgid "Do not ask me about this program again."
msgstr "Ikke spør meg om dette programmet igjen."
@@ -4609,52 +4600,58 @@ msgstr "ugyldig tid"
msgid "(%ld seconds)"
msgstr "%ld sekunder"
-#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
#, c-format
msgid "(%d %s %d %s)"
msgstr "(%d %s %d %s)"
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/dialogs/recurrence-page.c:987 ../calendar/gui/misc.c:111
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
msgid "second"
msgstr "sekund"
-#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
msgid "seconds"
msgstr " sekunder"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
#, c-format
msgid "(%d %s)"
msgstr "(%d %s)"
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
+#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
#, c-format
msgid " %u second"
msgstr "%u sekund"
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
+#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
#, c-format
msgid " %u seconds"
msgstr "%u sekunder"
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
#, c-format
msgid " %u minute"
msgstr "%u minutt"
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
#, c-format
msgid " %u minutes"
msgstr "%u minutt"
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
#, c-format
msgid "%u hour"
msgstr "%u time"
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
#, c-format
msgid "%u hours"
msgstr "%u timer"
@@ -5072,7 +5069,7 @@ msgstr "Skriv ut"
#: ../calendar/gui/calendar-component.c:709
#: ../calendar/gui/dialogs/calendar-setup.c:370
#: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:620
+#: ../plugins/exchange-operations/exchange-folder.c:579
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
@@ -5210,19 +5207,19 @@ msgstr "Ukevisning"
msgid "Month View"
msgstr "Månedsvisning"
-#: ../calendar/gui/comp-editor-factory.c:416
+#: ../calendar/gui/comp-editor-factory.c:415
msgid "Error while opening the calendar"
msgstr "Feil under åpning av kalenderen"
-#: ../calendar/gui/comp-editor-factory.c:422
+#: ../calendar/gui/comp-editor-factory.c:421
msgid "Method not supported when opening the calendar"
msgstr "Metoden er ikke støttet under åpning av kalender"
-#: ../calendar/gui/comp-editor-factory.c:428
+#: ../calendar/gui/comp-editor-factory.c:427
msgid "Permission denied to open the calendar"
msgstr "Tilgang nektet ved åpning av kalender"
-#: ../calendar/gui/comp-editor-factory.c:440 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
msgid "Unknown error"
msgstr "Ukjent feil"
@@ -5306,8 +5303,10 @@ msgstr "etter"
msgid "before"
msgstr "før"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
msgid "day(s)"
msgstr "dag(er)"
@@ -5342,7 +5341,7 @@ msgstr "Le_gg til"
#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
#: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:1
msgid "Alarms"
msgstr "Varsel"
@@ -5423,7 +5422,6 @@ msgstr "<span weight=\"bold\">Forvalgt ledig/opptatt-tjener</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
#: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
#: ../plugins/publish-calendar/publish-calendar.glade.h:1
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">Generelt</span>"
@@ -5455,7 +5453,7 @@ msgid "Free/Busy"
msgstr "Ledig/opptatt"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
#: ../calendar/gui/e-itip-control.c:730
msgid "Friday"
msgstr "Fredag"
@@ -5471,7 +5469,7 @@ msgstr ""
"Dager"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/recurrence-page.c:1042
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
#: ../calendar/gui/e-itip-control.c:726
msgid "Monday"
msgstr "Mandag"
@@ -5505,7 +5503,7 @@ msgid "S_un"
msgstr "S_ø."
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
#: ../calendar/gui/e-itip-control.c:731
msgid "Saturday"
msgstr "Lørdag"
@@ -5523,7 +5521,7 @@ msgid "Show week _numbers in date navigator"
msgstr "Vis uke_nummer i datonavigasjon"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
#: ../calendar/gui/e-itip-control.c:725
msgid "Sunday"
msgstr "Søndag"
@@ -5541,7 +5539,7 @@ msgid "Template:"
msgstr "Mal:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
#: ../calendar/gui/e-itip-control.c:729
msgid "Thursday"
msgstr "Torsdag"
@@ -5556,13 +5554,13 @@ msgid "Time format:"
msgstr "Tidformat:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1081
#: ../calendar/gui/e-itip-control.c:727
msgid "Tuesday"
msgstr "Tirsdag"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
#: ../calendar/gui/e-itip-control.c:728
msgid "Wednesday"
msgstr "Onsdag"
@@ -5820,17 +5818,17 @@ msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> vedlegg"
msgstr[1] "<b>%d</b> vedlegg"
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:975
msgid "Hide Attachment _Bar"
msgstr "Skjul ve_dleggsfelt"
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:978
#: ../calendar/gui/dialogs/comp-editor.c:1442
msgid "Show Attachment _Bar"
msgstr "Vis ve_dleggsfelt"
-#: ../calendar/gui/dialogs/comp-editor.c:1085
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/comp-editor.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1897
#: ../calendar/gui/dialogs/meeting-page.c:899
#: ../calendar/gui/dialogs/task-page.c:1202
#: ../composer/e-msg-composer-attachment-bar.c:470
@@ -5841,78 +5839,83 @@ msgstr "Vis ve_dleggsfelt"
msgid "_Remove"
msgstr "Fje_rn"
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
#: ../composer/e-msg-composer-attachment-bar.c:471
#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
msgid "_Properties"
msgstr "Egenska_per..."
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
#: ../composer/e-msg-composer-attachment-bar.c:473
#: ../composer/e-msg-composer.c:3600
msgid "_Add attachment..."
msgstr "_Legg til vedlegg..."
#: ../calendar/gui/dialogs/comp-editor.c:1466
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr "Vedleggsknapp: Trykk mellomrom for å aktivere vedleggsfeltet"
+#: ../mail/em-format-html-display.c:2063
+msgid "Show Attachments"
+msgstr "Vis vedlegg"
-#: ../calendar/gui/dialogs/comp-editor.c:2073
-#: ../calendar/gui/dialogs/comp-editor.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1467
+msgid "Press space key to toggle attachment bar"
+msgstr "Trykk mellomrom for å slå av/på vedleggsfeltet"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2074
+#: ../calendar/gui/dialogs/comp-editor.c:2117
msgid "Edit Appointment"
msgstr "Rediger avtale"
-#: ../calendar/gui/dialogs/comp-editor.c:2079
-#: ../calendar/gui/dialogs/comp-editor.c:2122
+#: ../calendar/gui/dialogs/comp-editor.c:2080
+#: ../calendar/gui/dialogs/comp-editor.c:2123
#, c-format
msgid "Meeting - %s"
msgstr "Møte- %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2081
-#: ../calendar/gui/dialogs/comp-editor.c:2124
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
#, c-format
msgid "Appointment - %s"
msgstr "Avtale - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2085
-#: ../calendar/gui/dialogs/comp-editor.c:2128
+#: ../calendar/gui/dialogs/comp-editor.c:2086
+#: ../calendar/gui/dialogs/comp-editor.c:2129
#, c-format
msgid "Assigned Task - %s"
msgstr "Tildelt oppgave - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2087
-#: ../calendar/gui/dialogs/comp-editor.c:2130
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
#, c-format
msgid "Task - %s"
msgstr "Oppgave - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/dialogs/comp-editor.c:2133
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/comp-editor.c:2134
#, c-format
msgid "Journal entry - %s"
msgstr "Journaloppføring - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2101
-#: ../calendar/gui/dialogs/comp-editor.c:2143
+#: ../calendar/gui/dialogs/comp-editor.c:2102
+#: ../calendar/gui/dialogs/comp-editor.c:2144
msgid "No summary"
msgstr "Ingen sammendrag"
-#: ../calendar/gui/dialogs/comp-editor.c:2651
+#: ../calendar/gui/dialogs/comp-editor.c:2652
#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
msgid "attachment"
msgstr "vedlegg"
-#: ../calendar/gui/dialogs/comp-editor.c:2740
-#: ../calendar/gui/dialogs/comp-editor.c:2794
-#: ../calendar/gui/dialogs/comp-editor.c:2818
+#: ../calendar/gui/dialogs/comp-editor.c:2741
+#: ../calendar/gui/dialogs/comp-editor.c:2795
+#: ../calendar/gui/dialogs/comp-editor.c:2819
msgid "Changes made to this item may be discarded if an update arrives"
msgstr ""
"Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
"enoppdatering"
-#: ../calendar/gui/dialogs/comp-editor.c:2842
+#: ../calendar/gui/dialogs/comp-editor.c:2843
msgid "Unable to use current version!"
msgstr "Kan ikke bruke denne versjonen!"
@@ -5999,106 +6002,106 @@ msgid "Recurrence"
msgstr "Gjeninntreffelse"
#: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:2717
msgid "This event has alarms"
msgstr "Denne hendelsen har varsel"
-#: ../calendar/gui/dialogs/event-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:875
#: ../calendar/gui/dialogs/event-page.glade.h:7
msgid "Cale_ndar:"
msgstr "Kale_nder:"
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:881
#: ../calendar/gui/dialogs/event-page.glade.h:13
#: ../calendar/gui/dialogs/meeting-page.glade.h:5
#: ../calendar/gui/dialogs/task-page.c:446
msgid "Or_ganizer:"
msgstr "Or_ganisator:"
-#: ../calendar/gui/dialogs/event-page.c:917
+#: ../calendar/gui/dialogs/event-page.c:919
msgid "_Delegatees"
msgstr "_Delegater"
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:921
msgid "Atte_ndees"
msgstr "De_ltakere"
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1089
msgid "Event with no start date"
msgstr "Hendelse uten startdato"
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1092
msgid "Event with no end date"
msgstr "Hendelse uten sluttdato"
-#: ../calendar/gui/dialogs/event-page.c:1258
+#: ../calendar/gui/dialogs/event-page.c:1260
#: ../calendar/gui/dialogs/task-page.c:852
msgid "Start date is wrong"
msgstr "Startdato er feil"
-#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/event-page.c:1270
msgid "End date is wrong"
msgstr "Sluttdato er feil"
-#: ../calendar/gui/dialogs/event-page.c:1291
+#: ../calendar/gui/dialogs/event-page.c:1293
msgid "Start time is wrong"
msgstr "Tid for start er feil"
-#: ../calendar/gui/dialogs/event-page.c:1298
+#: ../calendar/gui/dialogs/event-page.c:1300
msgid "End time is wrong"
msgstr "Tid for slutt er feil"
-#: ../calendar/gui/dialogs/event-page.c:1453
+#: ../calendar/gui/dialogs/event-page.c:1455
#: ../calendar/gui/dialogs/meeting-page.c:469
#: ../calendar/gui/dialogs/task-page.c:909
msgid "The organizer selected no longer has an account."
msgstr "Valgt organisator har ingen konto lenger."
-#: ../calendar/gui/dialogs/event-page.c:1459
+#: ../calendar/gui/dialogs/event-page.c:1461
#: ../calendar/gui/dialogs/meeting-page.c:475
#: ../calendar/gui/dialogs/task-page.c:915
msgid "An organizer is required."
msgstr "En organisator kreves."
-#: ../calendar/gui/dialogs/event-page.c:1474
+#: ../calendar/gui/dialogs/event-page.c:1476
#: ../calendar/gui/dialogs/meeting-page.c:490
#: ../calendar/gui/dialogs/task-page.c:930
msgid "At least one attendee is required."
msgstr "Minst en deltaker kreves."
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1898
#: ../calendar/gui/dialogs/meeting-page.c:900
#: ../calendar/gui/dialogs/task-page.c:1203
msgid "_Add "
msgstr "_Legg til"
-#: ../calendar/gui/dialogs/event-page.c:2622
+#: ../calendar/gui/dialogs/event-page.c:2624
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "Kunne ikke åpne kalender «%s»."
-#: ../calendar/gui/dialogs/event-page.c:2917
+#: ../calendar/gui/dialogs/event-page.c:2920
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "%d dag før avtalen"
msgstr[1] "%d dager før avtalen"
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2928
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "%d time før avtalen"
msgstr[1] "%d timer før avtalen"
-#: ../calendar/gui/dialogs/event-page.c:2933
+#: ../calendar/gui/dialogs/event-page.c:2936
#, c-format
msgid "%d minute before appointement"
msgid_plural "%d minutes before appointment"
msgstr[0] "%d minutt før avtalen"
msgstr[1] "%d minutter før avtalen"
-#: ../calendar/gui/dialogs/event-page.c:2949
+#: ../calendar/gui/dialogs/event-page.c:2952
msgid "Customize"
msgstr "Tilpass"
@@ -6107,14 +6110,14 @@ msgstr "Tilpass"
#. When "None" is selected we want the field to be cleared.
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
-#: ../calendar/gui/dialogs/event-page.c:2954
+#: ../calendar/gui/dialogs/event-page.c:2957
#: ../calendar/gui/dialogs/meeting-page.c:321
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
#: ../calendar/gui/e-cal-model-tasks.c:649
#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
-#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:691
-#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:468
-#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:693
+#: ../mail/em-account-editor.c:1358 ../mail/em-account-prefs.c:475
+#: ../mail/em-junk-hook.c:78
#: ../plugins/calendar-weather/calendar-weather.c:370
#: ../plugins/calendar-weather/calendar-weather.c:424
#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
@@ -6126,17 +6129,17 @@ msgid "None"
msgstr "Ingen"
#: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid "1 day before appointment"
+msgstr "1 dag før avtalen"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:2
msgid "1 hour before appointment"
msgstr "en time før avtalen"
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:3
msgid "15 minutes before appointment"
msgstr "femten minutter før avtalen"
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "1 dag før avtalen"
-
#: ../calendar/gui/dialogs/event-page.glade.h:5
#: ../calendar/gui/dialogs/task-page.glade.h:1
msgid "Atte_ndees..."
@@ -6177,13 +6180,17 @@ msgstr "_Varsel"
msgid "_Time:"
msgstr "_Tid:"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
msgid "for"
msgstr "for"
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
#: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
msgid "until"
msgstr "til"
@@ -6363,43 +6370,90 @@ msgstr ""
msgid "Recurrence date is invalid"
msgstr "Gjenintreffingsdato er ugyldig"
-#: ../calendar/gui/dialogs/recurrence-page.c:926
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:928
msgid "on"
msgstr "på"
-#: ../calendar/gui/dialogs/recurrence-page.c:986
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:992
msgid "first"
msgstr "første"
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
msgid "third"
msgstr "tredje"
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
msgid "fourth"
msgstr "fjerde"
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
msgid "last"
msgstr "siste"
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
msgid "Other Date"
msgstr "Annen dato"
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+msgid "1st to 10th"
+msgstr "Første til tiende"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
+msgid "11th to 20th"
+msgstr "ellevte til tjuende"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
+msgid "21st to 31st"
+msgstr "tjueførste til trettiførste"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
msgid "day"
msgstr "dag"
-#: ../calendar/gui/dialogs/recurrence-page.c:1178
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1219
msgid "on the"
msgstr "den"
-#: ../calendar/gui/dialogs/recurrence-page.c:1367
+#: ../calendar/gui/dialogs/recurrence-page.c:1408
msgid "occurrences"
msgstr "gjentakelser"
-#: ../calendar/gui/dialogs/recurrence-page.c:2336
+#: ../calendar/gui/dialogs/recurrence-page.c:2377
msgid "Date/Time"
msgstr "Dato/klokkeslett"
@@ -6416,27 +6470,37 @@ msgstr "<b>Forhåndsvis</b>"
msgid "<b>Recurrence</b>"
msgstr "<b>Gjeninntreffelse</b>"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
msgid "Every"
msgstr "Hver"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
msgid "This appointment rec_urs"
msgstr "Denne avtalen _gjeninntreffer"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
msgid "forever"
msgstr "for alltid"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
msgid "month(s)"
msgstr "måned(er)"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
msgid "week(s)"
msgstr "uke(r)"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
msgid "year(s)"
msgstr "år"
@@ -6531,12 +6595,12 @@ msgstr "_Prioritet:"
msgid "_Web Page:"
msgstr "_Nettside:"
-#: ../calendar/gui/dialogs/task-editor.c:420
+#: ../calendar/gui/dialogs/task-editor.c:426
#: ../calendar/gui/tasks-component.c:1171
msgid "_Task"
msgstr "_Oppgave"
-#: ../calendar/gui/dialogs/task-editor.c:424
+#: ../calendar/gui/dialogs/task-editor.c:430
msgid "Task Details"
msgstr "Oppgavedetaljer"
@@ -6594,7 +6658,7 @@ msgid "_Manual"
msgstr "_Manuell"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
msgid "_Password:"
msgstr "_Passord:"
@@ -6863,7 +6927,7 @@ msgid "untitled_image.%s"
msgstr "bilde_uten_navn.%s"
#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1604 ../calendar/gui/e-memo-table.c:854
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
msgid "_Save As..."
msgstr "Lagre _som..."
@@ -6926,10 +6990,6 @@ msgstr "90%"
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:525
-msgid "Task Table"
-msgstr "Oppgavetabell"
-
#: ../calendar/gui/e-calendar-table.c:703
#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
msgid "Deleting selected objects"
@@ -6951,8 +7011,8 @@ msgid "Open _Web Page"
msgstr "_Åpne nettside"
#: ../calendar/gui/e-calendar-table.c:1177
-#: ../calendar/gui/e-calendar-view.c:1589
-#: ../calendar/gui/e-calendar-view.c:1605 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
#: ../mail/em-folder-view.c:1088
#: ../plugins/print-message/org-gnome-print-message.xml.h:3
#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:42
@@ -6962,15 +7022,15 @@ msgid "_Print..."
msgstr "S_kriv ut..."
#: ../calendar/gui/e-calendar-table.c:1181
-#: ../calendar/gui/e-calendar-view.c:1609 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "Kli_pp ut"
#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1592
-#: ../calendar/gui/e-calendar-view.c:1611 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:41
#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
@@ -7041,97 +7101,97 @@ msgstr "Flytter oppføringer"
msgid "Copying items"
msgstr "Kopierer oppføringer"
-#: ../calendar/gui/e-calendar-view.c:1583
+#: ../calendar/gui/e-calendar-view.c:1575
msgid "New _Appointment..."
msgstr "Ny _avtale..."
-#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1576
msgid "New All Day _Event"
msgstr "Ny avtale som varer h_ele dagen"
-#: ../calendar/gui/e-calendar-view.c:1585
+#: ../calendar/gui/e-calendar-view.c:1577
msgid "New _Meeting"
msgstr "Nytt _møte"
-#: ../calendar/gui/e-calendar-view.c:1586
+#: ../calendar/gui/e-calendar-view.c:1578
msgid "New _Task"
msgstr "Ny _oppgave"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1596
+#: ../calendar/gui/e-calendar-view.c:1588
msgid "_Current View"
msgstr "_Aktiv visning"
-#: ../calendar/gui/e-calendar-view.c:1598
+#: ../calendar/gui/e-calendar-view.c:1590
msgid "Select T_oday"
msgstr "Velg i_dag"
-#: ../calendar/gui/e-calendar-view.c:1599
+#: ../calendar/gui/e-calendar-view.c:1591
msgid "_Select Date..."
msgstr "_Velg dato..."
-#: ../calendar/gui/e-calendar-view.c:1615
+#: ../calendar/gui/e-calendar-view.c:1607
msgid "Cop_y to Calendar..."
msgstr "Kop_ier til kalender..."
-#: ../calendar/gui/e-calendar-view.c:1616
+#: ../calendar/gui/e-calendar-view.c:1608
msgid "Mo_ve to Calendar..."
msgstr "Fl_ytt til kalender..."
-#: ../calendar/gui/e-calendar-view.c:1617
+#: ../calendar/gui/e-calendar-view.c:1609
msgid "_Delegate Meeting..."
msgstr "_Deleger møte..."
-#: ../calendar/gui/e-calendar-view.c:1618
+#: ../calendar/gui/e-calendar-view.c:1610
msgid "_Schedule Meeting..."
msgstr "_Sett opp møte..."
-#: ../calendar/gui/e-calendar-view.c:1619
+#: ../calendar/gui/e-calendar-view.c:1611
msgid "_Forward as iCalendar..."
msgstr "_Videresend som iCalendar..."
-#: ../calendar/gui/e-calendar-view.c:1620
+#: ../calendar/gui/e-calendar-view.c:1612
msgid "_Reply"
msgstr "Sva_r"
-#: ../calendar/gui/e-calendar-view.c:1621 ../mail/em-folder-view.c:1082
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _All"
msgstr "Svar til _alle"
-#: ../calendar/gui/e-calendar-view.c:1626
+#: ../calendar/gui/e-calendar-view.c:1618
msgid "Make this Occurrence _Movable"
msgstr "Gjør denne hendelsen _flyttbar"
-#: ../calendar/gui/e-calendar-view.c:1627
+#: ../calendar/gui/e-calendar-view.c:1619
msgid "Delete this _Occurrence"
msgstr "Slett denne _hendelsen"
-#: ../calendar/gui/e-calendar-view.c:1628
+#: ../calendar/gui/e-calendar-view.c:1620
msgid "Delete _All Occurrences"
msgstr "Slett _alle hendelser"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2038
+#: ../calendar/gui/e-calendar-view.c:2030
#, c-format
msgid "Organizer: %s <%s>"
msgstr "Organisator: %s <%s>"
#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2042
+#: ../calendar/gui/e-calendar-view.c:2034
#, c-format
msgid "Organizer: %s"
msgstr "Organisator: %s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2057 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2049 ../calendar/gui/print.c:2336
#, c-format
msgid "Location: %s"
msgstr "Plassering: %s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2088
+#: ../calendar/gui/e-calendar-view.c:2080
#, c-format
msgid "Time: %s %s"
msgstr "Tidspunkt: %s %s"
@@ -7730,15 +7790,15 @@ msgstr "%d.%m.%Y"
#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
msgid "Out of Office"
-msgstr "Ute"
+msgstr "Borte fra kontoret"
#: ../calendar/gui/e-meeting-time-sel.c:413
msgid "No Information"
msgstr "Ingen informasjon"
#: ../calendar/gui/e-meeting-time-sel.c:427
-msgid "Con_tacts..."
-msgstr "Kon_takter..."
+msgid "A_ttendees..."
+msgstr "Del_takere..."
#: ../calendar/gui/e-meeting-time-sel.c:444
msgid "O_ptions"
@@ -7792,10 +7852,6 @@ msgstr "_Start-tid:"
msgid "_End time:"
msgstr "S_lutt-tid:"
-#: ../calendar/gui/e-memo-table.c:274
-msgid "Memo Table"
-msgstr "Notat-tabell"
-
#: ../calendar/gui/e-memo-table.c:870
msgid "_Delete Selected Memos"
msgstr "Sle_tt valgte notater"
@@ -7854,8 +7910,8 @@ msgid "Expunging"
msgstr "Tømmer"
#: ../calendar/gui/e-timezone-entry.c:133
-msgid "Timezone Button"
-msgstr "Tidssone-knapp"
+msgid "Select Timezone"
+msgstr "Velg tidssone"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
@@ -10196,8 +10252,8 @@ msgstr "Melding uten navn"
msgid "Open File"
msgstr "Åpne fil"
-#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:596
-#: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:598
+#: ../mail/em-account-editor.c:643 ../mail/em-account-editor.c:710
msgid "Autogenerated"
msgstr "Generert automatisk"
@@ -10345,7 +10401,7 @@ msgid "You need to configure an account before you can compose mail."
msgstr "Du må konfigurere en konto før du kan skrive meldinger."
#: ../composer/mail-composer.error.xml.h:28
-msgid "_Don't Recover"
+msgid "_Do not Recover"
msgstr "Ikke _gjenopprett"
#: ../composer/mail-composer.error.xml.h:29
@@ -10362,7 +10418,11 @@ msgstr "_Lagre melding"
msgid "Evolution"
msgstr "Evolution"
-#: ../data/evolution.desktop.in.in.h:2
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+msgid "Groupware Suite"
+msgstr "Gruppevareløsning"
+
+#: ../data/evolution.desktop.in.in.h:3
msgid "The Evolution Groupware Suite"
msgstr "Gruppevaresuiten Evolution"
@@ -10508,11 +10568,10 @@ msgid "Evolution Query"
msgstr "Evolution spørring"
#. setup a dummy error
-#: ../e-util/e-error.c:442
+#: ../e-util/e-error.c:443
#, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">Intern feil, ukjent feil «%s» etterspurt</span>"
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Intern feil, ukjent feil «%s» forespurt"
#: ../e-util/e-system.error.xml.h:2
msgid "Cannot open file &quot;{0}&quot;."
@@ -10530,7 +10589,7 @@ msgstr "Vil du overskrive den?"
msgid "File exists &quot;{0}&quot;."
msgstr "Filen &quot;{0}&quot; eksisterer."
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
msgid "_Overwrite"
msgstr "_Overskriv"
@@ -10609,20 +10668,19 @@ msgid "Choose a file"
msgstr "Velg en fil"
#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1052 ../mail/mail-config.c:85
-#: ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
msgid "Important"
msgstr "Viktig"
#. forest green
#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
-#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:146
msgid "To Do"
msgstr "Oppgaver"
#. blue
#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.c:89 ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:96
msgid "Later"
msgstr "Senere"
@@ -10699,7 +10757,7 @@ msgstr "Mangler dato."
msgid "Missing file name."
msgstr "Mangler filnavn."
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
msgid "Missing name."
msgstr "Mangler navn."
@@ -10847,6 +10905,7 @@ msgid "Mail"
msgstr "E-post"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:531
msgid "Mail Accounts"
msgstr "E-post-konti"
@@ -10877,92 +10936,88 @@ msgstr ""
"under nøye\n"
"og kryss av i ruten for å akseptere den\n"
-#: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:474 ../mail/em-filter-folder-element.c:237
#: ../mail/em-vfolder-rule.c:496
msgid "Select Folder"
msgstr "Velg mappe"
-#: ../mail/em-account-editor.c:768
+#: ../mail/em-account-editor.c:770
msgid "Ask for each message"
msgstr "Spør for hver melding"
-#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1749 ../mail/mail-config.glade.h:91
msgid "Identity"
msgstr "Identitet"
-#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:118
+#: ../mail/em-account-editor.c:1798 ../mail/mail-config.glade.h:118
msgid "Receiving Email"
msgstr "Innkommende e-post"
-#: ../mail/em-account-editor.c:1979
+#: ../mail/em-account-editor.c:1981
msgid "Automatically check for _new mail every"
msgstr "Se etter _nye meldinger automatisk"
-#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:130
msgid "Sending Email"
msgstr "Utgående e-post"
-#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2221 ../mail/mail-config.glade.h:68
msgid "Defaults"
msgstr "Forvalg"
#. Security settings
-#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2287 ../mail/mail-config.glade.h:123
#: ../plugins/exchange-operations/exchange-account-setup.c:317
msgid "Security"
msgstr "Sikkerhet"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2413
+#: ../mail/em-account-editor.c:2324 ../mail/em-account-editor.c:2415
msgid "Receiving Options"
msgstr "Alternativer for mottak"
-#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2414
+#: ../mail/em-account-editor.c:2325 ../mail/em-account-editor.c:2416
msgid "Checking for New Mail"
msgstr "Ser etter nye meldinger"
-#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2755 ../mail/mail-config.glade.h:34
msgid "Account Editor"
msgstr "Kontoredigering"
-#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2755 ../mail/mail-config.glade.h:80
msgid "Evolution Account Assistant"
msgstr "Evolution kontoassistent"
#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:407
+#: ../mail/em-account-prefs.c:409
msgid "Disable"
msgstr "Deaktiver"
#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
+#: ../mail/em-account-prefs.c:411
msgid "Enable"
msgstr "Aktiver"
#. translators: default account indicator
-#: ../mail/em-account-prefs.c:459
+#: ../mail/em-account-prefs.c:466
msgid "[Default]"
msgstr "[Forvalg]"
#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:512 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
#: ../plugins/plugin-manager/plugin-manager.c:205
#: ../plugins/publish-calendar/publish-calendar.c:474
msgid "Enabled"
msgstr "Aktivert"
-#: ../mail/em-account-prefs.c:518
+#: ../mail/em-account-prefs.c:524
msgid "Account name"
msgstr "Kontonavn"
-#: ../mail/em-account-prefs.c:520
+#: ../mail/em-account-prefs.c:526
msgid "Protocol"
msgstr "Protokoll"
-#: ../mail/em-account-prefs.c:525
-msgid "Mail Accounts Table"
-msgstr "Tabell med e-post-konti"
-
#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
#: ../mail/mail-config.c:967
msgid "Unnamed"
@@ -11137,8 +11192,7 @@ msgstr "Uønsket e-post"
msgid "Junk Test"
msgstr "Uønsket e-posttest"
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
msgid "Label"
msgstr "Etikett"
@@ -11264,7 +11318,7 @@ msgstr "Nullstill status"
msgid "<b>Then</b>"
msgstr "<b>Så</b> "
-#: ../mail/em-folder-browser.c:143
+#: ../mail/em-folder-browser.c:144
msgid "C_reate Search Folder From Search..."
msgstr "Opp_rett søkemappe fra søk..."
@@ -11316,7 +11370,7 @@ msgstr "Skisser"
#. translators: standard local mailbox names
#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:638
+#: ../plugins/exchange-operations/exchange-folder.c:597
msgid "Inbox"
msgstr "Innboks"
@@ -11402,7 +11456,7 @@ msgstr "_Ny mappe..."
msgid "_Rename..."
msgstr "End_re navn..."
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
msgid "_Empty Trash"
msgstr "_Tøm papirkurven"
@@ -11422,20 +11476,20 @@ msgid "C_opy"
msgstr "K_opier"
#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../plugins/groupwise-features/share-folder-common.c:145
#, c-format
msgid "Creating folder `%s'"
msgstr "Oppretter mappe «%s»"
#: ../mail/em-folder-utils.c:730
#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:388
msgid "Create folder"
msgstr "Opprett mappe"
#: ../mail/em-folder-utils.c:730
#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:388
msgid "Specify where to create the folder:"
msgstr "Spesifiser hvor mappen skal opprettes:"
@@ -11492,6 +11546,14 @@ msgstr "Merk som _gyldig melding"
msgid "Mark for Follo_w Up..."
msgstr "Merk for oppføl_ging..."
+#: ../mail/em-folder-view.c:1105
+msgid "_Label"
+msgstr "_Etikett"
+
+#: ../mail/em-folder-view.c:1106
+msgid "_None"
+msgstr "I_ngen"
+
#: ../mail/em-folder-view.c:1111
msgid "Fla_g Completed"
msgstr "Mer_k som fullført"
@@ -11713,17 +11775,18 @@ msgstr "_Tilpass bredde"
msgid "Show _Original Size"
msgstr "Vis _opprinnelig størrelse"
-#: ../mail/em-format-html-display.c:1665
-msgid "Attachment Button"
-msgstr "Vedleggsknapp"
+#: ../mail/em-format-html-display.c:1665 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Vedlegg"
#: ../mail/em-format-html-display.c:1872
msgid "Select folder to save all attachments..."
msgstr "Velg mappe å lagre alle vedlegg i..."
#: ../mail/em-format-html-display.c:1919
-msgid "Save Selected..."
-msgstr "Lagre valgte..."
+msgid "_Save Selected..."
+msgstr "_Lagre valgte..."
#. Cant i put in the number of attachments here ?
#: ../mail/em-format-html-display.c:1986
@@ -11741,10 +11804,6 @@ msgstr "L_agre"
msgid "S_ave All"
msgstr "L_agre alle"
-#: ../mail/em-format-html-display.c:2063
-msgid "Toggle Attachment Bar"
-msgstr "Slå av/på visning av vedleggsfelt"
-
#: ../mail/em-format-html-display.c:2065
msgid "No Attachment"
msgstr "Ingen vedlegg"
@@ -11825,7 +11884,7 @@ msgstr "Bcc"
#. pseudo-header
#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1000
+#: ../mail/em-mailer-prefs.c:1001
msgid "Mailer"
msgstr "E-postprogram"
@@ -11841,7 +11900,8 @@ msgstr "<I> (%R %Z)</I>"
#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:2
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
+#: ../widgets/misc/e-dateedit.c:363
msgid "Date"
msgstr "Dato"
@@ -12006,8 +12066,8 @@ msgid "Do not show this message again."
msgstr "Ikke vis denne meldingen igjen."
#: ../mail/em-utils.c:319
-msgid "Filters"
-msgstr "Filtre"
+msgid "Message Filters"
+msgstr "Meldingsfiltre"
#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
msgid "message"
@@ -12750,6 +12810,30 @@ msgstr "Opprett en ny e-postmappe"
msgid "Failed upgrading Mail settings or folders."
msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
+#: ../mail/mail-config.c:85
+msgid "I_mportant"
+msgstr "V_iktig"
+
+#. red
+#: ../mail/mail-config.c:86
+msgid "_Work"
+msgstr "Ar_beid"
+
+#. orange
+#: ../mail/mail-config.c:87
+msgid "_Personal"
+msgstr "_Personlig"
+
+#. forest green
+#: ../mail/mail-config.c:88
+msgid "_To Do"
+msgstr "_Oppgaver"
+
+#. blue
+#: ../mail/mail-config.c:89
+msgid "_Later"
+msgstr "_Senere"
+
#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
@@ -12914,10 +12998,6 @@ msgstr "Alltid krypter til _meg selv ved sending av kryptert e-post"
msgid "Attach original message"
msgstr "Legg ved opprinnelig melding"
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Vedlegg"
-
#: ../mail/mail-config.glade.h:46
msgid "Automatically insert _smiley images"
msgstr "Sett inn _smilefjes automatisk"
@@ -13352,23 +13432,24 @@ msgstr "Sva_rstil:"
msgid "_Script:"
msgstr "_Skript:"
-#: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
-msgstr "Vi_s animerte bilder"
-
+#. If enabled, show animation; if disabled, only display a static image without any animation
#: ../mail/mail-config.glade.h:173
+msgid "_Show image animations"
+msgstr "Vi_s animasjoner"
+
+#: ../mail/mail-config.glade.h:174
msgid "_Use Secure Connection:"
msgstr "Br_uk sikker forbindelse:"
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
msgid "_Use the same fonts as other applications"
msgstr "Br_uk samme skrifter som andre programmer"
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
msgid "color"
msgstr "farge"
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
msgid "description"
msgstr "beskrivelse"
@@ -13997,38 +14078,42 @@ msgid "Do you want the operation to be performed in the subfolders?"
msgstr "Vil du at operasjonen skal utføres i undermapper?"
#: ../mail/mail.error.xml.h:49
+msgid "Do you want to mark all messages as read?"
+msgstr "Vil du merke alle meldinger som lest?"
+
+#: ../mail/mail.error.xml.h:50
msgid "Do you wish to save your changes?"
msgstr "Vil du lagre dine endringer?"
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
msgid "Enter password."
msgstr "Oppgi passord."
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
msgid "Error loading filter definitions."
msgstr "Feil under lasting av filterdefinisjoner."
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
msgid "Error while performing operation."
msgstr "Feil under utføring av operasjon."
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
msgid "Error while {0}."
msgstr "Feil under {0}."
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
msgid "File exists but cannot overwrite it."
msgstr "Filen eksisterer men kan ikke overskrives."
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:56
msgid "File exists but is not a regular file."
msgstr "Filen eksisterer, men den er ikke en vanlig fil."
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:57
msgid "If you continue, you will not be able to recover these messages."
msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
msgid ""
"If you delete the folder, all of its contents and its subfolders contents "
"will be deleted permanently."
@@ -14036,11 +14121,11 @@ msgstr ""
"Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
"permanent."
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
msgid "If you proceed, all proxy accounts will be deleted permanently."
msgstr "Hvis du fortsetter vil stedfortrederkontoer bli slettet permanent."
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
@@ -14048,11 +14133,11 @@ msgstr ""
"Hvis du fortsetter vil all kontoinformasjon og\n"
"mellomtjenerinformasjon bli slettet permanent."
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
msgid "If you proceed, the account information will be deleted permanently."
msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
msgid ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
@@ -14060,19 +14145,19 @@ msgstr ""
"Hvis du avslutter vil ikke disse meldingene sendes før Evolution startes "
"igjen."
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
msgid "Ignore"
msgstr "Ignorer"
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
msgid "Invalid authentication"
msgstr "Ugyldig autentisering"
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
msgid "Mail filters automatically updated."
msgstr "E-postfiltre oppdatert automatisk."
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
msgid ""
"Many email systems add an Apparently-To header to messages that only have "
"BCC recipients. This header, if added, will list all of your recipients to "
@@ -14084,35 +14169,35 @@ msgstr ""
"meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
"Til: eller Cc:."
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
msgid "Mark all messages as read"
msgstr "Merk alle meldinger som lest"
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
msgid "Mark all messages as read in the selected folder"
msgstr "Merk alle meldinger i valgt mappe som lest"
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
msgid "Missing folder."
msgstr "Mangler mappe."
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
msgid "No sources selected."
msgstr "Ingen kilder valgt."
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
msgid "Opening too many messages at once may take a long time."
msgstr "Hvis du åpner for mange meldinger på en gang kan dette ta lang tid."
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
msgid "Please check your account settings and try again."
msgstr "Vennligst sjekk innstillingene for kontoen og prøv igjen."
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
msgid "Please enable the account or send using another account."
msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
msgid ""
"Please enter a valid email address in the To: field. You can search for "
"email addresses by clicking on the To: button next to the entry box."
@@ -14120,7 +14205,7 @@ msgstr ""
"Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan søke etter e-"
"postadresser ved å klikke på Til:-knappen ved siden av inntastingsfeltet."
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
msgid ""
"Please make sure the following recipients are willing and able to receive "
"HTML email:\n"
@@ -14132,50 +14217,50 @@ msgstr ""
"{0}\n"
"Send likevel?"
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
msgid "Please provide an unique name to identify this signature."
msgstr "Oppgi et unikt navn for å identifisere denne signaturen."
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
msgid "Please wait."
msgstr "Vennligst vent."
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
msgid "Problem migrating old mail folder &quot;{0}&quot;."
msgstr ""
"Det oppsto et problem under migrering av gammel meldingsmappe &quot;{0}"
"&quot;."
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
msgid "Querying server"
msgstr "Spør tjener"
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
msgid "Read receipt requested."
msgstr "Lesekvittering etterspurt."
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
msgstr ""
"Vil du virkelig slette mappen &quot;{0}&quot; og alle dens undermapper?"
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
msgid "Search Folders automatically updated."
msgstr "Søkemapper oppdatert automatisk."
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
msgid "Send Receipt"
msgstr "Send kvittering"
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
msgid "Signature Already Exists"
msgstr "Signaturen eksisterer allerede"
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
"cannot be renamed, moved, or deleted."
@@ -14183,7 +14268,7 @@ msgstr ""
"Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
"endre navn på, flytte eller slette disse."
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -14199,7 +14284,7 @@ msgstr ""
"meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
"Til: eller Cc:."
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
msgid ""
"The following Search Folder(s):\n"
"{0}\n"
@@ -14213,7 +14298,7 @@ msgstr ""
" &quot;{1}&quot;\n"
"og er nå oppdatert."
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
msgid ""
"The following filter rule(s):\n"
"{0}\n"
@@ -14227,7 +14312,7 @@ msgstr ""
" &quot;{1}&quot;\n"
"og er nå oppdatert."
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
msgid ""
"The message was sent via the &quot;sendmail&quot; external application. "
"Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14238,11 +14323,11 @@ msgstr ""
"Sendmail rapporterer den følgende feilmeldingen: status 67: mail not sent.\n"
"Meldingen er lagret i mappen Utboks. Sjekk meldingen for feil og send igjen."
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
msgid "The script file must exist and be executable."
msgstr "Skriptfilen må eksistere og være kjørbar."
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
@@ -14250,19 +14335,20 @@ msgstr ""
"Denne mappen er lagt til implisitt. Gå til redigering av søkemapper og legg "
"den inn eksplisitt hvis det er nødvendig."
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:109
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
msgstr ""
"Denne meldingen kan ikke sendes fordi kontoen du sender med ikke er aktiv"
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:110
msgid ""
"This message cannot be sent because you have not specified any recipients"
-msgstr "Denne meldingen kan ikke sendes fordi du ikke har oppgitt noen mottakere"
+msgstr ""
+"Denne meldingen kan ikke sendes fordi du ikke har oppgitt noen mottakere"
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
msgid ""
"This server does not support this type of authentication and may not support "
"authentication at all."
@@ -14270,15 +14356,21 @@ msgstr ""
"Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
"støtter autentisering i det hele tatt."
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
msgid "This signature has been changed, but has not been saved."
msgstr "Denne signaturen er endret, men er ikke lagret."
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr "Dette vil merke alle meldinger i valgt mappe med undermapper som lest."
+
+#: ../mail/mail.error.xml.h:114
msgid "Unable to connect to the GroupWise server."
msgstr "Kunne ikke koble til GroupWise-tjener."
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:115
msgid ""
"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
@@ -14286,39 +14378,39 @@ msgstr ""
"Kan ikke åpne skisse-mappen for denne kontoen. Vil du bruke forvalgt mappe "
"for skisser i stedet?"
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
msgid "Unable to read license file."
msgstr "Kan ikke lese lisensfilen."
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
msgid "Use _Default"
msgstr "Bruk _forvalg"
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
msgid "Use default drafts folder?"
msgstr "Bruk forvalgt mappe for skisser?"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
msgid "You have not filled in all of the required information."
msgstr "Du har ikke fylt ut all nødvendig informasjon."
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
msgid "You may not create two accounts with the same name."
msgstr "Du kan ikke opprette to kontoer med samme navn."
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
msgid "You must name this Search Folder."
msgstr "Du må gi navn til denne søkemappen."
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
msgid "You must specify a folder."
msgstr "Du må oppgi en mappe."
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -14328,27 +14420,27 @@ msgstr ""
"Enten ved å velge mappene individuelt og/eller å velge alle lokale mapper, "
"alle eksterne mapper eller begge deler."
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
msgstr "Din pålogging på tjener &quot;{0}&quot; som &quot;{0}&quot; feilet."
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
msgid "Your message with the subject &quot;{0}&quot; was not delivered."
msgstr "Din melding med emne &quot;{0}&quot; ble ikke levert."
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
msgid "_Append"
msgstr "_Legg til"
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
msgid "_Discard changes"
msgstr "_Forkast endringene"
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
msgid "_Expunge"
msgstr "T_øm"
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
msgid "_Open Messages"
msgstr "_Åpne meldinger"
@@ -14416,8 +14508,8 @@ msgid "%b %d %Y"
msgstr "%d %b %Y"
#: ../mail/message-list.c:2063
-msgid "Message List"
-msgstr "Meldingsliste"
+msgid "Messages"
+msgstr "Meldinger"
#: ../mail/message-list.c:3441
msgid "Generating message list"
@@ -14588,33 +14680,30 @@ msgstr ""
msgid "Restore Settings..."
msgstr "Gjenopprett innstillinger..."
-#: ../plugins/bbdb/bbdb.c:429
+#: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "Automatiske kontakter"
-#: ../plugins/bbdb/bbdb.c:438
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<span weight=\"bold\">Automatiske kontakter</span>"
-
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:451
+#: ../plugins/bbdb/bbdb.c:454
msgid ""
"_Automatically create entries in the addressbook when responding to mail"
msgstr "Opprett oppføringer i adresseboken _automatisk når du svarer på e-post"
-#: ../plugins/bbdb/bbdb.c:472
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">Kontakter for lynmeldinger</span>"
+#: ../plugins/bbdb/bbdb.c:475
+msgid "Instant Messaging Contacts"
+msgstr "Kontakter for lynmeldinger"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:485
+#: ../plugins/bbdb/bbdb.c:490
msgid ""
"Periodically synchronize contact information and images from gaim buddy list"
-msgstr "Synkroniser kontaktinformasjon og bilder fra vennelisten i Gaim periodisk"
+msgstr ""
+"Synkroniser kontaktinformasjon og bilder fra vennelisten i Gaim periodisk"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:502
+#: ../plugins/bbdb/bbdb.c:507
msgid "Synchronize with _buddy list now"
msgstr "Synkroniser med _vennelisten nå"
@@ -14753,8 +14842,8 @@ msgstr "Vil du bruke Evolution som forvalgt e-postprogram?"
#: ../plugins/default-source/default-source.c:82
#: ../plugins/default-source/default-source.c:109
-msgid "Mark as default folder"
-msgstr "Sett som forvalgt mappe"
+msgid "Mark as _default folder"
+msgstr "Merk som _forvalgt mappe"
#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
msgid "Default Sources"
@@ -14887,7 +14976,7 @@ msgid "Ch_eck for Supported Types"
msgstr "Sj_ekk støttede typer"
#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:164
+#: ../plugins/exchange-operations/exchange-contacts.c:165
msgid ""
"Evolution is in offline mode. You cannot create or modify folders now.\n"
"Please switch to online mode for such operations."
@@ -14932,7 +15021,7 @@ msgid "Your password will expire in the next %d days"
msgstr "Passordet ditt vil utløpe i løpet av de neste %d dagene"
#: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
msgid "Custom"
msgstr "Egendefinert"
@@ -15052,7 +15141,7 @@ msgstr "Mappenavn"
msgid "Folder Size"
msgstr "Mappestørrelse"
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:192
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
msgid "Subscribe to Other User's Folder"
msgstr "Abonner på annen brukers mappe"
@@ -15095,15 +15184,15 @@ msgstr "En_dre passord"
msgid "ok_button"
msgstr "ok_button"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
msgid "(Permission denied.)"
msgstr "(Tilgang nektet.)"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
msgid "Add User:"
msgstr "Legg til bruker:"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
msgid "Add User"
msgstr "Legg til bruker"
@@ -15168,7 +15257,7 @@ msgid "Select User"
msgstr "Velg bruker"
#: ../plugins/exchange-operations/exchange-user-dialog.c:182
-msgid "Addressbook..."
+msgid "Address Book..."
msgstr "Adressebok..."
#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
@@ -15696,19 +15785,19 @@ msgstr "Proxy-fanen vil kun være tilgjengelig når kontoen er tilkoblet."
msgid "The Proxy tab will be available only when the account is enabled."
msgstr "Proxyfanen vil kun være tilgjengelig når kontoen er aktivert."
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:322
msgid "Users"
msgstr "Brukere"
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:323
msgid "Enter the users and set permissions"
msgstr "Oppgi brukere og sett rettigheter"
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:342
msgid "New _Shared Folder..."
msgstr "Ny _delt mappe..."
-#: ../plugins/groupwise-features/share-folder-common.c:446
+#: ../plugins/groupwise-features/share-folder-common.c:450
msgid "Sharing"
msgstr "Deling"
@@ -15935,23 +16024,20 @@ msgstr ""
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:1994
msgid "_Delete message after acting"
msgstr "_Slett melding etter utført handling"
-#: ../plugins/itip-formatter/itip-formatter.c:2001
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">Søk etter konflikter</span>"
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
+msgid "Conflict Search"
+msgstr "Søk etter konflikter"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2019
msgid "Select the calendars to search for meeting conflicts"
msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr "Tabell for søk etter konflikter"
-
#. strftime format of a weekday and a date.
#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:32
#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
@@ -16758,14 +16844,18 @@ msgstr ""
"Manuell (via menyen Handlinger)"
#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr "P_ort:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
msgid "Publishing Location"
msgstr "Lokasjon for publisering"
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
msgid "Publishing _Frequency:"
msgstr "Publiserings_frekvens<"
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
msgid ""
"SSH\n"
"Public FTP\n"
@@ -16783,11 +16873,11 @@ msgstr ""
"Sikker WebDAV (HTTPS)\n"
"Egendefinert lokasjon"
-#: ../plugins/publish-calendar/publish-calendar.glade.h:19
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
msgid "Service _type:"
msgstr "_Type tjeneste:"
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
msgid "_File:"
msgstr "_Fil:"
@@ -17109,7 +17199,9 @@ msgstr "Start i frakoblet modus"
msgid ""
"The configuration version of Evolution, with major/minor/configuration level "
"(for example \"2.6.0\")."
-msgstr "Konfigurasjonsversjon for Evolution med større/mindre/konfigurasjonsnivå (for eksempel «2.6.0»)."
+msgstr ""
+"Konfigurasjonsversjon for Evolution med større/mindre/konfigurasjonsnivå "
+"(for eksempel «2.6.0»)."
#: ../shell/apps_evolution_shell.schemas.in.in.h:14
msgid "The default height for the main window, in pixels."
@@ -17127,7 +17219,9 @@ msgstr "Forvalgt bredde på sidelinjen i piksler."
msgid ""
"The last upgraded configuration version of Evolution, with major/minor/"
"configuration level (for example \"2.6.0\")."
-msgstr "Sist oppgradert konfigurasjonsversjon for Evolution, med major/minor/konfigurasjonsnivå (for eksempel «2.6.0»)."
+msgstr ""
+"Sist oppgradert konfigurasjonsversjon for Evolution, med major/minor/"
+"konfigurasjonsnivå (for eksempel «2.6.0»)."
#: ../shell/apps_evolution_shell.schemas.in.in.h:18
msgid ""
@@ -17294,10 +17388,6 @@ msgstr "Bug buddy kunne ikke kjøres."
msgid "translator-credits"
msgstr "Kjartan Maraas <kmaraas@gnome.org>"
-#: ../shell/e-shell-window-commands.c:544
-msgid "Groupware Suite"
-msgstr "Gruppevareløsning"
-
#: ../shell/e-shell-window-commands.c:775
msgid "_Work Online"
msgstr "Ar_beid tilkoblet"
@@ -17565,7 +17655,7 @@ msgstr "Oppgradering fra forrige versjon feilet: {0}"
#: ../shell/shell.error.xml.h:20
msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
"you only have {1} available.\n"
"\n"
"You will need to make more space available in your home directory before you "
@@ -17913,7 +18003,7 @@ msgid "_Edit CA Trust"
msgstr "R_ediger tillit til CA"
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:657
+#: ../smime/lib/e-cert-db.c:664
msgid "Certificate already exists"
msgstr "Sertifikatet eksisterer allerede"
@@ -18381,6 +18471,7 @@ msgid "Previews the calendar to be printed"
msgstr "Forhåndsviser av kalenderen som skal skrives ut"
#: ../ui/evolution-calendar.xml.h:17 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
msgid "Previous"
msgstr "Forrige"
@@ -18535,13 +18626,13 @@ msgstr "Sett _inn"
msgid "_Options"
msgstr "_Alternativer"
-#: ../ui/evolution-event-editor.xml.h:1
-msgid "Alar_ms"
-msgstr "_Varsel"
+#: ../ui/evolution-event-editor.xml.h:2
+msgid "All Day Event"
+msgstr "Avtale som varer hele dagen"
#: ../ui/evolution-event-editor.xml.h:3
-msgid "All day Event"
-msgstr "Avtale som varer hele dagen"
+msgid "All _Day Event"
+msgstr "Avtale som varer hele _dagen"
#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
#: ../ui/evolution-task-editor.xml.h:1
@@ -18584,7 +18675,7 @@ msgid "R_ole Field"
msgstr "R_olle-felt"
#: ../ui/evolution-event-editor.xml.h:16
-msgid "Show time as b_usy"
+msgid "Show time as _busy"
msgstr "Vis tiden som _opptatt"
#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
@@ -18617,7 +18708,7 @@ msgid "Toggles whether to display categories"
msgstr "Slår av/på visning av kategorier"
#: ../ui/evolution-event-editor.xml.h:24
-msgid "Toggles whether to have All day Event"
+msgid "Toggles whether to have All Day Event"
msgstr "Slår av/på hendelser som varer hele dagen"
#: ../ui/evolution-event-editor.xml.h:25
@@ -18625,8 +18716,8 @@ msgid "Toggles whether to show time as busy"
msgstr "Slår av/på visning av tid som opptatt"
#: ../ui/evolution-event-editor.xml.h:26
-msgid "_All day Event"
-msgstr "_Avtale som varer hele dagen"
+msgid "_Alarms"
+msgstr "V_arsel"
#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
#: ../ui/evolution-task-editor.xml.h:19
@@ -18756,12 +18847,12 @@ msgstr "Slå sammen alle _tråder"
msgid "Collapse all message threads"
msgstr "Slå sammen alle meldingstråder"
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:5
msgid "Copy selected message(s) to the clipboard"
msgstr "Kopier valgt(e) melding(er) til utklippstavlen"
#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7 ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:7
msgid "Cut selected message(s) to the clipboard"
msgstr "Klipp ut valgt(e) melding(er) til utklippstavlen"
@@ -18795,10 +18886,10 @@ msgid ""
msgstr "Skjul slettede meldinger heller enn å vise dem gjennomstreket"
#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k Messages as Read"
-msgstr "Mer_k meldinger som lest"
+msgid "Mar_k All Messages as Read"
+msgstr "Mer_k alle meldinger som lest"
-#: ../ui/evolution-mail-list.xml.h:17 ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-list.xml.h:17
msgid "Paste message(s) from the clipboard"
msgstr "Lim inn melding(er) fra utklippstavlen"
@@ -18900,10 +18991,14 @@ msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
msgid "Compose a reply to the sender of the selected message"
msgstr "Skriv et svar til avsender av den valgte meldingen"
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:12
msgid "Copy selected messages to another folder"
msgstr "Kopier valgte meldinger til en annen mappe"
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "Kopier valgte meldinger til utklippstavlen"
+
#: ../ui/evolution-mail-message.xml.h:14
msgid "Create R_ule"
msgstr "Opprett _regel"
@@ -18940,6 +19035,10 @@ msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
msgid "Create a rule to filter messages with this subject"
msgstr "Lag en regel for filtrering av meldinger med dette emnet"
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "Klipp ut valgte meldinger til utklippstavlen"
+
#: ../ui/evolution-mail-message.xml.h:24
msgid "Decrease the text size"
msgstr "Mindre skrift"
@@ -18953,12 +19052,12 @@ msgid "Display the next message"
msgstr "Vis neste melding"
#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next unread message"
-msgstr "Vis neste uleste melding"
+msgid "Display the next thread"
+msgstr "Vis neste tråd"
#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread thread"
-msgstr "Vis neste uleste tråd"
+msgid "Display the next unread message"
+msgstr "Vis neste uleste melding"
#: ../ui/evolution-mail-message.xml.h:30
msgid "Display the previous important message"
@@ -18997,8 +19096,8 @@ msgid "Filter the selected messages for junk status"
msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
-msgstr "Merk valgt(e) melding(er) for oppfølging"
+msgid "Flag selected messages for follow-up"
+msgstr "Merk valgte meldinger for oppfølging"
#: ../ui/evolution-mail-message.xml.h:40
msgid "Follow _Up..."
@@ -19033,36 +19132,36 @@ msgid "Mar_k as"
msgstr "Mer_k som"
#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
-msgstr "Merk valgt(e) melding(er) som lest"
+msgid "Mark the selected messages as having been read"
+msgstr "Merk valgte meldinger som lest"
#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
-msgstr "Merk valgt(e) melding(er) som viktige"
+msgid "Mark the selected messages as important"
+msgstr "Merk valgte meldinger som viktige"
#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as junk"
-msgstr "Merk valgt(e) melding(er) som uønsket e-post"
+msgid "Mark the selected messages as junk"
+msgstr "Merk valgte meldinger som uønsket e-post"
#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not being junk"
-msgstr "Merk valgt(e) melding(er) som ikke uønsket e-post"
+msgid "Mark the selected messages as not being junk"
+msgstr "Merk valgte meldinger som ønsket e-post"
#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
-msgstr "Merk valgt(e) melding(er) som ulest"
+msgid "Mark the selected messages as not having been read"
+msgstr "Merk valgte meldinger som ulest"
#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
-msgstr "Merk valgt(e) melding(er) som uviktige"
+msgid "Mark the selected messages as unimportant"
+msgstr "Merk valgte meldinger som uviktige"
#: ../ui/evolution-mail-message.xml.h:56
msgid "Mark the selected messages for deletion"
msgstr "Merk valgte meldinger for sletting"
#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected message(s) to another folder"
-msgstr "Flytt valgt(e) melding(er) til en annen mappe"
+msgid "Move selected messages to another folder"
+msgstr "Flytt valgte meldinger til en annen mappe"
#: ../ui/evolution-mail-message.xml.h:59
msgid "Next _Important Message"
@@ -19085,17 +19184,21 @@ msgid "Open a window for composing a mail message"
msgstr "Åpne et vindu for å skrive en e-post melding"
#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected message in a new window"
-msgstr "Åpne valgt melding i et nytt vindu"
+msgid "Open the selected messages in a new window"
+msgstr "Åpne valgte meldinger i et nytt vindu"
#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected message in the composer for editing"
-msgstr "Åpne valgt melding for redigering"
+msgid "Open the selected messages in the composer for editing"
+msgstr "Åpne valgte meldinger i redigeringskomponenten"
#: ../ui/evolution-mail-message.xml.h:66
msgid "P_revious Unread Message"
msgstr "Fo_rrige uleste melding"
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "Lim inn meldinger fra utklippstavlen"
+
#: ../ui/evolution-mail-message.xml.h:68
msgid "Pos_t New Message to Folder"
msgstr "Pos_t ny melding til mappe"
@@ -19137,8 +19240,8 @@ msgid "Reset the text to its original size"
msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
#: ../ui/evolution-mail-message.xml.h:85
-msgid "Save the message as a text file"
-msgstr "Lagre meldingen som en tekstfil"
+msgid "Save the selected messages as a text file"
+msgstr "Lagre valgte meldinger som tekstfiler"
#: ../ui/evolution-mail-message.xml.h:86
msgid "Search Folder from Mailing _List..."
@@ -19177,19 +19280,19 @@ msgid "Show a blinking cursor in the body of displayed messages"
msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show message in the normal style"
-msgstr "Vis melding i normal stil"
+msgid "Show messages in the normal style"
+msgstr "Vis meldinger med vanlig stil"
#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message with all email headers"
-msgstr "Vis melding med fulle e-post headere"
+msgid "Show messages with all email headers"
+msgstr "Vis meldinger med alle meldingshoder"
#: ../ui/evolution-mail-message.xml.h:97
msgid "Show the raw email source of the message"
msgstr "Vis e-post meldingen i sin råe form"
#: ../ui/evolution-mail-message.xml.h:98
-msgid "Un-delete the selected messages"
+msgid "Undelete the selected messages"
msgstr "Angre sletting av valgte meldinger"
#: ../ui/evolution-mail-message.xml.h:99
@@ -19589,12 +19692,12 @@ msgid "_Status Details"
msgstr "Detaljert _status"
#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr "Kopier valgt oppgave"
+msgid "Copy selected tasks"
+msgstr "Kopier valgte oppgaver"
#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
-msgstr "Klipp ut valgt oppgave"
+msgid "Cut selected tasks"
+msgstr "Klipp ut valgte oppgaver"
#: ../ui/evolution-tasks.xml.h:7
msgid "Delete completed tasks"
@@ -19613,8 +19716,8 @@ msgid "Mark selected tasks as complete"
msgstr "Merk valgte oppgaver som fullført"
#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
-msgstr "Lim inn oppgave fra utklippstavlen"
+msgid "Paste tasks from the clipboard"
+msgstr "Lim inn oppgaver fra utklippstavlen"
#: ../ui/evolution-tasks.xml.h:13
msgid "Previews the list of tasks to be printed"
@@ -20014,10 +20117,6 @@ msgstr "MTOTFLS"
msgid "%B %Y"
msgstr "%B %Y"
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-msgid "Previous Button"
-msgstr "Forrige knapp"
-
#: ../widgets/misc/e-calendar.c:226
msgid "Month Calendar"
msgstr "Månedskalender"
@@ -20191,32 +20290,24 @@ msgid "..."
msgstr "..."
#: ../widgets/misc/e-dateedit.c:321
-msgid "Date and Time Entry"
-msgstr "Felt for dato & klokkeslett"
+msgid "Date and Time"
+msgstr "Dato og klokkeslett"
#: ../widgets/misc/e-dateedit.c:340
msgid "Text entry to input date"
msgstr "Tekstfelt for å oppgi dato"
-#: ../widgets/misc/e-dateedit.c:341
-msgid "Text Date Entry"
-msgstr "Oppføring for datotekst"
-
#: ../widgets/misc/e-dateedit.c:362
msgid "Click this button to show a calendar"
msgstr "Klikk på denne knappen for å vise en kalender"
-#: ../widgets/misc/e-dateedit.c:363
-msgid "Date Button"
-msgstr "Datoknapp"
-
#: ../widgets/misc/e-dateedit.c:384
msgid "Combo box to select time"
msgstr "Kombinasjonsboks for å velge tid"
#: ../widgets/misc/e-dateedit.c:385
-msgid "Time Combo Box"
-msgstr "Tidskombinasjonsboks"
+msgid "Time"
+msgstr "Tid"
#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
@@ -20280,6 +20371,11 @@ msgstr "Indikatormellomrom"
msgid "Spacing around expander arrow"
msgstr "Mellomrom rundt utviderpilen"
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:163
+msgid "Advanced Search"
+msgstr "Avansert søk"
+
#: ../widgets/misc/e-filter-bar.c:202
msgid "_Searches"
msgstr "_Søk"
@@ -20348,8 +20444,8 @@ msgstr "Kolonnebredde"
#. To translators: This is the accessibility name of
#. the search bar's text entry widget
#: ../widgets/misc/e-search-bar.c:371
-msgid "Search Text Entry"
-msgstr "Felt for søketekst"
+msgid "Search"
+msgstr "Søk"
#: ../widgets/misc/e-search-bar.c:588
msgid "_Search"