Update Update

2005-01-27  Kjartan Maraas  <kmaraas@gnome.org>

	* nb.po: Update
	* no.po: Update

svn path=/trunk/; revision=28581

3 files changed, 10093 insertions, 9354 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index b9f9152bb7..2382169c6d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-27  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Update
+	* no.po: Update
+
 2005-01-27  Alexander Shopov  <ash@contact.bg>
 
 	* bg.po: Updated Bulgarian translation by
diff --git a/po/nb.po b/po/nb.po
index 8d616135fc..1ec4e01427 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-18 22:10+0100\n"
-"PO-Revision-Date: 2005-01-18 22:56+0100\n"
+"POT-Creation-Date: 2005-01-27 16:43+0100\n"
+"PO-Revision-Date: 2005-01-27 17:10+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -15,144 +15,145 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: a11y/addressbook/ea-addressbook-view.c:94
-#: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:172
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:172
 msgid "evolution addressbook"
 msgstr "evolution adressebok"
 
-#: a11y/addressbook/ea-minicard.c:31
-#: calendar/gui/alarm-notify/alarm-queue.c:863
-#: ui/evolution-message-composer.xml.h:10
+#: ../a11y/addressbook/ea-minicard.c:31
+#: ../calendar/gui/alarm-notify/alarm-queue.c:863
+#: ../ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Åpne"
 
-#: a11y/addressbook/ea-minicard.c:138
+#: ../a11y/addressbook/ea-minicard.c:138
 msgid "Contact List: "
 msgstr "Kontaktliste: "
 
-#: a11y/addressbook/ea-minicard.c:139
+#: ../a11y/addressbook/ea-minicard.c:139
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: a11y/addressbook/ea-minicard.c:165
+#: ../a11y/addressbook/ea-minicard.c:165
 msgid "evolution minicard"
 msgstr "evolution minikort"
 
-#: a11y/addressbook/ea-minicard-view.c:34
-#: addressbook/gui/component/addressbook-component.c:97
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:97
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: a11y/addressbook/ea-minicard-view.c:35
-#: addressbook/gui/component/addressbook-component.c:105
+#: ../a11y/addressbook/ea-minicard-view.c:35
+#: ../addressbook/gui/component/addressbook-component.c:105
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: a11y/addressbook/ea-minicard-view.c:153
+#: ../a11y/addressbook/ea-minicard-view.c:153
 msgid "current addressbook folder "
 msgstr "aktiv adressebokmappe "
 
-#: a11y/addressbook/ea-minicard-view.c:154
+#: ../a11y/addressbook/ea-minicard-view.c:154
 msgid "have "
 msgstr "har "
 
-#: a11y/addressbook/ea-minicard-view.c:154
+#: ../a11y/addressbook/ea-minicard-view.c:154
 msgid "has "
 msgstr "har "
 
-#: a11y/addressbook/ea-minicard-view.c:156
+#: ../a11y/addressbook/ea-minicard-view.c:156
 msgid " cards"
 msgstr " kort"
 
-#: a11y/addressbook/ea-minicard-view.c:156
+#: ../a11y/addressbook/ea-minicard-view.c:156
 msgid " card"
 msgstr " kort"
 
-#: a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "New Appointment"
 msgstr "Ny avtale"
 
-#: a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:307
 msgid "New All Day Event"
 msgstr "Ny avtale som varer hele dagen"
 
-#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1366
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1366
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:309
 msgid "Go to Today"
 msgstr "Gå til i dag"
 
-#: a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:310
 msgid "Go to Date"
 msgstr "Gå til dato"
 
-#: a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "alarm "
 msgstr "varsel "
 
-#: a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "recurrence "
 msgstr "gjeninntreffelse "
 
-#: a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:247
 msgid "time-zone "
 msgstr "tidssone "
 
-#: a11y/calendar/ea-cal-view-event.c:253
+#: ../a11y/calendar/ea-cal-view-event.c:253
 msgid "meeting "
 msgstr "møte"
 
-#: a11y/calendar/ea-cal-view-event.c:258
+#: ../a11y/calendar/ea-cal-view-event.c:258
 msgid "event. Summary is "
 msgstr "hendelse. Sammendraget er "
 
-#: a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "empty"
 msgstr "tomt"
 
-#: a11y/calendar/ea-cal-view-event.c:288
+#: ../a11y/calendar/ea-cal-view-event.c:288
 msgid "calendar view event"
 msgstr "vis kalenderhendelse"
 
-#: a11y/calendar/ea-cal-view-event.c:505
+#: ../a11y/calendar/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "Ta fokus"
 
-#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:147 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid ", %d event"
 msgstr ", %d hendelse"
 
-#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:147 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid ", %d events"
 msgstr ", %d hendelser"
 
-#: a11y/calendar/ea-day-view.c:150
+#: ../a11y/calendar/ea-day-view.c:150
 msgid "work week view :"
 msgstr "arbeidsukevisning:"
 
-#: a11y/calendar/ea-day-view.c:154
+#: ../a11y/calendar/ea-day-view.c:154
 msgid "day view :"
 msgstr "dagvisning:"
 
-#: a11y/calendar/ea-day-view.c:181
+#: ../a11y/calendar/ea-day-view.c:181
 msgid "calendar view for a work week"
 msgstr "kalendervisning for en arbeidsuke"
 
-#: a11y/calendar/ea-day-view.c:183
+#: ../a11y/calendar/ea-day-view.c:183
 msgid "calendar view for one or more days"
 msgstr "kalendervisning for en eller flere dager"
 
-#: a11y/calendar/ea-day-view-main-item.c:299
-#: a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "en tabell som viser og velger aktivt tidsområde"
 
-#: a11y/calendar/ea-gnome-calendar.c:187 calendar/gui/calendar-component.c:520
+#: ../a11y/calendar/ea-gnome-calendar.c:187
+#: ../calendar/gui/calendar-component.c:520
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -162,22 +163,30 @@ msgstr "%A %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:523
-#: calendar/gui/e-day-view.c:1511 calendar/gui/e-day-view-top-item.c:719
-#: calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c:190
+#: ../calendar/gui/calendar-component.c:523 ../calendar/gui/e-day-view.c:1511
+#: ../calendar/gui/e-day-view-top-item.c:719
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:192 a11y/calendar/ea-gnome-calendar.c:197
-#: a11y/calendar/ea-gnome-calendar.c:199 calendar/gui/calendar-component.c:525
-#: calendar/gui/calendar-component.c:530 calendar/gui/calendar-component.c:532
+#: ../a11y/calendar/ea-gnome-calendar.c:192
+#: ../a11y/calendar/ea-gnome-calendar.c:197
+#: ../a11y/calendar/ea-gnome-calendar.c:199
+#: ../calendar/gui/calendar-component.c:525
+#: ../calendar/gui/calendar-component.c:530
+#: ../calendar/gui/calendar-component.c:532
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: a11y/calendar/ea-gnome-calendar.c:216 a11y/calendar/ea-gnome-calendar.c:222
-#: a11y/calendar/ea-gnome-calendar.c:228 a11y/calendar/ea-gnome-calendar.c:230
-#: calendar/gui/calendar-component.c:544 calendar/gui/calendar-component.c:551
-#: calendar/gui/calendar-component.c:557 calendar/gui/calendar-component.c:559
+#: ../a11y/calendar/ea-gnome-calendar.c:216
+#: ../a11y/calendar/ea-gnome-calendar.c:222
+#: ../a11y/calendar/ea-gnome-calendar.c:228
+#: ../a11y/calendar/ea-gnome-calendar.c:230
+#: ../calendar/gui/calendar-component.c:544
+#: ../calendar/gui/calendar-component.c:551
+#: ../calendar/gui/calendar-component.c:557
+#: ../calendar/gui/calendar-component.c:559
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -186,89 +195,104 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:549
-#: calendar/gui/e-day-view.c:1527 calendar/gui/e-day-view-top-item.c:723
-#: calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c:220
+#: ../calendar/gui/calendar-component.c:549 ../calendar/gui/e-day-view.c:1527
+#: ../calendar/gui/e-day-view-top-item.c:723
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:247 a11y/calendar/ea-gnome-calendar.c:255
-#: calendar/importers/icalendar-importer.c:734
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../calendar/importers/icalendar-importer.c:726
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
-#: a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr "søkefelt"
 
-#: a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "søkefelt for Evolution kalender"
 
-#: a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:149
 msgid "Jump button"
 msgstr ""
 
-#: a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:158
 msgid "Click here, you can find more events."
 msgstr "Klikk her for å finne flere hendelser."
 
-#: a11y/calendar/ea-week-view.c:153
+#: ../a11y/calendar/ea-week-view.c:153
 msgid "month view :"
 msgstr "månedsvisning:"
 
-#: a11y/calendar/ea-week-view.c:158
+#: ../a11y/calendar/ea-week-view.c:158
 msgid "week view :"
 msgstr "ukevisning:"
 
-#: a11y/calendar/ea-week-view.c:185
+#: ../a11y/calendar/ea-week-view.c:185
 msgid "calendar view for a month"
 msgstr "kalendervisning for en måned"
 
-#: a11y/calendar/ea-week-view.c:187
+#: ../a11y/calendar/ea-week-view.c:187
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: a11y/widgets/ea-calendar-item.c:293 a11y/widgets/ea-calendar-item.c:299
+#: ../a11y/widgets/ea-calendar-item.c:293
+#: ../a11y/widgets/ea-calendar-item.c:299
 msgid " %d %B %Y"
 msgstr " %d %B %Y"
 
-#: a11y/widgets/ea-calendar-item.c:301
+#: ../a11y/widgets/ea-calendar-item.c:301
 msgid "calendar (from "
 msgstr "kalender (fra "
 
-#: a11y/widgets/ea-calendar-item.c:303
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
+#: ../a11y/widgets/ea-calendar-item.c:303
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
 msgid " to "
 msgstr " til "
 
-#: a11y/widgets/ea-calendar-item.c:305
+#: ../a11y/widgets/ea-calendar-item.c:305
 msgid ")"
 msgstr ")"
 
-#: a11y/widgets/ea-calendar-item.c:337
+#: ../a11y/widgets/ea-calendar-item.c:337
 msgid "evolution calendar item"
 msgstr "Evolution kalenderoppføring"
 
+#: ../a11y/widgets/ea-combo-button.c:40
+msgid "Combo Button"
+msgstr "Komboknapp"
+
+#: ../a11y/widgets/ea-combo-button.c:50
+msgid "Activate Default"
+msgstr "Bruk forvalg"
+
+#: ../a11y/widgets/ea-combo-button.c:52
+msgid "Popup Menu"
+msgstr "Sprettoppmeny"
+
 #. addressbook:ldap-init primary
-#: addressbook/addressbook-errors.xml.h:2
+#: ../addressbook/addressbook-errors.xml.h:2
 msgid "This addressbook could not be opened."
 msgstr "Denne adresseboken kunne ikke åpnes."
 
 #. addressbook:ldap-init secondary
-#: addressbook/addressbook-errors.xml.h:4
+#: ../addressbook/addressbook-errors.xml.h:4
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 
 #. addressbook:ldap-auth primary
-#: addressbook/addressbook-errors.xml.h:6
+#: ../addressbook/addressbook-errors.xml.h:6
 msgid "Failed to authenticate with LDAP server."
 msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. addressbook:ldap-auth secondary
-#: addressbook/addressbook-errors.xml.h:8
+#: ../addressbook/addressbook-errors.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -276,12 +300,12 @@ msgid ""
 msgstr ""
 
 #. addressbook:ldap-search-base primary
-#: addressbook/addressbook-errors.xml.h:10
+#: ../addressbook/addressbook-errors.xml.h:10
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "Denne adresseboktjeneren har ingen foreslått søkebase."
 
 #. addressbook:ldap-search-base secondary
-#: addressbook/addressbook-errors.xml.h:12
+#: ../addressbook/addressbook-errors.xml.h:12
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -289,37 +313,37 @@ msgid ""
 msgstr ""
 
 #. addressbook:ldap-v3-schema primary
-#: addressbook/addressbook-errors.xml.h:14
+#: ../addressbook/addressbook-errors.xml.h:14
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon."
 
 #. addressbook:ldap-get-schema primary
-#: addressbook/addressbook-errors.xml.h:16
+#: ../addressbook/addressbook-errors.xml.h:16
 msgid "Could not get schema information for LDAP server."
 msgstr "Kunne ikke hente schema-informasjon fra LDAP-tjener."
 
 #. addressbook:ldap-invalid-schema primary
-#: addressbook/addressbook-errors.xml.h:18
+#: ../addressbook/addressbook-errors.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
 
 #. addressbook:remove-addressbook primary
-#: addressbook/addressbook-errors.xml.h:20
+#: ../addressbook/addressbook-errors.xml.h:20
 msgid "Could not remove addressbook."
 msgstr "Kunne ikke fjerne adressebok."
 
 #. addressbook:ask-delete-addressbook primary
-#: addressbook/addressbook-errors.xml.h:22
+#: ../addressbook/addressbook-errors.xml.h:22
 msgid "Delete address book '{0}'?"
 msgstr "Slett adressebok «{0}»?"
 
 #. addressbook:ask-delete-addressbook secondary
-#: addressbook/addressbook-errors.xml.h:24
+#: ../addressbook/addressbook-errors.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "Denne adresseboken vil bli slettet for godt."
 
 #. addressbook:edit-categories primary
-#: addressbook/addressbook-errors.xml.h:26
+#: ../addressbook/addressbook-errors.xml.h:26
 msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
@@ -334,85 +358,85 @@ msgstr "Kategori editor ikke tilgjengelig."
 #. mail:session-message-error-cancel secondary
 #. mail:ask-session-password secondary
 #. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:28
-#: addressbook/addressbook-errors.xml.h:36
-#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:70
-#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
-#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
-#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
-#: mail/mail-errors.xml.h:88
+#: ../addressbook/addressbook-errors.xml.h:28
+#: ../addressbook/addressbook-errors.xml.h:36
+#: ../addressbook/addressbook-errors.xml.h:40 ../mail/mail-errors.xml.h:75
+#: ../mail/mail-errors.xml.h:77 ../mail/mail-errors.xml.h:79
+#: ../mail/mail-errors.xml.h:81 ../mail/mail-errors.xml.h:83
+#: ../mail/mail-errors.xml.h:85 ../mail/mail-errors.xml.h:89
+#: ../mail/mail-errors.xml.h:93
 msgid "{0}"
 msgstr "{0}"
 
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
 #. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:30
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+#: ../addressbook/addressbook-errors.xml.h:30
+#: ../composer/mail-composer-errors.xml.h:4 ../mail/mail-errors.xml.h:97
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:32
+#: ../addressbook/addressbook-errors.xml.h:32
 msgid "Unable to open addressbook"
 msgstr "Kan ikke åpne adressebok"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:34
+#: ../addressbook/addressbook-errors.xml.h:34
 msgid "Error loading addressbook."
 msgstr "Feil under lasting av adressebok."
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:38
+#: ../addressbook/addressbook-errors.xml.h:38
 msgid "Unable to perform search."
 msgstr "Kan ikke utføre søk."
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:42
+#: ../addressbook/addressbook-errors.xml.h:42
 msgid "Would you like to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:44
+#: ../addressbook/addressbook-errors.xml.h:44
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 "Du har gjort endringer for denne kontakten. Vil du lagre disse endringene?"
 
-#: addressbook/addressbook-errors.xml.h:45
+#: ../addressbook/addressbook-errors.xml.h:45
 msgid "_Discard"
 msgstr "_Forkast"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:47
+#: ../addressbook/addressbook-errors.xml.h:47
 msgid "Cannot move contact."
 msgstr "Kan ikke flytte kontakt."
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:49
+#: ../addressbook/addressbook-errors.xml.h:49
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
 #. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:51
+#: ../addressbook/addressbook-errors.xml.h:51
 msgid "Unable to save contact(s)."
 msgstr "Kan ikke lagre kontakt(er)."
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:53
+#: ../addressbook/addressbook-errors.xml.h:53
 msgid "Error saving contacts to {0}: {1}"
 msgstr "Feil under lagring av kontakter til {0}: {1}"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:55
+#: ../addressbook/addressbook-errors.xml.h:55
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution adressebok avsluttet uventet."
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:57
+#: ../addressbook/addressbook-errors.xml.h:57
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
@@ -420,158 +444,161 @@ msgstr ""
 "nytt."
 
 #. addressbook:ask-list-add-exists primary
-#: addressbook/addressbook-errors.xml.h:59
+#: ../addressbook/addressbook-errors.xml.h:59
 msgid "Address '{0}' already exists."
 msgstr "Adressen «{0}» eksisterer allerede."
 
 #. addressbook:ask-list-add-exists secondary
-#: addressbook/addressbook-errors.xml.h:61
+#: ../addressbook/addressbook-errors.xml.h:61
 msgid ""
 "A contact already exists with this address.  Would you like to add a new "
 "card with the same address anyway?"
-msgstr "En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny kontakt med samme adresse likevel?"
+msgstr ""
+"En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny "
+"kontakt med samme adresse likevel?"
 
-#: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494
-#: plugins/shared-folder/properties.glade.h:17
+#: ../addressbook/addressbook-errors.xml.h:62 ../mail/em-vfolder-rule.c:494
+#: ../plugins/shared-folder/properties.glade.h:10
 msgid "_Add"
 msgstr "_Legg til"
 
-#: addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Forvalgt synkroniseringsadresse:"
 
-#: addressbook/conduit/address-conduit.c:1183
-#: addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1183
+#: ../addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "Kunne ikke laste adressebok"
 
-#: addressbook/conduit/address-conduit.c:1252
-#: addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1252
+#: ../addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: addressbook/gui/component/addressbook.c:98
+#: ../addressbook/gui/component/addressbook.c:98
 msgid "Accessing LDAP Server anonymously"
 msgstr "Aksesserer LDAP-tjener anonymt"
 
-#: addressbook/gui/component/addressbook.c:185
-#: plugins/groupwise-account-setup/camel-gw-listener.c:476
+#: ../addressbook/gui/component/addressbook.c:185
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:476
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
-#: addressbook/gui/component/addressbook.c:192
-#: plugins/groupwise-account-setup/camel-gw-listener.c:460
+#: ../addressbook/gui/component/addressbook.c:192
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:460
+#: ../plugins/send-options/send-options.c:82
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
 
-#: addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-component.c:98
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:99
+#: ../addressbook/gui/component/addressbook-component.c:99
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:106
+#: ../addressbook/gui/component/addressbook-component.c:106
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-component.c:107
+#: ../addressbook/gui/component/addressbook-component.c:107
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:113
-#: addressbook/gui/component/addressbook-config.c:1116
-#: addressbook/gui/component/addressbook-view.c:757
+#: ../addressbook/gui/component/addressbook-component.c:113
+#: ../addressbook/gui/component/addressbook-config.c:1115
+#: ../addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook-component.c:114
+#: ../addressbook/gui/component/addressbook-component.c:114
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: addressbook/gui/component/addressbook-component.c:115
+#: ../addressbook/gui/component/addressbook-component.c:115
 msgid "Create a new address book"
 msgstr "Opprett en ny adressebok"
 
-#: addressbook/gui/component/addressbook-component.c:188
+#: ../addressbook/gui/component/addressbook-component.c:188
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for adressebok."
 
-#: addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
-msgstr ""
+msgstr "Basis"
 
-#: addressbook/gui/component/addressbook-config.c:510
-#: calendar/gui/dialogs/calendar-setup.c:191
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../addressbook/gui/component/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:191
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type:"
 
-#: addressbook/gui/component/addressbook-config.c:609
+#: ../addressbook/gui/component/addressbook-config.c:609
 msgid "Copy book content locally for offline operation"
 msgstr "Kopier innholdet i adresseboken lokalt for frakoblet operasjon"
 
-#: addressbook/gui/component/addressbook-config.c:904
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/calendar-setup.c:361
-#: calendar/gui/dialogs/calendar-setup.c:372
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: mail/em-folder-properties.c:213 mail/mail-config.glade.h:85
-#: smime/gui/smime-ui.glade.h:27
+#: ../addressbook/gui/component/addressbook-config.c:904
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:361
+#: ../calendar/gui/dialogs/calendar-setup.c:372
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../mail/em-folder-properties.c:214 ../mail/mail-config.glade.h:85
+#: ../smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/addressbook-config.c:905
-#: mail/importers/pine-importer.c:479
+#: ../addressbook/gui/component/addressbook-config.c:905
+#: ../mail/importers/pine-importer.c:479
 msgid "Addressbook"
 msgstr "Adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Server Information"
 msgstr "Tjenerinformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:911
+#: ../addressbook/gui/component/addressbook-config.c:911
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: addressbook/gui/component/addressbook-config.c:914
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:12 smime/gui/smime-ui.glade.h:19
+#: ../addressbook/gui/component/addressbook-config.c:914
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../mail/mail-dialogs.glade.h:12 ../smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljer"
 
-#: addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Searching"
 msgstr "Søker"
 
-#: addressbook/gui/component/addressbook-config.c:917
+#: ../addressbook/gui/component/addressbook-config.c:917
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: addressbook/gui/component/addressbook-config.c:1114
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1113
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
-#: addressbook/gui/component/addressbook-migrate.c:72
-#: calendar/gui/migration.c:142 mail/em-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:72
+#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Migrerer..."
 
-#: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:189 mail/em-migrate.c:1201
+#: ../addressbook/gui/component/addressbook-migrate.c:124
+#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
 
 #. create the local source group
 #. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/migration.c:452 calendar/gui/migration.c:545
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-component.c:270 mail/mail-vfolder.c:218
+#: ../addressbook/gui/component/addressbook-migrate.c:493
+#: ../calendar/gui/migration.c:452 ../calendar/gui/migration.c:545
+#: ../mail/em-folder-tree-model.c:196 ../mail/em-folder-tree-model.c:198
+#: ../mail/mail-component.c:270 ../mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
@@ -579,28 +606,28 @@ msgstr "På denne datamaskinen"
 #. Create the default Person calendar
 #. Create the default Person task list
 #. orange
-#: addressbook/gui/component/addressbook-migrate.c:501
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: calendar/gui/migration.c:460 calendar/gui/migration.c:553
-#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:77
-#: mail/mail-config.glade.h:102
+#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/migration.c:460 ../calendar/gui/migration.c:553
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1013
+#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:102
 msgid "Personal"
 msgstr "Personlig"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:509
+#: ../addressbook/gui/component/addressbook-migrate.c:509
 msgid "On LDAP Servers"
 msgstr "På LDAP-tjenere"
 
-#: addressbook/gui/component/addressbook-migrate.c:637
+#: ../addressbook/gui/component/addressbook-migrate.c:637
 msgid "LDAP Servers"
 msgstr "LDAP-tjenere"
 
-#: addressbook/gui/component/addressbook-migrate.c:752
+#: ../addressbook/gui/component/addressbook-migrate.c:752
 msgid "Autocompletion Settings"
 msgstr "Innstillinger for autofullføring"
 
-#: addressbook/gui/component/addressbook-migrate.c:1123
+#: ../addressbook/gui/component/addressbook-migrate.c:1123
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -612,7 +639,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -622,7 +649,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1146
+#: ../addressbook/gui/component/addressbook-migrate.c:1146
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -632,7 +659,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1156
+#: ../addressbook/gui/component/addressbook-migrate.c:1156
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -642,245 +669,250 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-view.c:758
-#: addressbook/gui/widgets/e-addressbook-view.c:934
-#: calendar/gui/calendar-component.c:386 calendar/gui/tasks-component.c:330
-#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
+#: ../addressbook/gui/component/addressbook-view.c:758
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/calendar-component.c:386
+#: ../calendar/gui/tasks-component.c:330 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:24 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-view.c:760
-#: calendar/gui/calendar-component.c:387 calendar/gui/tasks-component.c:331
+#: ../addressbook/gui/component/addressbook-view.c:760
+#: ../calendar/gui/calendar-component.c:387
+#: ../calendar/gui/tasks-component.c:331
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
 #. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1119
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: calendar/gui/migration.c:378
+#: ../addressbook/gui/component/addressbook-view.c:1119
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../calendar/gui/migration.c:378
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-view.c:1130
+#: ../addressbook/gui/component/addressbook-view.c:1130
 msgid "Contact Source Selector"
 msgstr "Valg av kontaktkilde"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList XML for listen med URIer for fullføring"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML for listen med URIer for fullføring"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "Position of the vertical pane in main view"
 msgstr "Plassering av vertikalt felt i hovedvisningen"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "Position of the vertical pane in main view."
 msgstr "Plassering av vertikalt felt i hovedvisningen."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
-#: mail/evolution-mail.schemas.in.in.h:71
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Vis forhåndsvisningsvinduet"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-#: mail/evolution-mail.schemas.in.in.h:72
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Vis forhåndsvisningsvinduet."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete"
 msgstr ""
 "Antall tegn som må skrives før Evolution forsøker automatisk fullføring"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr "Antall tegn som må skrives før Evolution forsøker automatisk fullføring."
+msgstr ""
+"Antall tegn som må skrives før Evolution forsøker automatisk fullføring."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for sist brukt mappe i dialogen for å velge navn"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for sist brukt mappe i dialogen for å velge navn."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
 msgstr "Autofullføring"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "K_ontakter"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "Sertifikater"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "Konfigurer automatisk fullføring her"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook"
 msgstr "Evolution adressebok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Evolution adressebok adressedialog"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address viewer"
 msgstr "Evolution adressebok adressevisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook card viewer"
 msgstr "Evolution adressebok kortvisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook component"
 msgstr "Evolution adressebok-komponent"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Kontroll for S/MIME sertifikathåndtering for Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
 msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
 msgstr "Håndter dine S/MIME-sertifikater her"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fullname.glade.h:1
-#: addressbook/gui/contact-editor/im.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-dialog.glade.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/dialogs/new-calendar.glade.h:1
-#: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
-#: plugins/shared-folder/properties.glade.h:3
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/mail-config.glade.h:3 ../mail/mail-dialogs.glade.h:6
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/shared-folder/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentisering</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Visning</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Laster ned</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Søker</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Tjenerinformasjon</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Legg til adressebok"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
-#: mail/em-account-editor.c:292
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../mail/em-account-editor.c:292
 msgid "Always"
 msgstr "Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "E-postadresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution vil bruke denne e-post adressen til å autentisere deg mot tjeneren."
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Finn mulige søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "Lo_gin"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-#: mail/em-account-editor.c:290
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:290
 msgid "Never"
 msgstr "Aldri"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Søke_base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
@@ -888,7 +920,7 @@ msgstr ""
 "Hvis du velger dette alternativet vil Evolution kun koble til din LDAP-"
 "tjener hvis denne støtter SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -900,7 +932,7 @@ msgstr ""
 "plassert bak en brannvegg vil ikke Evolution behøve å bruke SSL/TLS fordi "
 "tilkoblingen allerede er sikker."
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This means that your connection will be insecure, and that you will be "
@@ -910,15 +942,15 @@ msgstr ""
 "eller TLS. Dette betyr at din tilkobling vil være usikker, og at du vil være "
 "sårbar for sikkerhetshull. "
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Støttede søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "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 "
@@ -927,7 +959,7 @@ msgstr ""
 "Søkebasen er det distingverte navnet (DN) for oppføringen der dine søk vil "
 "starte. Hvis du lar denne stå tom vil søk starte ved roten av katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -939,14 +971,14 @@ msgstr ""
 "søkebase. Et søkeområde som «one» vil kun ta med oppføringer ett nivå under "
 "basen."
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Dette er fullt navn på din LDAP-tjener. For eksempel «ldap.mittfirma.no»."
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -954,14 +986,16 @@ msgstr ""
 "Dette er maksimalt antall oppføringer som skal lastes ned. Hvis du setter "
 "dette tallet for høyt vil adresseboken bli treg."
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
-msgstr "Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du setter denne til «E-post-adresse» kreves anonym tilgang til din LDAP-tjener."
+msgstr ""
+"Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
+"setter denne til «E-post-adresse» kreves anonym tilgang til din LDAP-tjener."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -969,7 +1003,7 @@ msgstr ""
 "Dette er navnet på denne tjeneren som vises i mappelisten i Evolution. Det "
 "brukes kun for visning på skjermen."
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -979,277 +1013,285 @@ msgstr ""
 "liste med standardporter er gitt. Spør din systemadministrator hvilken port "
 "du skal bruke."
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Bruker distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
-#: mail/em-account-editor.c:291
+#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../mail/em-account-editor.c:291
 msgid "Whenever Possible"
 msgstr "Når mulig"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "Legg til _adressebok"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "_Finn mulige søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Log in method:"
 msgstr "Metode for på_logging:"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.c:243
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:161
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../calendar/gui/dialogs/calendar-setup.c:243
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "_Søkeområde:"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Server:"
 msgstr "Tj_ener:"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "_Tidsavbrudd:"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
-#: calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
-#: mail/em-account-editor.c:1820 plugins/calendar-http/calendar-http.c:263
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1821
+#: ../plugins/calendar-http/calendar-http.c:263
+#: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "minutes"
 msgstr "minutter"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-post</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Hjem</b> "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Øyeblikksmeldinger</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Jobb</b> "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Forskjellig</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Annet</b> "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefon</b> "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Nettaddresser</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Arbeid</b> "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:346
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address:"
-msgstr "Adresse:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-msgid "Anniversary:"
-msgstr "Bryllupsdag:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "Assistant:"
-msgstr "Assistent:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Birthday:"
-msgstr "Fødselsdag:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "Calendar:"
-msgstr "Kalender:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "City:"
-msgstr "By:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Company:"
-msgstr "Firma:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:181
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:533
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:531
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "Country:"
-msgstr "Land:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "Department:"
-msgstr "Avdeling:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "Free/Busy:"
-msgstr "Ledig/opptatt:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Home Page:"
-msgstr "Hjemmeside:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Bilde"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Postadresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "Manager:"
-msgstr "Leder:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Kallenavn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "Notes:"
-msgstr "Notater:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "Office:"
-msgstr "Kontor:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "PO Box:"
-msgstr "Postboks:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "Profession:"
-msgstr "Yrke:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "Spouse:"
-msgstr "Ektefelle:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
-msgid "State/Province:"
-msgstr "Stat/provins:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Telefon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:41
-msgid "Title:"
-msgstr "Tittel:"
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1012
+#: ../mail/mail-config.c:76 ../mail/mail-config.glade.h:147
+msgid "Work"
+msgstr "Arbeid"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Video Chat:"
-msgstr "Videoprat:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "_Address:"
+msgstr "_Adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-msgid "Wants to receive HTML mail"
-msgstr "Ønsker å motta HTML-formatert e-post"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Anniversary:"
+msgstr "_Bryllupsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
-msgid "Web Log:"
-msgstr "Weblogg:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Assistant:"
+msgstr "_Assistent:"
 
-#. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:76
-#: mail/mail-config.glade.h:147
-msgid "Work"
-msgstr "Arbeid"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Birthday:"
+msgstr "_Fødselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
-msgid "Zip/Postal Code:"
-msgstr "Zip/postnummer:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1575
+msgid "_Calendar:"
+msgstr "_Kalender:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_City:"
+msgstr "_By:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Company:"
+msgstr "F_irma:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Country:"
+msgstr "_Land:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_Department:"
+msgstr "Av_deling:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Lagre under:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Free/Busy:"
+msgstr "_Ledig/opptatt:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "_Home Page:"
+msgstr "_Hjemmeside:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "_Manager:"
+msgstr "_Leder:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+msgid "_Notes:"
+msgstr "_Notater:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+msgid "_Office:"
+msgstr "K_ontor:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_PO Box:"
+msgstr "_Postboks:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+msgid "_Profession:"
+msgstr "_Yrke:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+msgid "_Spouse:"
+msgstr "_Ektefelle:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_State/Province:"
+msgstr "_Stat/Provins:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+msgid "_Title:"
+msgstr "_Tittel:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+msgid "_Video Chat:"
+msgstr "_Videoprat:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+msgid "_Wants to receive HTML mail"
+msgstr "_Ønsker å motta HTML-formatert e-post"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+msgid "_Web Log:"
+msgstr "_Weblogg:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+msgid "_Zip/Postal Code:"
+msgstr "_Zip/postnummer:"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:319
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1257,7 +1299,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "slette disse kontaktene?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1265,1068 +1307,1064 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "slette denne kontakten?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:365
-#: addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Address"
 msgstr "Adresse"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:300
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:182
-#: addressbook/gui/widgets/e-addressbook-model.c:309
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: addressbook/gui/widgets/e-minicard.c:174
-#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:519
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:182
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-minicard.c:174
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view.c:519
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "De forente stater"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "Albania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "Algerie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "Amerikansk Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
 msgstr "Antigua og Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "Argentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "Østerrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "Aserbajdsjan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "Hviterussland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "Belgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia-Hercegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "Bouvetøya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "Brasil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr "Britisk-Indisk havområde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "Kambodsja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "Kapp Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "Caymanøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "Den sentralafrikanske republikk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "Tsjad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "Kina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "Christmasøya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "Colombia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "Komorene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Kongo-Brazaville"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "Cookøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "Elfenbenskysten"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "Kuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "Kypros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "Tsjekkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "Danmark"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "Den dominikanske republikk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
 msgstr "Egypt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Ekvatorial-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
 msgstr "Estland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Falklandsøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Færøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
 msgstr "Frankrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Fransk Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Fransk Polynesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Sydlige Franske territorier"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
 msgstr "Tyskland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
 msgstr "Hellas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Grønland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadelope"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
 msgstr "Guinea-bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr "Heard og McDonald-øyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr "Vatikanstaten"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Iran"
 msgstr "Iran"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iraq"
 msgstr "Irak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "Irland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "Italia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "Japan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Jersey"
 msgstr "Jersey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "Jordan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "Kasakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Sør-Korea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
 msgstr "Sør-Korea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Libya"
 msgstr "Libya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Macao"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "Makedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "Maldivene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "Marshalløyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "Mexico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "Mikronesiaføderasjonen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr "Moldova"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "Marokko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "De nederlandske antillene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "Ny-Caledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "Norfolkøya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "Nord-Marianene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "Norge"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr "Palestinsk område"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "Papua Ny-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "Filippinene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "Polen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "Réunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "Romania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "Russland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts og Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent og Grenadinene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr "São Tomé og Príncipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Serbia And Montenegro"
 msgstr "Serbia og Montenegro"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "Seychellene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "Singapore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "Salomonøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "Sør-Afrika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Sør-Georgia og de sørlige Sandwichøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "Spania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre-et-Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard og Jan Mayen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "Sverige"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Syria"
 msgstr "Syria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "Tadsjikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "Thailand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr "Trinidad og Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "Tyrkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr "Turks- og Caicosøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "De forente arabiske emirater"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr "USA, mindre omliggende øyer"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "Jomfruøyene, Britisk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "Jomfruøyene, USA"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis- og Futuna-øyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "Vest-Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:347
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Source Book"
 msgstr "Kildebok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
 msgid "Target Book"
 msgstr "Målbok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
 msgid "Required Fields"
 msgstr "Obligatoriske felt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Changed"
 msgstr "Endret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2463
-msgid "This contact belongs to these categories:"
-msgstr "Denne kontakten hører til disse kategoriene:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2544
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2545
 msgid "No image"
 msgstr "Uten bilde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2334,245 +2372,232 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2885
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2873
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: plugins/plugin-manager/plugin-manager.c:44
-#: plugins/save-attachments/save-attachments.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/save-attachments/save-attachments.c:362
 msgid "Name"
 msgstr "Navn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL øyeblikksmeldinger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
 msgid "Service"
 msgstr "Tjeneste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: calendar/gui/e-cal-list-view.etspec.h:3
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Location"
 msgstr "Lokasjon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Brukernavn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:156
-msgid "_Full Name:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
+msgid "_Full name:"
 msgstr "_Fullt navn:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
 msgid "E-_mail:"
 msgstr "E-_post:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_By:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Lan_d:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Full adresse"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
-msgid "_PO Box:"
-msgstr "_Postboks:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_State/Province:"
-msgstr "_Stat/Provins:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Frk"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Hr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Fru"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Frk."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Fornavn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Etternavn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Mellomnavn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:18
-msgid "_Title:"
-msgstr "_Tittel:"
-
-#: addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Legg til IM-konto"
 
-#: addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "Konton_avn:"
 
-#: addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_IM-tjeneste:"
 
-#: addressbook/gui/contact-editor/im.glade.h:5
+#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../plugins/calendar-weather/calendar-weather.c:410
 msgid "_Location:"
 msgstr "_Lokasjon:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
 msgstr "\n"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Legg til en e-postadresse i listen"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:819
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:819
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email adresses from Adress Book"
 msgstr "Sett inn e-postadresser fra adresseboken"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:709
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Medlemmer"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Fjern en e-postadresse fra listen"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "Select"
-msgstr "Velg"
-
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skjul adresser når du sender e-post til listen"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Listenavn:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+msgid "_Select"
+msgstr "_Velg"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
-#: addressbook/gui/widgets/e-addressbook-model.c:295
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:377
-#: addressbook/gui/widgets/e-addressbook-view.c:222
-#: addressbook/gui/widgets/e-minicard-view.c:505
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: ../addressbook/gui/widgets/e-addressbook-model.c:296
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-minicard-view.c:505
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bok"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:175
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:175
 msgid "Is New List"
 msgstr "Er ny liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:712
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:709
+msgid "_Members"
+msgstr "_Medlemmer"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:712
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Endret kontakt:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Kontakt i konflikt:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplisert kontakt funnet"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -2580,15 +2605,15 @@ msgstr ""
 "Den nye e-post adressen eller navnet for denne kontakten\n"
 "eksisterer allerede i denne mappen. Vil du legge til likevel?"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Ny kontakt:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "Opprinnelig kontakt:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2597,191 +2622,192 @@ msgstr ""
 "i denne mappen. Vil du legge den til likevel?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: widgets/misc/e-filter-bar.c:156
+#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
+#: ../widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: addressbook/gui/widgets/eab-contact-display.c:133
-#: addressbook/gui/widgets/eab-contact-display.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:196
 msgid "(map)"
 msgstr "(kart)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:143
-#: addressbook/gui/widgets/eab-contact-display.c:209
+#: ../addressbook/gui/widgets/eab-contact-display.c:143
+#: ../addressbook/gui/widgets/eab-contact-display.c:209
 msgid "map"
 msgstr "kart"
 
-#: addressbook/gui/widgets/eab-contact-display.c:274
-#: addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:274
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:337
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
 msgid "Position"
 msgstr "Stilling"
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Video Conferencing"
 msgstr "Videokonferanse"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
+#: ../addressbook/gui/widgets/eab-contact-display.c:368
 msgid "work"
 msgstr "arbeid"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: ../addressbook/gui/widgets/eab-contact-display.c:375
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:376
-#: addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:376
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Blog"
 msgstr "Weblogg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:379
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:379
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:383
+#: ../addressbook/gui/widgets/eab-contact-display.c:383
 msgid "personal"
 msgstr "personlig"
 
-#: addressbook/gui/widgets/eab-contact-display.c:390
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:560
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home page"
 msgstr "Hjemmeside"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Suksess"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr "Motor opptatt"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Frakoblet lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Address Book does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "No Self Contact defined"
 msgstr "Egen kontaktinformasjon er ikke definert"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr "Kontakt ikke funnet"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID eksisterer allerede"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:232
-#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-cal-model-tasks.c:347
-#: calendar/gui/e-cal-model-tasks.c:660 calendar/gui/print.c:2352
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:232
+#: ../calendar/gui/e-calendar-table.c:458
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660 ../calendar/gui/print.c:2352
 msgid "Cancelled"
 msgstr "Avbrutt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Could not cancel"
 msgstr "Kunne ikke avbryte"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#: calendar/gui/comp-editor-factory.c:431
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgjengelig"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "No such source"
 msgstr "Ingen slik kilde"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Annen feil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: ../addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2789,7 +2815,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien eksisterer og "
 "at du har rettigheter til å aksessere den."
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: ../addressbook/gui/widgets/eab-gui-util.c:105
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2797,7 +2823,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at LDAP-tjeneren ikke kan nås."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -2807,7 +2833,7 @@ msgstr ""
 "ønsker å bruke LDAP i Evolution må du installere en pakke som har denne "
 "støtten."
 
-#: addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2815,7 +2841,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at tjeneren ikke kan nås."
 
-#: addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2823,7 +2849,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2831,45 +2857,45 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bakenden for denne adresseboken forsto ikke denne spørringen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bakenden for denne adresseboken nektet å utføre denne spørringen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:155
 msgid "This query did not complete successfully."
 msgstr "Denne spørringen ble ikke fullført."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
-#: addressbook/gui/widgets/eab-gui-util.c:650
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying contact"
 msgstr "Feil under endring av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
-#: addressbook/gui/widgets/eab-gui-util.c:608
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:608
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:282
+#: ../addressbook/gui/widgets/eab-gui-util.c:282
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -2884,7 +2910,7 @@ msgstr[1] ""
 "Åpning av %d kontakter vil medføre at %d nye vinduer vil\n"
 "vises på skjermen. Vil du virkelig vise alle disse kontaktene?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2893,44 +2919,44 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Overwrite"
 msgstr "Overskriv"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:393
+#: ../addressbook/gui/widgets/eab-gui-util.c:393
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:555
+#: ../addressbook/gui/widgets/eab-gui-util.c:555
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: ../addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:709
+#: ../addressbook/gui/widgets/eab-gui-util.c:709
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: ../addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: ../addressbook/gui/widgets/eab-gui-util.c:714
 msgid "Select target addressbook."
 msgstr "Velg mål-adressebok"
 
-#: addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2940,318 +2966,314 @@ msgstr "VCard for %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:198
+#: ../addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(ingen)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:431
+#: ../addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/gui/widgets/eab-popup-control.c:441
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-popup-control.c:441
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/eab-popup-control.c:451
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/eab-popup-control.c:451
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/gui/widgets/eab-popup-control.c:567
+#: ../addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Velg en handling"
 
-#: addressbook/gui/widgets/eab-popup-control.c:575
+#: ../addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Opprett en ny kontakt «%s»"
 
-#: addressbook/gui/widgets/eab-popup-control.c:591
+#: ../addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Legg til adresse for eksisterende kontakt «%s»"
 
-#: addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Kjører spørring i adressebok..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:952
-msgid "Edit Contact Info"
-msgstr "Rediger kontaktinfo"
-
-#: addressbook/gui/widgets/eab-popup-control.c:982
-msgid "Add to Contacts"
-msgstr "Legg til i kontakter"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1007
+#: ../addressbook/gui/widgets/eab-popup-control.c:970
 msgid "Merge E-Mail Address"
 msgstr "Flett E-postadresse"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
 msgid "and one other contact."
 msgid_plural "and %d other contacts."
 msgstr[0] "og en annen kontakt."
 msgstr[1] "og %d andre kontakter."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:223
+#: ../addressbook/gui/widgets/eab-vcard-control.c:272
 msgid "Show Full VCard"
 msgstr "Vis helt VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Vis kompakt VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Ingen kontakter"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:151
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakter"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: addressbook/gui/widgets/e-addressbook-view.c:236
-#: addressbook/gui/widgets/e-minicard-view.c:512
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: ../addressbook/gui/widgets/e-addressbook-model.c:303
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-minicard-view.c:512
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Spør"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:445
+#: ../addressbook/gui/widgets/e-addressbook-model.c:446
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
 msgid "Model"
 msgstr "Modell"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:168
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Navn begynner med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-#: calendar/gui/cal-search-bar.c:53
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: calendar/gui/cal-search-bar.c:48
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-#: addressbook/gui/widgets/e-addressbook-view.c:177
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Kilde"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:243
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:244
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../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:244
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:540
-#: plugins/shared-folder/properties.glade.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.c:541
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
-#: addressbook/gui/widgets/e-addressbook-view.c:921
-#: addressbook/gui/widgets/e-addressbook-view.c:1972
-#: ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:804
+#: ../addressbook/gui/widgets/e-addressbook-view.c:922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1982
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Lagre som VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:917
+#: ../addressbook/gui/widgets/e-addressbook-view.c:918
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:918
+#: ../addressbook/gui/widgets/e-addressbook-view.c:919
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:922
-#: ui/evolution-addressbook.xml.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.c:923
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:923
+#: ../addressbook/gui/widgets/e-addressbook-view.c:924
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924 calendar/gui/print.c:2483
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.c:925
+#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2489
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:80 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927
+#: ../addressbook/gui/widgets/e-addressbook-view.c:928
 msgid "Copy to Address Book..."
 msgstr "Kopier til adressebok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:928
+#: ../addressbook/gui/widgets/e-addressbook-view.c:929
 msgid "Move to Address Book..."
 msgstr "Flytt til adressebok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:932
-#: calendar/gui/calendar-component.c:385 calendar/gui/tasks-component.c:329
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/calendar-component.c:385
+#: ../calendar/gui/tasks-component.c:329 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:9 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:933
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lim inn"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1526
-#: calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1750
+msgid "Print cards"
+msgstr "Skriv ut kontakter"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Arbeidstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefon for tilbakeringing"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/dialogs/task-page.glade.h:7
-#: calendar/gui/e-calendar-table.etspec.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
 msgid "Categories"
 msgstr "Kategorier"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Lagre som"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Given Name"
 msgstr "Gitt navn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "ISDN Phone"
 msgstr "ISDN-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Journal"
 msgstr "Journal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Leder"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Annen telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Personsøker"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:251
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
+#: ../calendar/gui/e-meeting-list-view.c:251
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Ektefelle"
 
@@ -3261,66 +3283,66 @@ msgstr "Ektefelle"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
 msgid "Title"
 msgstr "Tittel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Unit"
 msgstr "Enhet"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
 msgstr "Nettside"
 
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Bredde"
 
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Høyde"
 
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:152
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Har fokus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
+#: ../addressbook/gui/widgets/e-minicard.c:160
 msgid "Selected"
 msgstr "Valgt"
 
-#: addressbook/gui/widgets/e-minicard.c:167
+#: ../addressbook/gui/widgets/e-minicard.c:167
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Felt"
 
-#: addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Feltnavn"
 
-#: addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Tekstmodell"
 
-#: addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Maksimal lengde på feltnavn"
 
-#: addressbook/gui/widgets/e-minicard-view.c:171
+#: ../addressbook/gui/widgets/e-minicard-view.c:171
 msgid ""
 "\n"
 "\n"
@@ -3334,7 +3356,7 @@ msgstr ""
 "\n"
 "eller dobbelklikk her for å opprette en ny kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
 "\n"
@@ -3348,14 +3370,17 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:179
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr "\n\nSøk etter kontakten."
+msgstr ""
+"\n"
+"\n"
+"Søk etter kontakten."
 
-#: addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3365,330 +3390,333 @@ msgstr ""
 "\n"
 "Ingen oppføringer i denne visningen."
 
-#: addressbook/gui/widgets/e-minicard-view.c:498
+#: ../addressbook/gui/widgets/e-minicard-view.c:498
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Kolonnebredde"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "Kortvisning"
 
-#: addressbook/gui/widgets/gal-view-factory-treeview.c:26
+#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
 msgstr "GTK-trevisning"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
 msgstr "LDIF-import for Evolution"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 msgid "Evolution VCard Importer"
 msgstr "Evolution VCard-import"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:1000
+#: ../addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: addressbook/printing/e-contact-print.c:1066
-#: addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:1066
+#: ../addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
+#: ../addressbook/printing/e-contact-print-envelope.c:213
+#: ../addressbook/printing/e-contact-print-envelope.c:234
 msgid "Print envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pkt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:2
+#: ../addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8 pot. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:3
+#: ../addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Blanke skjema på slutten:"
 
-#: addressbook/printing/e-contact-print.glade.h:4
+#: ../addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Kropp"
 
-#: addressbook/printing/e-contact-print.glade.h:5
+#: ../addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Bunn:"
 
-#: addressbook/printing/e-contact-print.glade.h:6
+#: ../addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Dimensjoner:"
 
-#: addressbook/printing/e-contact-print.glade.h:7
+#: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
 msgstr "Skr_ifttype..."
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: ../addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Bunntekst:"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: ../addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "Topptekst"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Topp-/bunntekst"
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: ../addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Topptekster"
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: ../addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Topptekst for hver bokstav"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: ../addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Høyde:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: ../addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Rett etter hverandre"
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: ../addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Inkluder:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: ../addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Landskap"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: ../addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Venstre:"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: ../addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Bokstavfaner på siden"
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: ../addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marger"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: ../addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Antall kolonner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: ../addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Alternativer"
 
-#: addressbook/printing/e-contact-print.glade.h:24 e-util/eggtrayicon.c:118
+#: ../addressbook/printing/e-contact-print.glade.h:24
+#: ../e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Orientering"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: ../addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Side"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: ../addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Sideoppsett:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Papir"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: ../addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Papirkilde:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: ../addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Portrett"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Forhåndsvis:"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: ../addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Skriv ut med gråtoner"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: ../addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Motsatt på like sider"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Høyre:"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: ../addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Seksjoner:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: ../addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Skyggelegging"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: ../addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: ../addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Start på en ny side"
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: ../addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Stilnavn:"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Topp:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
-#: calendar/gui/dialogs/calendar-setup.c:175
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:175
 msgid "Type:"
 msgstr "Type:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: ../addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Bredde:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "Skri_fttype..."
 
-#: addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
 msgstr "Test av redigering av utskriftsstil for kontakter"
 
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
+#: ../addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Opphavsrett © 2000, Ximian, Inc."
 
-#: addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr ""
 
-#: addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
 msgstr "Test på utskrift av kontakt"
 
-#: addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
 msgstr "Testfunksjon for utskrift av kontakter"
 
-#: addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Oppgi utdatafil i stedet for standard utdata"
 
-#: addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
 msgstr "UTDATAFIL"
 
-#: addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local addressbook folders"
 msgstr "Vis lokale adressebokmapper"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
 msgstr "Vis kontakter som vcard eller csv-fil"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode"
 msgstr "Eksporter i asynkron modus"
 
-#: addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asychronous mode, default size 100."
-msgstr "Antall kontakter i en utdatafil i asynkron modus. Forvalgt størrelse er 100."
+msgstr ""
+"Antall kontakter i en utdatafil i asynkron modus. Forvalgt størrelse er 100."
 
-#: addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "ANTALL"
 
-#: addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:91
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
-msgstr "Feil med kommandolinjeflagg. Vennligst bruk --help for å se bruksinformasjon."
+msgstr ""
+"Feil med kommandolinjeflagg. Vennligst bruk --help for å se bruksinformasjon."
 
-#: addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
 msgstr "Støtt kun csv- eller vcard-format."
 
-#: addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
 msgstr "I asynkron modus må utdata være en fil."
 
-#: addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In normal mode, there is no need for the size option."
 msgstr "I normalt modus er ikke størrelsesflagget nødvendig."
 
-#: addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Unhandled error"
 msgstr "Uhåndtert feil"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Kan ikke åpne fil"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
 msgid "Couldn't get list of addressbooks"
 msgstr "Kunne ikke hente en liste med adressebøker"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
 msgid "failed to open book"
 msgstr "kunne ikke åpne adressebok"
 
-#: addressbook/tools/evolution-addressbook-import.c:46
+#: ../addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Feil under lasting av standard adressebok."
 
-#: addressbook/tools/evolution-addressbook-import.c:67
+#: ../addressbook/tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Innfil"
 
-#: addressbook/tools/evolution-addressbook-import.c:82
+#: ../addressbook/tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Ingen filnavn spesifisert."
 
 #. calendar:prompt-cancel-meeting primary
 #. calendar:prompt-cancel-task primary
-#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+#: ../calendar/calendar-errors.xml.h:2 ../calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Vil du sende en avlysningsmelding til alle deltakere?"
 
 #. calendar:prompt-cancel-meeting secondary
-#: calendar/calendar-errors.xml.h:4
+#: ../calendar/calendar-errors.xml.h:4
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -3696,32 +3724,32 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at møtet "
 "er avlyst."
 
-#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
-#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:87
-#: calendar/calendar-errors.xml.h:93 calendar/calendar-errors.xml.h:99
-#: calendar/calendar-errors.xml.h:105
+#: ../calendar/calendar-errors.xml.h:5 ../calendar/calendar-errors.xml.h:15
+#: ../calendar/calendar-errors.xml.h:25 ../calendar/calendar-errors.xml.h:87
+#: ../calendar/calendar-errors.xml.h:93 ../calendar/calendar-errors.xml.h:99
+#: ../calendar/calendar-errors.xml.h:105
 msgid "Don't Send"
 msgstr "Ikke send"
 
-#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
-#: calendar/calendar-errors.xml.h:26
+#: ../calendar/calendar-errors.xml.h:6 ../calendar/calendar-errors.xml.h:16
+#: ../calendar/calendar-errors.xml.h:26
 msgid "Send Notice"
 msgstr "Send melding"
 
 #. calendar:prompt-delete-meeting primary
-#: calendar/calendar-errors.xml.h:8
+#: ../calendar/calendar-errors.xml.h:8
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Er du sikker på at du vil slette dette møtet?"
 
 #. calendar:prompt-delete-meeting secondary
-#: calendar/calendar-errors.xml.h:10
+#: ../calendar/calendar-errors.xml.h:10
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "All informasjon om dette møtet vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-cancel-task secondary
-#: calendar/calendar-errors.xml.h:14
+#: ../calendar/calendar-errors.xml.h:14
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -3730,27 +3758,27 @@ msgstr ""
 "at oppgaven er slettet."
 
 #. calendar:prompt-delete-task primary
-#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#: ../calendar/calendar-errors.xml.h:18 ../calendar/calendar-errors.xml.h:44
 msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven?"
 
 #. calendar:prompt-delete-task secondary
 #. calendar:prompt-delete-named-task secondary
 #. calendar:prompt-delete-task secondary
-#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
-#: calendar/calendar-errors.xml.h:46
+#: ../calendar/calendar-errors.xml.h:20 ../calendar/calendar-errors.xml.h:42
+#: ../calendar/calendar-errors.xml.h:46
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "All informasjon om denne oppgaven vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-cancel-journal primary
-#: calendar/calendar-errors.xml.h:22
+#: ../calendar/calendar-errors.xml.h:22
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr ""
 "Er du sikker på at du vil sende en avlysing for denne journaloppføringen?"
 
 #. calendar:prompt-cancel-journal secondary
-#: calendar/calendar-errors.xml.h:24
+#: ../calendar/calendar-errors.xml.h:24
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -3759,12 +3787,12 @@ msgstr ""
 "at journalen er slettet."
 
 #. calendar:prompt-delete-journal primary
-#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#: ../calendar/calendar-errors.xml.h:28 ../calendar/calendar-errors.xml.h:52
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Er du sikker på at du vil slette denne journaloppføringen?"
 
 #. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:30
+#: ../calendar/calendar-errors.xml.h:30
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
@@ -3773,48 +3801,48 @@ msgstr ""
 "gjenopprettes."
 
 #. calendar:prompt-delete-titled-appointment primary
-#: calendar/calendar-errors.xml.h:32
+#: ../calendar/calendar-errors.xml.h:32
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Er du sikker på at du vil slette avtalen med navn «{0}»?"
 
 #. calendar:prompt-delete-titled-appointment secondary
 #. calendar:prompt-delete-appointment secondary
-#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+#: ../calendar/calendar-errors.xml.h:34 ../calendar/calendar-errors.xml.h:38
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "All informasjon i denne avtalen vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-delete-appointment primary
-#: calendar/calendar-errors.xml.h:36
+#: ../calendar/calendar-errors.xml.h:36
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Er du sikker på at du vil slette denne avtalen?"
 
 #. calendar:prompt-delete-named-task primary
-#: calendar/calendar-errors.xml.h:40
+#: ../calendar/calendar-errors.xml.h:40
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Er du sikker på at du vil slette oppgaven «{0}»?"
 
 #. calendar:prompt-delete-named-journal primary
-#: calendar/calendar-errors.xml.h:48
+#: ../calendar/calendar-errors.xml.h:48
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Er du sikker på at du vil slette journaloppføringen «{0}»?"
 
 #. calendar:prompt-delete-named-journal secondary
 #. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+#: ../calendar/calendar-errors.xml.h:50 ../calendar/calendar-errors.xml.h:54
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "All informasjon i denne journalen vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-delete-appointments primary
-#: calendar/calendar-errors.xml.h:56
+#: ../calendar/calendar-errors.xml.h:56
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Er du sikker på at du vil slette disse {0} avtalene?"
 
 #. calendar:prompt-delete-appointments secondary
-#: calendar/calendar-errors.xml.h:58
+#: ../calendar/calendar-errors.xml.h:58
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -3822,23 +3850,23 @@ msgstr ""
 "All informasjon i disse avtalene vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-delete-tasks primary
-#: calendar/calendar-errors.xml.h:60
+#: ../calendar/calendar-errors.xml.h:60
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Er du sikker på at du vil slette disse {0} oppgavene?"
 
 #. calendar:prompt-delete-tasks secondary
-#: calendar/calendar-errors.xml.h:62
+#: ../calendar/calendar-errors.xml.h:62
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "All informasjon om disse oppgavene vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-delete-journals primary
-#: calendar/calendar-errors.xml.h:64
+#: ../calendar/calendar-errors.xml.h:64
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "Er du sikker på at du vil slette disse {0} journaloppføringene?"
 
 #. calendar:prompt-delete-journals secondary
-#: calendar/calendar-errors.xml.h:66
+#: ../calendar/calendar-errors.xml.h:66
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
@@ -3847,68 +3875,68 @@ msgstr ""
 "gjenopprettes."
 
 #. calendar:prompt-save-appointment title
-#: calendar/calendar-errors.xml.h:68
+#: ../calendar/calendar-errors.xml.h:68
 msgid "Save Appointment"
 msgstr "Lagre avtale"
 
 #. calendar:prompt-save-appointment primary
-#: calendar/calendar-errors.xml.h:70
+#: ../calendar/calendar-errors.xml.h:70
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vil du lagre dine endringer i denne avtalen?"
 
 #. calendar:prompt-save-appointment secondary
-#: calendar/calendar-errors.xml.h:72
+#: ../calendar/calendar-errors.xml.h:72
 msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Du har gjort endringer i denne avtalen, men har ikke lagret dem."
 
-#: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
+#: ../calendar/calendar-errors.xml.h:73 ../calendar/calendar-errors.xml.h:81
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
-#: calendar/calendar-errors.xml.h:74 calendar/calendar-errors.xml.h:82
+#: ../calendar/calendar-errors.xml.h:74 ../calendar/calendar-errors.xml.h:82
 msgid "Save Changes"
 msgstr "Lagre endringer"
 
 #. calendar:prompt-save-task title
-#: calendar/calendar-errors.xml.h:76
+#: ../calendar/calendar-errors.xml.h:76
 msgid "Save Task"
 msgstr "Lagre oppgave"
 
 #. calendar:prompt-save-task primary
-#: calendar/calendar-errors.xml.h:78
+#: ../calendar/calendar-errors.xml.h:78
 msgid "Would you like to save your changes to this task?"
 msgstr "Vil du lagre dine endringer i denne oppgaven?"
 
 #. calendar:prompt-save-task secondary
-#: calendar/calendar-errors.xml.h:80
+#: ../calendar/calendar-errors.xml.h:80
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "Du har gjort endringer i denne oppgaven, men har ikke lagret dem."
 
 #. calendar:prompt-meeting-invite primary
-#: calendar/calendar-errors.xml.h:84
+#: ../calendar/calendar-errors.xml.h:84
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vil du sende møteinvitasjoner til deltakerene?"
 
 #. calendar:prompt-meeting-invite secondary
-#: calendar/calendar-errors.xml.h:86
+#: ../calendar/calendar-errors.xml.h:86
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan gi svar."
 
-#: calendar/calendar-errors.xml.h:88 calendar/calendar-errors.xml.h:94
-#: calendar/calendar-errors.xml.h:100 calendar/calendar-errors.xml.h:106
-#: ui/evolution-message-composer.xml.h:24
+#: ../calendar/calendar-errors.xml.h:88 ../calendar/calendar-errors.xml.h:94
+#: ../calendar/calendar-errors.xml.h:100 ../calendar/calendar-errors.xml.h:106
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Send"
 
 #. calendar:prompt-send-updated-meeting-info primary
-#: calendar/calendar-errors.xml.h:90
+#: ../calendar/calendar-errors.xml.h:90
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vil du sende oppdatert møteinformasjon til alle deltakere?"
 
 #. calendar:prompt-send-updated-meeting-info secondary
-#: calendar/calendar-errors.xml.h:92
+#: ../calendar/calendar-errors.xml.h:92
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -3917,12 +3945,12 @@ msgstr ""
 "oppdatert."
 
 #. calendar:prompt-send-task primary
-#: calendar/calendar-errors.xml.h:96
+#: ../calendar/calendar-errors.xml.h:96
 msgid "Would you like to send this task to participants?"
 msgstr "Vil du sende denne oppgaven til deltakere?"
 
 #. calendar:prompt-send-task secondary
-#: calendar/calendar-errors.xml.h:98
+#: ../calendar/calendar-errors.xml.h:98
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -3931,12 +3959,12 @@ msgstr ""
 "denne oppgaven."
 
 #. calendar:prompt-send-updated-task-info primary
-#: calendar/calendar-errors.xml.h:102
+#: ../calendar/calendar-errors.xml.h:102
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
 
 #. calendar:prompt-send-updated-task-info secondary
-#: calendar/calendar-errors.xml.h:104
+#: ../calendar/calendar-errors.xml.h:104
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -3945,198 +3973,205 @@ msgstr ""
 "oppgavelister oppdatert."
 
 #. calendar:tasks-crashed primary
-#: calendar/calendar-errors.xml.h:108
+#: ../calendar/calendar-errors.xml.h:108
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-oppgaver har avsluttet uventet."
 
 #. calendar:tasks-crashed secondary
-#: calendar/calendar-errors.xml.h:110
+#: ../calendar/calendar-errors.xml.h:110
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Dine oppgaver vil ikke være tilgjengelige før Evolution startes på nytt."
 
 #. calendar:calendar-crashed primary
-#: calendar/calendar-errors.xml.h:112
+#: ../calendar/calendar-errors.xml.h:112
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
 #. calendar:calendar-crashed secondary
-#: calendar/calendar-errors.xml.h:114
+#: ../calendar/calendar-errors.xml.h:114
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Dine kalendere vil ikke være tilgjengelige før Evolution startes på nytt."
 
 #. calendar:prompt-delete-calendar primary
-#: calendar/calendar-errors.xml.h:116
+#: ../calendar/calendar-errors.xml.h:116
 msgid "Delete calendar '{0}'?"
 msgstr "Slett kalender «{0}»?"
 
 #. calendar:prompt-delete-calendar secondary
-#: calendar/calendar-errors.xml.h:118
+#: ../calendar/calendar-errors.xml.h:118
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil bli fjernet for godt."
 
 #. calendar:prompt-delete-task-list primary
-#: calendar/calendar-errors.xml.h:120
+#: ../calendar/calendar-errors.xml.h:120
 msgid "Delete task list '{0}'?"
 msgstr "Slett oppgaveliste «{0}»?"
 
 #. calendar:prompt-delete-task-list secondary
-#: calendar/calendar-errors.xml.h:122
+#: ../calendar/calendar-errors.xml.h:122
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgavelisten vil bli fjernet for godt."
 
 #. calendar:prompt-send-no-subject-calendar primary
-#: calendar/calendar-errors.xml.h:124
+#: ../calendar/calendar-errors.xml.h:124
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Er du sikker på at du vil sende en avtelen uten emne?"
 
 #. calendar:prompt-send-no-subject-calendar secondary
-#: calendar/calendar-errors.xml.h:126
+#: ../calendar/calendar-errors.xml.h:126
 msgid ""
 "Adding a meaningful Summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
-msgstr "Hvis du gir dine avtaler en meningsfylt emnelinje vil mottakerene lettere forstå hva avtalen gjelder."
+msgstr ""
+"Hvis du gir dine avtaler en meningsfylt emnelinje vil mottakerene lettere "
+"forstå hva avtalen gjelder."
 
-#: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#: ../calendar/calendar-errors.xml.h:127 ../calendar/calendar-errors.xml.h:132
+#: ../mail/mail-errors.xml.h:15 ../mail/mail-errors.xml.h:20
+#: ../mail/mail-errors.xml.h:27 ../mail/mail-errors.xml.h:32
 msgid "_Send"
 msgstr "_Send"
 
 #. calendar:prompt-send-no-subject-task primary
-#: calendar/calendar-errors.xml.h:129
+#: ../calendar/calendar-errors.xml.h:129
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Er du sikker på at du vil sende oppgaven uten sammendrag?"
 
 #. calendar:prompt-send-no-subject-task secondary
-#: calendar/calendar-errors.xml.h:131
+#: ../calendar/calendar-errors.xml.h:131
 msgid ""
 "Adding a meaningful Summary to your task will give your recipients an idea "
-"of what your appointment is about."
-msgstr "Hvis du gir dine oppgaver et meningsfylt sammendrag vil mottakerene lettere forstå hva oppgaven dreier seg om."
+"of what your task is about."
+msgstr ""
+"Hvis du gir dine oppgaver et meningsfylt sammendrag vil mottakerene lettere "
+"forstå hva oppgaven dreier seg om."
 
-#: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
-#: smime/gui/component.c:48
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
+#: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Oppgi passord"
 
-#: calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:246
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendelser som går over flere dager:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1359
-#: calendar/conduits/calendar/calendar-conduit.c:1360
-#: calendar/conduits/todo/todo-conduit.c:879
-#: calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1359
+#: ../calendar/conduits/calendar/calendar-conduit.c:1360
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Kunne ikke starte evolution-data-server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1468
-#: calendar/conduits/calendar/calendar-conduit.c:1471
+#: ../calendar/conduits/calendar/calendar-conduit.c:1468
+#: ../calendar/conduits/calendar/calendar-conduit.c:1471
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
-#: calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Forvalgt prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:959
-#: calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:79
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: calendar/gui/dialogs/event-editor.c:138 calendar/gui/print.c:2298
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../calendar/gui/dialogs/event-editor.c:138 ../calendar/gui/print.c:2298
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Appointment Title"
 msgstr "Tittel på avtale"
 
 #. End time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: plugins/itip-formatter/itip-view.c:830
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "End time:"
 msgstr "Slutt-tid:"
 
 #. Location
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: calendar/gui/e-itip-control.c:1118 plugins/itip-formatter/itip-view.c:813
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/e-itip-control.c:1118
+#: ../plugins/itip-formatter/itip-view.c:815
 msgid "Location:"
 msgstr "Plassering:"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "Snooze _time:"
 msgstr "Utsett-_tid:"
 
 #. Start time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: plugins/itip-formatter/itip-view.c:821
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "Start time:"
 msgstr "Start-tid:"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11
-#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22 ui/evolution.xml.h:38
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:153
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-signature-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:22
+#: ../ui/evolution.xml.h:38
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "_Snooze"
 msgstr "Ut_sett"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 msgid "description of appointment"
 msgstr "beskrivelse av avtale"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
 msgid "end-time"
 msgstr "slutt-tid"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:11
 msgid "location"
 msgstr "lokasjon"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:13
 msgid "start-time"
 msgstr "start-tid"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:864
+#: ../calendar/gui/alarm-notify/alarm-queue.c:864
 msgid "Dismiss"
 msgstr "Se bort fra"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:865
+#: ../calendar/gui/alarm-notify/alarm-queue.c:865
 msgid "Dismiss All"
 msgstr "Se bort fra alle"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:947
+#: ../calendar/gui/alarm-notify/alarm-queue.c:947
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:956
-#: calendar/gui/alarm-notify/alarm-queue.c:958
+#: ../calendar/gui/alarm-notify/alarm-queue.c:956
+#: ../calendar/gui/alarm-notify/alarm-queue.c:958
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:966
+#: ../calendar/gui/alarm-notify/alarm-queue.c:966
 msgid "No location information available."
 msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:982
+#: ../calendar/gui/alarm-notify/alarm-queue.c:982
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4149,12 +4184,12 @@ msgstr ""
 "Starter %s\n"
 "Slutter %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1108
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1088
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1088
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4166,7 +4201,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1114
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1114
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4183,166 +4218,168 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1128
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1128
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
 
-#: calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:150
+#: ../calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke opprette factory for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
 msgstr "ugyldig tid"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Allocate less space to weekend appointments"
 msgstr "Tildel mindre plass til avtaler i helgen"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
 msgid "Calendars to run alarms for"
 msgstr "Kalendere det skal kjøres alarmer for"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Color of tasks that are due today"
 msgstr "Farge for oppgaver som går ut i dag"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Color of tasks that are overdue"
 msgstr "Farge for oppgaver som har gått ut"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Days that are work days"
 msgstr "Dager som er arbeidsdager"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 msgid "Default timezone for meetings"
 msgstr "Forvalgt tidssone for møter"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Hour the workday ends on"
 msgstr "Time for arbeidsdagens slutt"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Hour the workday starts on"
 msgstr "Time for arbeidsdagens start"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Intervals shown in Day and Work Week views"
 msgstr "Intervaller vises i dag- og arbeidsukevisningene"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "List of urls for free/busy publishing"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Minute the workday ends on"
 msgstr "Minutt arbeidsdagen slutter på"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Minute the workday starts on"
 msgstr "Minutt arbeidsdagen starter på"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 msgid "Number of units for default reminder"
 msgstr "Antall enheter for forvalgt påminnelse"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 msgid "Number of units for determining when to hide tasks"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Position of the horizontal pane"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Position of the horizontal pane in the month view"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Position of the vertical pane"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Position of the vertical pane in the month view"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Position of the vertical pane in the task view"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Programs that can run as part of alarms"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Show where events end in week and month views"
 msgstr "Vis hvor hendelser slutter i ukes- og månedsvisning"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "The url template to use as a free/busy data fallback"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Time last alarm ran"
 msgstr "Tid for kjøring av forrige alarm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Units for determining when to hide tasks"
 msgstr "Enheter for å bestemme når oppgaver skal skjules"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Units of default reminder"
 msgstr "Enheter for forvalgt påminnelse"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Weekday the week starts on"
 msgstr "Dag uken starter på"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether or not to use the notification tray for display alarms"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Om det skal spørres etter bekreftelse ved sletting av avtaler"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Om det skal spørres etter bekreftelse når mapper tømmes"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to hide completed tasks"
 msgstr "Om fullførte oppgaver skal skjules"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to set a default reminder for events"
 msgstr "Im en forvalgt påminnelse skal settes for hendelser"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Whether to show week numbers in date navigator"
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:568
-#: calendar/gui/dialogs/calendar-setup.c:362 calendar/gui/gnome-cal.c:1925
-#: plugins/groupwise-account-setup/camel-gw-listener.c:382
-#: plugins/groupwise-account-setup/camel-gw-listener.c:412
+#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-component.c:568
+#: ../calendar/gui/dialogs/calendar-setup.c:362
+#: ../calendar/gui/gnome-cal.c:1925
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:382
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:355
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4351,1008 +4388,1108 @@ msgstr ""
 "Denne operasjonen vil fjerne alle hendelser innen valgt tidsrom permanent. "
 "Hvis du fortsetter vil du ikke kunne gjenopprette disse hendelsene."
 
-#: calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
-#: calendar/gui/calendar-commands.c:366
-#: calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
-#: plugins/calendar-http/calendar-http.c:265
+#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../plugins/calendar-weather/calendar-weather.c:566
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dager"
 
-#: calendar/gui/calendar-component.c:384
-#: calendar/gui/dialogs/calendar-setup.c:442
+#: ../calendar/gui/calendar-component.c:384
+#: ../calendar/gui/dialogs/calendar-setup.c:442
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:701
+#: ../calendar/gui/calendar-component.c:701
 msgid "Failed upgrading calendars."
 msgstr "Feil under oppgradering av kalendere."
 
-#: calendar/gui/calendar-component.c:997
+#: ../calendar/gui/calendar-component.c:997
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan ikke åpne kalender «%s» for oppretting av hendelser og møter"
 
-#: calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:1013
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ingen kalender er tilgjengelig for oppretting av hendelser og møter"
 
-#: calendar/gui/calendar-component.c:1123
+#: ../calendar/gui/calendar-component.c:1123
 msgid "Calendar Source Selector"
 msgstr "Valg av kalenderkilde"
 
-#: calendar/gui/calendar-component.c:1148
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1148
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "Calendars"
 msgstr "Kalendere"
 
-#: calendar/gui/calendar-component.c:1314
+#: ../calendar/gui/calendar-component.c:1314
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:1315
+#: ../calendar/gui/calendar-component.c:1315
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: calendar/gui/calendar-component.c:1316
+#: ../calendar/gui/calendar-component.c:1316
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: calendar/gui/calendar-component.c:1322
+#: ../calendar/gui/calendar-component.c:1322
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/calendar-component.c:1323
+#: ../calendar/gui/calendar-component.c:1323
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: calendar/gui/calendar-component.c:1324
+#: ../calendar/gui/calendar-component.c:1324
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: calendar/gui/calendar-component.c:1330
+#: ../calendar/gui/calendar-component.c:1330
 msgid "New all day appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:1331
+#: ../calendar/gui/calendar-component.c:1331
 msgid "All Day A_ppointment"
 msgstr "Avtale for hele _dagen"
 
-#: calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1332
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:1338
+#: ../calendar/gui/calendar-component.c:1338
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:1339
+#: ../calendar/gui/calendar-component.c:1339
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: calendar/gui/calendar-component.c:1340
+#: ../calendar/gui/calendar-component.c:1340
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "Dagvisning"
 
-#: calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "Arbeidsukevisning"
 
-#: calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "Ukevisning"
 
-#: calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Lokasjon inneholder"
 
-#: calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:350
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: calendar/gui/comp-editor-factory.c:413
+#: ../calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "Feil under åpning av kalenderen"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: ../calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr "Metoden er ikke støttet under åpning av kalender"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: ../calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "Tilgang nektet ved åpning av kalender"
 
-#: calendar/gui/comp-editor-factory.c:437 shell/e-shell.c:1259
+#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1259
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Alarm</b>"
 msgstr "<b>Varsel</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Options</b>"
 msgstr "<b>Alternativer</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "<b>Repeat</b>"
 msgstr "<b>Gjenta</b> "
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Add Alarm"
 msgstr "Legg til _varsel"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom _message"
 msgstr "Tilpasset _beskjed"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Custom alarm sound"
 msgstr "Egendefinert lyd for varsel"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
 msgid "Mes_sage:"
 msgstr "Be_skjed:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Vis varsling"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:11
-#: calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Kjør et program"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "Send til:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Send en melding"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
 msgstr "_Argumenter:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
 msgstr "_Program:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
 msgstr "_Gjenta alarmen"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
 msgstr "_Lyd:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "etter"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "før"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dag(er)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "slutten på avtalen"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "ekstra ganger hver"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
-#: plugins/calendar-http/calendar-http.c:264
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:565
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minutt(er)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:28
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "option menu to choose alarm action"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:29
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:29
 msgid "option menu to choose alarm relative"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:30
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:30
 msgid "option menu to choose alarm time"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:31
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:31
 msgid "option menu to choose alarm value units"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:32
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:32
 msgid "start of appointment"
 msgstr "start på avtale"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "Handling/utløser"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
 msgstr "Le_gg til"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 msgid "Alarms"
 msgstr "Varsel"
 
-#: calendar/gui/dialogs/calendar-setup.c:284
+#: ../calendar/gui/dialogs/calendar-setup.c:284
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Kopier kalenderinnhold lokalt for frakoblet operasjon"
 
-#: calendar/gui/dialogs/calendar-setup.c:336
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:336
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "F_arge:"
 
-#: calendar/gui/dialogs/calendar-setup.c:373
+#: ../calendar/gui/dialogs/calendar-setup.c:373
 msgid "Tasks List"
 msgstr "Oppgaveliste"
 
-#: calendar/gui/dialogs/calendar-setup.c:440
+#: ../calendar/gui/dialogs/calendar-setup.c:440
 msgid "Calendar Properties"
 msgstr "Kalenderegenskaper"
 
-#: calendar/gui/dialogs/calendar-setup.c:506
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "Task List Properties"
 msgstr "Egenskaper for oppgaveliste"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Legg til kalender"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Legg til oppgaveliste"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:103
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:103
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Legg til kalender"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "_Legg til oppgaveliste"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#: plugins/calendar-http/calendar-http.c:248
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../plugins/calendar-http/calendar-http.c:248
+#: ../plugins/calendar-weather/calendar-weather.c:549
 msgid "_Refresh:"
 msgstr "_Oppdater:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#: plugins/calendar-http/calendar-http.c:120
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../plugins/calendar-http/calendar-http.c:120
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
-#: plugins/calendar-http/calendar-http.c:266
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../plugins/calendar-weather/calendar-weather.c:567
 msgid "weeks"
 msgstr "uker"
 
-#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
-#. has "activatable" set.
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:108
+#: ../composer/e-msg-composer-attachment-bar.c:101
+#, c-format
+msgid "%.0fK"
+msgstr "%.0fK"
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:111
+#: ../composer/e-msg-composer-attachment-bar.c:104
+#, c-format
+msgid "%.0fM"
+msgstr "%.0fM"
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:114
+#: ../composer/e-msg-composer-attachment-bar.c:107
+#, c-format
+msgid "%.0fG"
+msgstr "%.0fG"
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:298
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:910
+#: ../composer/e-msg-composer-attachment-bar.c:293 ../mail/em-utils.c:436
+msgid "attachment"
+msgstr "vedlegg"
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:439
+#: ../calendar/gui/dialogs/meeting-page.c:781
+#: ../composer/e-msg-composer-attachment-bar.c:440
+#: ../plugins/shared-folder/properties.glade.h:14
+msgid "_Remove"
+msgstr "Fje_rn"
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:440
+#: ../composer/e-msg-composer-attachment-bar.c:441
+#: ../mail/em-folder-tree.c:2770 ../ui/evolution-mail-list.xml.h:27
+msgid "_Properties"
+msgstr "Egenska_per..."
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:442
+#: ../composer/e-msg-composer-attachment-bar.c:443
+msgid "_Add attachment..."
+msgstr "_Legg til vedlegg..."
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:93
+#: ../composer/e-msg-composer-select-file.c:112
+msgid "Suggest automatic display of attachment"
+msgstr "Foreslå automatisk visning av vedlegg"
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+#: ../composer/e-msg-composer-select-file.c:187
+msgid "Attach file(s)"
+msgstr "Legg ved fil(er)"
+
+#: ../calendar/gui/dialogs/cal-attachment.c:197
+#: ../calendar/gui/dialogs/cal-attachment.c:213
+#: ../composer/e-msg-composer-attachment.c:174
+#: ../composer/e-msg-composer-attachment.c:190
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Kan ikke legge ved fil: %s: %s"
+
+#: ../calendar/gui/dialogs/cal-attachment.c:205
+#: ../composer/e-msg-composer-attachment.c:182
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "Egenskaper for vedlegg"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:267
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "Filnavn:"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
+#: ../composer/e-msg-composer-attachment.glade.h:5
+msgid "MIME type:"
+msgstr "MIME-type:"
+
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:470
-#: mail/em-composer-prefs.c:678 mail/em-composer-prefs.c:945
-#: plugins/plugin-manager/plugin-manager.c:213
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
+#: ../mail/em-account-prefs.c:470 ../mail/em-composer-prefs.c:884
+#: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "Er du sikker på at du vil fjerne denne URLen?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Remove"
 msgstr "Fjern"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "Ikke fjern"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:853 mail/em-account-prefs.c:317
-#: mail/em-account-prefs.c:345 mail/em-account-prefs.c:376
-#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
-#: mail/em-composer-prefs.c:685
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: ../mail/em-account-prefs.c:317 ../mail/em-account-prefs.c:345
+#: ../mail/em-account-prefs.c:376
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:855 mail/em-account-prefs.c:317
-#: mail/em-account-prefs.c:345 mail/em-account-prefs.c:378
-#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
-#: mail/em-composer-prefs.c:685
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: ../mail/em-account-prefs.c:317 ../mail/em-account-prefs.c:345
+#: ../mail/em-account-prefs.c:378
 msgid "Enable"
 msgstr "Aktiver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "05 minutes"
 msgstr "5 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "10 minutes"
 msgstr "10 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "30 minutes"
 msgstr "30 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "<b>Alerts</b>"
 msgstr "<b>Varsel</b> "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>Default Free/Busy Server</b>"
 msgstr "<b>Forvalgt tjener for ledig/opptatt-tid</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<b>General</b>"
 msgstr "<b>Generell</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Publishing</b>"
 msgstr "<b>Publisering</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Task List</b>"
 msgstr "<b>Oppgaveliste</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Time</b>"
 msgstr "<b>Tid</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<b>Work Week</b>"
 msgstr "<b>Arbeidsuke</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen.</i>"
+msgstr ""
+"<i>%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen.</i>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar and Tasks Settings"
 msgstr "Innstillinger for kalender og oppgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Color for overdue tasks"
 msgstr "Farge for utgåtte oppgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Color for tasks due today"
 msgstr "Farge for oppgaver som går ut i dag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "Dag_en slutter:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Days"
 msgstr "Dager"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Display"
 msgstr "Vis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: mail/mail-config.glade.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1031
-#: calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Hours"
 msgstr "Timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Minutes"
 msgstr "Minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/recurrence-page.c:1027
-#: calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Mandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "S_un"
 msgstr "S_ø."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/recurrence-page.c:1032
-#: calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Sh_ow a reminder"
 msgstr "_Vis en påminnelse"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:1033
-#: calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Søndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "T_asks due today:"
 msgstr "Oppg_aver som går ut i dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "T_hu"
 msgstr "T_o."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Template:"
 msgstr "Mal:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1030
-#: calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:1028
-#: calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "W_eek starts:"
 msgstr "Uk_en starter:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/recurrence-page.c:1029
-#: calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1042
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Add URL"
 msgstr "_Legg til URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i månedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Fri"
 msgstr "_Fr."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utførte oppgaver etter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Mon"
 msgstr "_Ma."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Overdue tasks:"
 msgstr "Utgåtte _oppgaver:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Sat"
 msgstr "L_ø."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Show appointment end times in week and month views"
 msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Time divisions:"
 msgstr "Oppdeling av _tid:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Tue"
 msgstr "_Ti."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Wed"
 msgstr "_On."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "before every appointment"
 msgstr "før hver avtale"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "option menu to choose reminder units"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "option menu to choose time units"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Denne hendelsen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Denne oppgaven er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Denne journaloppføringen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort endringer. Forkast disse endringene og lukk redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har ikke gjort endringer. Lukk redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Denne hendelsen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Denne oppgaven er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Denne journaloppføringen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har gjort endringer. Forkast disse endringene og oppdater redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:279
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:417 composer/e-msg-composer.c:2315
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:2315
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/dialogs/comp-editor.c:470 composer/e-msg-composer.c:2344
+#: ../calendar/gui/dialogs/comp-editor.c:470 ../composer/e-msg-composer.c:2344
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Skjul _vedleggsfeltet (slipp vedlegg her)"
 
-#: calendar/gui/dialogs/comp-editor.c:473
-#: calendar/gui/dialogs/comp-editor.c:517 composer/e-msg-composer.c:2347
-#: composer/e-msg-composer.c:3466
+#: ../calendar/gui/dialogs/comp-editor.c:473
+#: ../calendar/gui/dialogs/comp-editor.c:517 ../composer/e-msg-composer.c:2347
+#: ../composer/e-msg-composer.c:3466
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
 
-#: calendar/gui/dialogs/comp-editor.c:1046
-#: calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/comp-editor.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:1052
-#: calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1052
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1054
-#: calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1054
+#: ../calendar/gui/dialogs/comp-editor.c:1097
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1058
-#: calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1058
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1060
-#: calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1063
-#: calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1106
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1116
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1548
-#: calendar/gui/dialogs/comp-editor.c:1581
-#: calendar/gui/dialogs/comp-editor.c:1605
+#: ../calendar/gui/dialogs/comp-editor.c:1548
+#: ../calendar/gui/dialogs/comp-editor.c:1581
+#: ../calendar/gui/dialogs/comp-editor.c:1605
 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:1629
+#: ../calendar/gui/dialogs/comp-editor.c:1629
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:464
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "Kunne ikke åpne kilde"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:69
 msgid "Could not open destination"
 msgstr "Kunne ikke åpne destinasjon"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:78
 msgid "Destination is read only"
 msgstr "Destinasjonen er skrivebeskyttet"
 
-#: calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Hendelsen kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Oppgaven kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Journaloppføringen kunne ikke slette pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Oppføringen kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Hendelsen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Oppgaven kunne ikke slettes fordi tilgang nektes"
 
-#: calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Journaloppføringen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Oppføringen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Hendelsen kunne ikke slettes pga en feil"
 
-#: calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Oppgaven kunne ikke slettes pga en feil"
 
-#: calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Journaloppføringen kunne ikke slette pga en feil"
 
-#: calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Oppføringen kunne ikke slettes pga en feil"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "Kontakter..."
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
 msgstr "Deleger til:"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:147
+#: ../calendar/gui/dialogs/event-editor.c:147
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: calendar/gui/dialogs/event-editor.c:159
-#: calendar/gui/dialogs/event-editor.c:231
-#: calendar/gui/dialogs/event-editor.c:376
+#: ../calendar/gui/dialogs/event-editor.c:159
+#: ../calendar/gui/dialogs/event-editor.c:231
+#: ../calendar/gui/dialogs/event-editor.c:376
 msgid "Scheduling"
 msgstr "Møteplanlegging"
 
-#: calendar/gui/dialogs/event-editor.c:166
-#: calendar/gui/dialogs/event-editor.c:234
-#: calendar/gui/dialogs/event-editor.c:379
+#: ../calendar/gui/dialogs/event-editor.c:166
+#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:379
 msgid "Invitations"
 msgstr "Invitasjoner"
 
-#: calendar/gui/dialogs/event-page.c:716
+#: ../calendar/gui/dialogs/event-page.c:716
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: calendar/gui/dialogs/event-page.c:719
+#: ../calendar/gui/dialogs/event-page.c:719
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: calendar/gui/dialogs/event-page.c:885 calendar/gui/dialogs/task-page.c:551
+#: ../calendar/gui/dialogs/event-page.c:885
+#: ../calendar/gui/dialogs/task-page.c:551
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:895
+#: ../calendar/gui/dialogs/event-page.c:895
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:918
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: calendar/gui/dialogs/event-page.c:925
+#: ../calendar/gui/dialogs/event-page.c:925
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: calendar/gui/dialogs/event-page.c:1666
+#: ../calendar/gui/dialogs/event-page.c:1666
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
 
-#: calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/event-page.c:1872
 #, 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:1880
+#: ../calendar/gui/dialogs/event-page.c:1880
 #, 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:1888
+#: ../calendar/gui/dialogs/event-page.c:1888
 #, 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.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 day before appointment"
 msgstr "en dag før avtalen"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "1 hour before appointment"
 msgstr "en time før avtalen"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "15 minutes before appointment"
 msgstr "femten minutter før avtalen"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "<b>Basics</b>"
 msgstr "<b>Grunnleggende</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:6
 msgid "<b>Date and Time</b>"
 msgstr "<b>Dato og klokkeslett</b> "
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "<b>Send Options</b>"
 msgstr "<b>Alternativer for sending</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
 msgstr "Varer hele _dagen"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Ad_vanced  send options"
 msgstr "A_vanserte alternativer for sending"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "C_ustomize..."
 msgstr "Tilpass..."
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Ca_tegories..."
 msgstr "Kate_gorier..."
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "Kale_nder:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:8
 msgid "Classi_fication:"
 msgstr "Klassi_fisering"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:361 calendar/gui/e-cal-list-view.c:255
-#: calendar/gui/e-cal-model.c:305
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:305
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
 msgstr "Beskrivelse av hendelse"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "Plasser_ing:"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:360 calendar/gui/e-cal-list-view.c:254
-#: calendar/gui/e-cal-model.c:303
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-calendar-table.c:361
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:303
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
-#: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:359 calendar/gui/e-cal-list-view.c:253
-#: calendar/gui/e-cal-model.c:294 calendar/gui/e-cal-model.c:301
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:294
+#: ../calendar/gui/e-cal-model.c:301
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/event-page.glade.h:19
 msgid "Show time as _busy"
 msgstr "Vis tid som _opptatt"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/task-page.glade.h:14
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "Denne avtalen har egendefinerte alarmer"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:22
 msgid "_Alarm"
 msgstr "_Varsel"
 
-#: calendar/gui/dialogs/event-page.glade.h:23
+#: ../calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
-#: calendar/gui/dialogs/event-page.glade.h:24
-#: calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#: calendar/gui/dialogs/event-page.glade.h:25
-#: calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
@@ -5361,876 +5498,891 @@ msgstr "_Start-tid:"
 #. 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/meeting-page.c:296
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:652 calendar/gui/e-itip-control.c:1104
-#: composer/e-msg-composer.c:2122 filter/filter-rule.c:878
-#: mail/em-account-editor.c:675 mail/em-account-editor.c:1268
-#: mail/em-account-prefs.c:431 mail/em-folder-view.c:961
-#: plugins/itip-formatter/itip-formatter.c:1365
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458
-#: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651
+#: ../calendar/gui/dialogs/meeting-page.c:296
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/e-cal-model-tasks.c:652
+#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2122
+#: ../filter/filter-rule.c:878 ../mail/em-account-editor.c:675
+#: ../mail/em-account-editor.c:1269 ../mail/em-account-prefs.c:431
+#: ../mail/em-folder-view.c:965
+#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:425
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:458
+#: ../widgets/misc/e-dateedit.c:1497 ../widgets/misc/e-dateedit.c:1651
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:432
+#: ../calendar/gui/dialogs/meeting-page.c:432
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: ../calendar/gui/dialogs/meeting-page.c:438
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:453
+#: ../calendar/gui/dialogs/meeting-page.c:453
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:778
+#: ../calendar/gui/dialogs/meeting-page.c:778
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
-#: calendar/gui/dialogs/meeting-page.c:781
-#: composer/e-msg-composer-attachment-bar.c:440
-#: plugins/shared-folder/properties.glade.h:19
-msgid "_Remove"
-msgstr "Fje_rn"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:235
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:235
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Deltaker"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Klikk her for å legge til en deltaker"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Vanlig navn"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Delegert fra"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Delegert til"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Språk"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Medlem"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-list-view.c:258
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:258
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:145
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:265
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63
-#: mail/message-list.etspec.h:12
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:145
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:265
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "<b>Att_endees</b>"
 msgstr "<b>D_eltakere</b> "
 
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "C_hange Organizer"
 msgstr "Endre or_ganisator"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-meeting-time-sel.c:428
 msgid "Con_tacts..."
 msgstr "Kon_takter..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
 msgid "Organizer"
 msgstr "Organisator"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/dialogs/meeting-page.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalenderalternativer</b>"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Legg til ny kalender"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Kalendergruppe"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Kalenderlokasjon"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:6
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Kalendernavn"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Alternativer for oppgaveliste</b>"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Legg til ny oppgaveliste"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Oppgavelistegruppe"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:5
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Navn på oppgaveliste"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: ../calendar/gui/dialogs/recur-comp.c:51
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Du endrer en gjeninntreffende hendelse. Hva ønsker du å endre?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:55
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Du endrer en repeterende oppgave. Hva vil du endre?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:59
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Du endrer en repeterende journaloppføring. Hva vil du endre?"
 
-#: calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Kun denne instansen"
 
-#: calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Denne og tidligere instanser"
 
-#: calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Denne og fremtidige instanser"
 
-#: calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Alle instanser"
 
-#: calendar/gui/dialogs/recurrence-page.c:493
+#: ../calendar/gui/dialogs/recurrence-page.c:493
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:799
+#: ../calendar/gui/dialogs/recurrence-page.c:812
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
-#: calendar/gui/dialogs/recurrence-page.c:910
+#: ../calendar/gui/dialogs/recurrence-page.c:923
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: ../calendar/gui/dialogs/recurrence-page.c:984
 msgid "first"
 msgstr "første"
 
-#: calendar/gui/dialogs/recurrence-page.c:972
+#: ../calendar/gui/dialogs/recurrence-page.c:985
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:973
+#: ../calendar/gui/dialogs/recurrence-page.c:986
 msgid "third"
 msgstr "tredje"
 
-#: calendar/gui/dialogs/recurrence-page.c:974
+#: ../calendar/gui/dialogs/recurrence-page.c:987
 msgid "fourth"
 msgstr "fjerde"
 
-#: calendar/gui/dialogs/recurrence-page.c:975
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "last"
 msgstr "siste"
 
-#: calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1011
 msgid "Other Date"
 msgstr "Annen dato"
 
-#: calendar/gui/dialogs/recurrence-page.c:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1163
+#: ../calendar/gui/dialogs/recurrence-page.c:1176
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1349
+#: ../calendar/gui/dialogs/recurrence-page.c:1362
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2315
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
 msgstr "<b>Unntak</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Forhåndsvis</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "<b>Recurrence</b>"
 msgstr "<b>Gjeninntreffelse</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Hver"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "This appointment rec_urs"
 msgstr "Denne avtalen _gjeninntreffer"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "for"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "for alltid"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "måned(er)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "til"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "uke(r)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/task-details-page.c:410
-#: calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:410
+#: ../calendar/gui/dialogs/task-details-page.c:429
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">Forskjellig\t</span>"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Status</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:229
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-tasks.c:345
-#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-itip-control.c:896
-#: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
-#: calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/task-details-page.glade.h:4
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-calendar-table.c:457
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-itip-control.c:896 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/e-meeting-store.c:219 ../calendar/gui/print.c:2349
 msgid "Completed"
 msgstr "Fullført"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:248
-#: calendar/gui/e-calendar-table.c:381 mail/message-list.c:1011
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1011
 msgid "High"
 msgstr "Høy"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:226
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-tasks.c:343
-#: calendar/gui/e-cal-model-tasks.c:656 calendar/gui/e-cal-model-tasks.c:731
-#: calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:226
+#: ../calendar/gui/e-calendar-table.c:456
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-cal-model-tasks.c:731 ../calendar/gui/print.c:2346
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:252
-#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1009
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1009
 msgid "Low"
 msgstr "Lav"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:250
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:899
-#: mail/message-list.c:1010
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:383 ../calendar/gui/e-cal-model.c:899
+#: ../mail/message-list.c:1010
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:236
-#: calendar/gui/e-calendar-table.c:454 calendar/gui/e-cal-model-tasks.c:341
-#: calendar/gui/e-cal-model-tasks.c:654 calendar/gui/print.c:2343
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-calendar-table.c:455
+#: ../calendar/gui/e-cal-model-tasks.c:341
+#: ../calendar/gui/e-cal-model-tasks.c:654 ../calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "P_ercent complete:"
 msgstr "Pros_ent fullført:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/e-calendar-table.c:385
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "Fullført _dato:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Nettside:"
 
-#: calendar/gui/dialogs/task-editor.c:136 calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:136 ../calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:156
-#: calendar/gui/dialogs/task-editor.c:218
-#: calendar/gui/dialogs/task-editor.c:357
+#: ../calendar/gui/dialogs/task-editor.c:156
+#: ../calendar/gui/dialogs/task-editor.c:218
+#: ../calendar/gui/dialogs/task-editor.c:357
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:524
+#: ../calendar/gui/dialogs/task-page.c:524
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/task-page.c:868
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
 
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "<span weight=\"bold\">Basics</span>"
 msgstr "<span weight=\"bold\">Grunnleggende</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr "<span weight=\"bold\">Dato og klokkeslett</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ad_vanced send options"
 msgstr "A_vanserte alternativer for sending"
 
-#: calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/dialogs/task-page.glade.h:10
 msgid "D_escription:"
 msgstr "B_eskrivelse:"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:13
 msgid "Sta_rt date:"
 msgstr "Sta_rtdato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "Task Description"
 msgstr "Beskrivelse av oppgave"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: ../calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Due date:"
 msgstr "Fer_dig-dato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: ../calendar/gui/dialogs/task-page.glade.h:17
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Ledig/opptatt-k_alendere</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Publiseringsfrekvens</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>_Lokasjon for publisering</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Innstillinger for publisering av ledig/opptatt-tid"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "_Daglig"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Manuell"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 msgid "_Remember password"
 msgstr "Hu_sk passord"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 msgid "_Username:"
 msgstr "Br_ukernavn:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "_Ukentlig"
 
-#: calendar/gui/e-alarm-list.c:395
+#: ../calendar/gui/e-alarm-list.c:395
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dager"
 
-#: calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d uke"
 msgstr[1] "%d uker"
 
-#: calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
-#: calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/e-alarm-list.c:410
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutt"
 msgstr[1] "%d minutter"
 
-#: calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:415
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utføres"
 
-#: calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s før avtalen starter"
 
-#: calendar/gui/e-alarm-list.c:477
+#: ../calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s etter avtalen har startet"
 
-#: calendar/gui/e-alarm-list.c:482
+#: ../calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved avtalens start"
 
-#: calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s før avtalen slutter"
 
-#: calendar/gui/e-alarm-list.c:494
+#: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s etter avtalens slutt"
 
-#: calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved avtalens slutt"
 
-#: calendar/gui/e-alarm-list.c:521
+#: ../calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: calendar/gui/e-alarm-list.c:527
+#: ../calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2467
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2470
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: calendar/gui/e-cal-component-preview.c:155 filter/filter-rule.c:795
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:795
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: calendar/gui/e-cal-component-preview.c:186
-#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.glade.h:11
+#: ../calendar/gui/e-cal-component-preview.c:186
+#: ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: calendar/gui/e-cal-component-preview.c:193
-#: calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-cal-component-preview.c:204
 msgid "Start Date:"
 msgstr "Startdato:"
 
-#: calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
 #. write status
 #. Status
-#: calendar/gui/e-cal-component-preview.c:222
-#: calendar/gui/e-itip-control.c:1132 plugins/itip-formatter/itip-view.c:838
+#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../plugins/itip-formatter/itip-view.c:840
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: calendar/gui/e-cal-component-preview.c:267
-#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-preview.c:299
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:433 calendar/gui/e-cal-model-calendar.c:179
+#: ../calendar/gui/e-calendar-table.c:434
+#: ../calendar/gui/e-cal-model-calendar.c:179
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/e-calendar-table.c:434 calendar/gui/e-cal-model-calendar.c:182
-#: calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-calendar-table.c:435
+#: ../calendar/gui/e-cal-model-calendar.c:182
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Opptatt"
 
-#: calendar/gui/e-calendar-table.c:689 calendar/gui/e-calendar-view.c:652
+#: ../calendar/gui/e-calendar-table.c:516
+msgid "Task Table"
+msgstr "Oppgavetabell"
+
+#: ../calendar/gui/e-calendar-table.c:694
+#: ../calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:868 calendar/gui/e-calendar-view.c:756
+#: ../calendar/gui/e-calendar-table.c:873
+#: ../calendar/gui/e-calendar-view.c:756
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-view.c:1064
-#: composer/e-msg-composer.c:1201
+#: ../calendar/gui/e-calendar-table.c:1014
+#: ../calendar/gui/e-calendar-view.c:1064 ../composer/e-msg-composer.c:1201
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: calendar/gui/e-calendar-table.c:1151 calendar/gui/e-calendar-view.c:1389
-#: mail/em-folder-view.c:927 ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1389 ../mail/em-folder-view.c:931
+#: ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Åpne"
 
-#: calendar/gui/e-calendar-table.c:1152
+#: ../calendar/gui/e-calendar-table.c:1157
 msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
-#: calendar/gui/e-calendar-table.c:1153 calendar/gui/e-calendar-view.c:1390
-#: mail/em-folder-view.c:929 mail/em-popup.c:498
-#: ui/evolution-mail-message.xml.h:128
+#: ../calendar/gui/e-calendar-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:1390 ../mail/em-folder-view.c:933
+#: ../mail/em-popup.c:493 ../ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: calendar/gui/e-calendar-table.c:1154 calendar/gui/e-calendar-view.c:1370
-#: calendar/gui/e-calendar-view.c:1391 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-mail-message.xml.h:125
-#: ui/evolution-tasks.xml.h:25
+#: ../calendar/gui/e-calendar-table.c:1159
+#: ../calendar/gui/e-calendar-view.c:1370
+#: ../calendar/gui/e-calendar-view.c:1391 ../ui/evolution-addressbook.xml.h:40
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1395
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1395 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
-#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1396
-#: composer/e-msg-composer.c:2901 mail/em-folder-tree.c:1036
-#: mail/message-list.c:1712 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1164
+#: ../calendar/gui/e-calendar-view.c:1396 ../composer/e-msg-composer.c:2901
+#: ../mail/em-folder-tree.c:1036 ../mail/message-list.c:1712
+#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:109 ../ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:1160 calendar/gui/e-calendar-view.c:1373
-#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1165
+#: ../calendar/gui/e-calendar-view.c:1373
+#: ../calendar/gui/e-calendar-view.c:1397 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:1164
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: calendar/gui/e-calendar-table.c:1165
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1166
+#: ../calendar/gui/e-calendar-table.c:1171
 msgid "_Mark as Complete"
 msgstr "_Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:1167
+#: ../calendar/gui/e-calendar-table.c:1172
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valgte oppgaver som fullført"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1171 calendar/gui/e-calendar-view.c:1408
-#: mail/em-folder-tree.c:2758 mail/em-folder-view.c:952
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1408 ../mail/em-folder-tree.c:2766
+#: ../mail/em-folder-view.c:956 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Slett"
 
-#: calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-table.c:1177
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: calendar/gui/e-calendar-table.c:1323
-#: calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-calendar-table.c:1328
+#: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klikk for å legge til en oppgave"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% ferdig"
 
-#: calendar/gui/e-calendar-table.etspec.h:5 mail/mail-send-recv.c:611
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:611
 msgid "Complete"
 msgstr "Fullført"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Ferdigstillingsdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Ferdigdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-dialogs.glade.h:21
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/mail-dialogs.glade.h:21
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Oppgavesortering"
 
-#: calendar/gui/e-calendar-view.c:1179
+#: ../calendar/gui/e-calendar-view.c:1179
 msgid "Moving items"
 msgstr "Flytter oppføringer"
 
-#: calendar/gui/e-calendar-view.c:1181
+#: ../calendar/gui/e-calendar-view.c:1181
 msgid "Copying items"
 msgstr "Kopierer oppføringer"
 
-#: calendar/gui/e-calendar-view.c:1364
+#: ../calendar/gui/e-calendar-view.c:1364
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/e-calendar-view.c:1365
+#: ../calendar/gui/e-calendar-view.c:1365
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1367
 msgid "New Task"
 msgstr "Ny oppgave"
 
 #. FIXME: hook in this somehow
-#: calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1377
 msgid "Current View"
 msgstr "Aktiv visning"
 
-#: calendar/gui/e-calendar-view.c:1379 ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1379 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
-#: calendar/gui/e-calendar-view.c:1380
+#: ../calendar/gui/e-calendar-view.c:1380
 msgid "_Select Date..."
 msgstr "_Velg dato..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: calendar/gui/e-calendar-view.c:1385 ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1385 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-calendar-view.c:1401
+#: ../calendar/gui/e-calendar-view.c:1401
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: calendar/gui/e-calendar-view.c:1402
+#: ../calendar/gui/e-calendar-view.c:1402
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: calendar/gui/e-calendar-view.c:1403
+#: ../calendar/gui/e-calendar-view.c:1403
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: calendar/gui/e-calendar-view.c:1404
+#: ../calendar/gui/e-calendar-view.c:1404
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1409
+#: ../calendar/gui/e-calendar-view.c:1409
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: calendar/gui/e-calendar-view.c:1410
+#: ../calendar/gui/e-calendar-view.c:1410
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-calendar-view.c:1411
+#: ../calendar/gui/e-calendar-view.c:1411
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "Start Date"
 msgstr "Startdato"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
-#: calendar/gui/e-meeting-list-view.c:139
-#: calendar/gui/e-meeting-list-view.c:153 calendar/gui/e-meeting-store.c:124
-#: calendar/gui/e-meeting-store.c:159 calendar/gui/e-meeting-store.c:224
-#: mail/em-utils.c:1157 plugins/itip-formatter/itip-formatter.c:249
-#: plugins/itip-formatter/itip-formatter.c:1387
-#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:202
-#: shell/e-component-registry.c:206 widgets/misc/e-charset-picker.c:62
+#: ../calendar/gui/e-cal-model.c:307 ../calendar/gui/e-cal-model.c:310
+#: ../calendar/gui/e-itip-control.c:1149 ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-meeting-list-view.c:139
+#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1157
+#: ../plugins/itip-formatter/itip-formatter.c:249
+#: ../plugins/itip-formatter/itip-formatter.c:1388
+#: ../plugins/plugin-manager/plugin-manager.c:72
+#: ../shell/e-component-registry.c:202 ../shell/e-component-registry.c:206
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/e-cal-model.c:901
+#: ../calendar/gui/e-cal-model.c:901
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: calendar/gui/e-cal-model.c:903
+#: ../calendar/gui/e-cal-model.c:903
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
-#: calendar/gui/e-meeting-list-view.c:163 calendar/gui/e-meeting-store.c:168
-#: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model.c:905 ../calendar/gui/e-cal-model-tasks.c:1017
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:808
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
-#: calendar/gui/e-meeting-list-view.c:164 calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model.c:905 ../calendar/gui/e-cal-model-tasks.c:1017
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:180
 msgid "No"
 msgstr "Nei"
 
-#: calendar/gui/e-cal-model-tasks.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:297
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/e-cal-model-tasks.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:297
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:299 ../smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Ø"
 
-#: calendar/gui/e-cal-model-tasks.c:299
+#: ../calendar/gui/e-cal-model-tasks.c:299
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/e-cal-model-tasks.c:606
+#: ../calendar/gui/e-cal-model-tasks.c:606
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6245,8 +6397,8 @@ msgstr ""
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:115 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
+#: ../e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
@@ -6255,12 +6407,12 @@ msgstr "%a %d.%m.%Y %H.%M.%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
+#: ../e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6272,14 +6424,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:748 calendar/gui/e-week-view.c:512
-#: calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:751 calendar/gui/e-week-view.c:515
-#: calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
@@ -6289,112 +6441,112 @@ msgstr "pm"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view.c:1494 calendar/gui/e-day-view-top-item.c:715
-#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view.c:1494 ../calendar/gui/e-day-view-top-item.c:715
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#: calendar/gui/e-day-view-time-item.c:527
+#: ../calendar/gui/e-day-view-time-item.c:527
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
-#: calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (enkel gjeninntreffelse)"
 
-#: calendar/gui/e-itip-control.c:772
+#: ../calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Hver dag"
 msgstr[1] "Hver %d dag"
 
-#: calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Hver uke"
 msgstr[1] "Hver %d uker"
 
-#: calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Hver uke på "
 msgstr[1] "Hver %d uker på "
 
-#: calendar/gui/e-itip-control.c:787
+#: ../calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:794
+#: ../calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: calendar/gui/e-itip-control.c:807
+#: ../calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: calendar/gui/e-itip-control.c:814
+#: ../calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hver måned"
 msgstr[1] "hver %d måneder"
 
-#: calendar/gui/e-itip-control.c:818
+#: ../calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Hvert år"
 msgstr[1] "Hvert %d år"
 
-#: calendar/gui/e-itip-control.c:829
+#: ../calendar/gui/e-itip-control.c:829
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " totalt %d gang"
 msgstr[1] " totalt %d ganger"
 
-#: calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", slutter på "
 
-#: calendar/gui/e-itip-control.c:862
+#: ../calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "Starter"
 
-#: calendar/gui/e-itip-control.c:875
+#: ../calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "Slutter"
 
-#: calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:909
 msgid "Due"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-itip-control.c:1006
+#: ../calendar/gui/e-itip-control.c:949 ../calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:966
+#: ../calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "iCalender-feil"
 
-#: calendar/gui/e-itip-control.c:1038 calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-itip-control.c:1082
-#: plugins/itip-formatter/itip-view.c:285
-#: plugins/itip-formatter/itip-view.c:286
-#: plugins/itip-formatter/itip-view.c:353
-#: plugins/itip-formatter/itip-view.c:354
+#: ../calendar/gui/e-itip-control.c:1038 ../calendar/gui/e-itip-control.c:1054
+#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1082
+#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:356
 msgid "An unknown person"
 msgstr "En ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1089
+#: ../calendar/gui/e-itip-control.c:1089
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6402,461 +6554,468 @@ msgstr ""
 "<br>Vennligst sjekk følgende informasjon og velg så en handling fra menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:175
-#: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
-#: calendar/gui/itip-utils.c:422 plugins/itip-formatter/itip-formatter.c:1378
+#: ../calendar/gui/e-itip-control.c:1137
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/itip-utils.c:422
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:425
-#: plugins/itip-formatter/itip-formatter.c:1381
+#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:425
+#: ../plugins/itip-formatter/itip-formatter.c:1382
 msgid "Tentatively Accepted"
 msgstr "Akteptert tentativt"
 
-#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:176
-#: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
-#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
-#: plugins/itip-formatter/itip-formatter.c:1384
+#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/itip-utils.c:428 ../calendar/gui/itip-utils.c:454
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-itip-control.c:1229
+#: ../calendar/gui/e-itip-control.c:1229
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr "Møtet er avlyst, men det ble ikke funnet i dine kalendere."
 
-#: calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr "Oppgaven er avlyst men den ble ikke funnet i dine oppgavelister"
 
-#: calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publisert møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1317
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> forespør at %s er tilstede i et møte."
 
-#: calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
 
-#: calendar/gui/e-itip-control.c:1320
+#: ../calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "Møteforslag"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte."
 
-#: calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ønsker å motta seneste møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1332
+#: ../calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "Forespørsel om møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1339
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart på en møteforespørsel."
 
-#: calendar/gui/e-itip-control.c:1340
+#: ../calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avlyst et møte."
 
-#: calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "Møteavlysing"
 
-#: calendar/gui/e-itip-control.c:1358 calendar/gui/e-itip-control.c:1435
-#: calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1358 ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforståelig melding."
 
-#: calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "Ugyldig møtemelding"
 
-#: calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om en oppgave."
 
-#: calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> forespør at %s utfører en oppgave."
 
-#: calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> forespør at du utfører en oppgave."
 
-#: calendar/gui/e-itip-control.c:1397
+#: ../calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "Forslag til oppgave"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave."
 
-#: calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1408
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
 
-#: calendar/gui/e-itip-control.c:1409
+#: ../calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "Forespørsel om oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1416
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart på en oppgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1417
+#: ../calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "Svar på oppgave"
 
-#: calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avlyst en oppgave."
 
-#: calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "Avlysning av oppgave"
 
-#: calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> forespør din ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt forespørsel"
 
-#: calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svart på en forespørsel etter ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: calendar/gui/e-itip-control.c:1551
+#: ../calendar/gui/e-itip-control.c:1551
 msgid "The message does not appear to be properly formed"
 msgstr "Meldingen ser ikke ut til å være riktig utformet"
 
-#: calendar/gui/e-itip-control.c:1610
+#: ../calendar/gui/e-itip-control.c:1610
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder forespørsler som ikke er støttet."
 
-#: calendar/gui/e-itip-control.c:1643
+#: ../calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1675
+#: ../calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1909
+#: ../calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "Oppdatering fullført\n"
 
-#: calendar/gui/e-itip-control.c:1937
+#: ../calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikke oppdateres\n"
 
-#: calendar/gui/e-itip-control.c:1947
+#: ../calendar/gui/e-itip-control.c:1947
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
 
-#: calendar/gui/e-itip-control.c:1959
+#: ../calendar/gui/e-itip-control.c:1959
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1976
+#: ../calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1979
-#: plugins/itip-formatter/itip-formatter.c:844
+#: ../calendar/gui/e-itip-control.c:1979
+#: ../plugins/itip-formatter/itip-formatter.c:845
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
 
-#: calendar/gui/e-itip-control.c:2006
+#: ../calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr "Fjerning fullført"
 
-#: calendar/gui/e-itip-control.c:2029 calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2029 ../calendar/gui/e-itip-control.c:2077
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2081
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:2161
+#: ../calendar/gui/e-itip-control.c:2161
 msgid "Choose an action:"
 msgstr "Velg en handling:"
 
-#: calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2232
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2261
 msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
-#: calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2262
 msgid "Decline"
 msgstr "Avslå"
 
-#: calendar/gui/e-itip-control.c:2291
+#: ../calendar/gui/e-itip-control.c:2291
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-itip-control.c:2319
 msgid "Update respondent status"
 msgstr "Oppdater status for respondent"
 
-#: calendar/gui/e-itip-control.c:2347
+#: ../calendar/gui/e-itip-control.c:2347
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: calendar/gui/e-itip-control.c:2375 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:408 mail/mail-send-recv.c:460
-#: ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:442
+#: ../mail/mail-send-recv.c:408 ../mail/mail-send-recv.c:460
+#: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
 msgstr "%P %%"
 
-#: calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--til--"
 
-#: calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Kalendermelding"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Dato:"
 
-#: calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Laster kalender"
 
-#: calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Laster kalender..."
 
-#: calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Tjenermelding:"
 
-#: calendar/gui/e-itip-control.glade.h:12
+#: ../calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "slutt-dato"
 
-#: calendar/gui/e-itip-control.glade.h:13
+#: ../calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-list-view.c:59
+#: ../calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:124
+#: ../calendar/gui/e-meeting-list-view.c:60
+#: ../calendar/gui/e-meeting-list-view.c:124
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
-#: calendar/gui/e-meeting-list-view.c:61
+#: ../calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: ../calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Ressurser"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:99
-#: calendar/gui/e-meeting-store.c:116 calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-list-view.c:135
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:101
-#: calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-list-view.c:136
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:103
-#: calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:137
+#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "Ressurs"
 
-#: calendar/gui/e-meeting-list-view.c:138 calendar/gui/e-meeting-store.c:105
-#: calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:138
+#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "Rom"
 
-#: calendar/gui/e-meeting-list-view.c:149 calendar/gui/e-meeting-store.c:134
-#: calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:149
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "Styremedlem"
 
-#: calendar/gui/e-meeting-list-view.c:150 calendar/gui/e-meeting-store.c:136
-#: calendar/gui/e-meeting-store.c:153 calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-list-view.c:150
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
-#: calendar/gui/e-meeting-list-view.c:151 calendar/gui/e-meeting-store.c:138
-#: calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: calendar/gui/e-meeting-list-view.c:152 calendar/gui/e-meeting-store.c:140
-#: calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: calendar/gui/e-meeting-list-view.c:174 calendar/gui/e-meeting-store.c:186
-#: calendar/gui/e-meeting-store.c:209 calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "Trenger handling"
 
-#: calendar/gui/e-meeting-list-view.c:177 calendar/gui/e-meeting-store.c:192
-#: calendar/gui/e-meeting-store.c:215 calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: calendar/gui/e-meeting-list-view.c:178 calendar/gui/e-meeting-store.c:194
-#: calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 msgid "Delegated"
 msgstr "Delegert"
 
-#: calendar/gui/e-meeting-store.c:198 calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: calendar/gui/e-meeting-time-sel.c:413 designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ute"
 
-#: calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2104
-#: calendar/gui/e-meeting-time-sel-item.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:2104
+#: ../calendar/gui/e-meeting-time-sel-item.c:444
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -6866,9 +7025,9 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2137
-#: calendar/gui/e-meeting-time-sel-item.c:448 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:448 ../e-util/e-time-utils.c:203
+#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -6878,17 +7037,17 @@ msgstr "%a %d.%m.%Y"
 #. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
+#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1660
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-pub-utils.c:300
+#: ../calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Oppgi passord for %s"
 
-#: calendar/gui/e-tasks.c:734 calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/e-tasks.c:734 ../calendar/gui/gnome-cal.c:2429
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6897,236 +7056,236 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:782
+#: ../calendar/gui/e-tasks.c:782
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: calendar/gui/e-tasks.c:864
+#: ../calendar/gui/e-tasks.c:864
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1061
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:1084
+#: ../calendar/gui/e-tasks.c:1084
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:1111
+#: ../calendar/gui/e-tasks.c:1111
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/e-tasks.c:1189
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/print.c:1822 calendar/gui/tasks-component.c:408
-#: calendar/gui/tasks-component.c:881 calendar/gui/tasks-control.c:410
-#: calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:709
-#: plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../calendar/gui/e-tasks.c:1189
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/print.c:1822 ../calendar/gui/tasks-component.c:408
+#: ../calendar/gui/tasks-component.c:881 ../calendar/gui/tasks-control.c:408
+#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:701
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: calendar/gui/e-timezone-entry.c:133
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Timezone Button"
 msgstr "Tidssone-knapp"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:329 calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:718
+#: ../calendar/gui/gnome-cal.c:718
 msgid "Updating query"
 msgstr "Oppdaterer spørring"
 
 #. bonobo displays this string so it must be in locale
-#: calendar/gui/gnome-cal.c:2040 widgets/menus/gal-view-menus.c:351
+#: ../calendar/gui/gnome-cal.c:2040 ../widgets/menus/gal-view-menus.c:351
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: calendar/gui/gnome-cal.c:2041
+#: ../calendar/gui/gnome-cal.c:2041
 msgid "Save Custom View"
 msgstr "Lagre egendefinert visning"
 
-#: calendar/gui/gnome-cal.c:2046 widgets/menus/gal-view-menus.c:373
+#: ../calendar/gui/gnome-cal.c:2046 ../widgets/menus/gal-view-menus.c:373
 msgid "Define Views..."
 msgstr "Definer visninger..."
 
-#: calendar/gui/gnome-cal.c:2206
+#: ../calendar/gui/gnome-cal.c:2206
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Laster avtaler på %s"
 
-#: calendar/gui/gnome-cal.c:2225
+#: ../calendar/gui/gnome-cal.c:2225
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Laster oppgaver på %s"
 
-#: calendar/gui/gnome-cal.c:2318
+#: ../calendar/gui/gnome-cal.c:2318
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: calendar/gui/gnome-cal.c:3286
+#: ../calendar/gui/gnome-cal.c:3286
 msgid "Purging"
 msgstr "Sletter"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolution kalender og oppgaver"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Konfigurasjonskontroll for Evolution kalender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visning for møteplanlegging i Evolution kalender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Redigering av kalender/oppgaver for Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Evolution kalenderkomponent"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Tasks component"
 msgstr "Oppgavekomponent for Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Kalendere"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: views/tasks/galview.xml.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
 
-#: calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "August"
 
-#: calendar/gui/goto-dialog.glade.h:3
+#: ../calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "Desember"
 
-#: calendar/gui/goto-dialog.glade.h:4
+#: ../calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Februar"
 
-#: calendar/gui/goto-dialog.glade.h:5
+#: ../calendar/gui/goto-dialog.glade.h:5
 msgid "January"
 msgstr "Januar"
 
-#: calendar/gui/goto-dialog.glade.h:6
+#: ../calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: ../calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: ../calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Mars"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: ../calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: ../calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: ../calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Oktober"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
 msgstr "Velg dato"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Velg i dag"
 
-#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
-#: calendar/gui/itip-utils.c:351
+#: ../calendar/gui/itip-utils.c:271 ../calendar/gui/itip-utils.c:319
+#: ../calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: calendar/gui/itip-utils.c:306
+#: ../calendar/gui/itip-utils.c:306
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: ../calendar/gui/itip-utils.c:394 ../calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
+#: ../calendar/gui/itip-utils.c:396 ../calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
+#: ../calendar/gui/itip-utils.c:398 ../calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
+#: ../calendar/gui/itip-utils.c:400 ../calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:402
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: calendar/gui/itip-utils.c:438
+#: ../calendar/gui/itip-utils.c:438
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: calendar/gui/itip-utils.c:446
+#: ../calendar/gui/itip-utils.c:446
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:450
+#: ../calendar/gui/itip-utils.c:450
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: calendar/gui/itip-utils.c:521
+#: ../calendar/gui/itip-utils.c:521
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: calendar/gui/itip-utils.c:531
+#: ../calendar/gui/itip-utils.c:531
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: calendar/gui/itip-utils.c:673
+#: ../calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: calendar/gui/migration.c:151
+#: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -7138,7 +7297,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:155
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -7150,331 +7309,327 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: calendar/gui/migration.c:381
+#: ../calendar/gui/migration.c:381
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdager og jubileum"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:479 calendar/gui/migration.c:572
+#: ../calendar/gui/migration.c:479 ../calendar/gui/migration.c:572
 msgid "On The Web"
 msgstr "På nettet"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:738 calendar/gui/migration.c:905
+#: ../calendar/gui/migration.c:738 ../calendar/gui/migration.c:905
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Kan ikke migrere gamle innstillinger fra evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:767
+#: ../calendar/gui/migration.c:767
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kan ikke migrere kalender «%s»"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:934
+#: ../calendar/gui/migration.c:934
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan ikke migrere oppgaver «%s»"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:498
+#: ../calendar/gui/print.c:498
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Su"
 msgstr "Sø."
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Mo"
 msgstr "Ma."
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Tu"
 msgstr "Ti."
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "We"
 msgstr "On."
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Th"
 msgstr "To."
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Fr"
 msgstr "Fr."
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Sa"
 msgstr "Lø."
 
 #. Day
-#: calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1942 calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1947 calendar/gui/print.c:1949
-#: calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Valgt måned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2359
+#: ../calendar/gui/print.c:2359
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2376
+#: ../calendar/gui/print.c:2376
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2414
+#: ../calendar/gui/print.c:2414
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2425
+#: ../calendar/gui/print.c:2425
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2562 calendar/gui/print.c:2648
-#: calendar/gui/print.c:2740 mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2565 ../calendar/gui/print.c:2653
+#: ../calendar/gui/print.c:2779 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: calendar/gui/print.c:2596
+#: ../calendar/gui/print.c:2600
 msgid "Print Item"
 msgstr "Skriv ut oppføring"
 
-#: calendar/gui/print.c:2762
-msgid "Print Setup"
-msgstr "Skriveroppsett"
-
-#: calendar/gui/tasks-component.c:328
+#: ../calendar/gui/tasks-component.c:328
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: calendar/gui/tasks-component.c:404
+#: ../calendar/gui/tasks-component.c:404
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: calendar/gui/tasks-component.c:406 mail/mail-component.c:523
+#: ../calendar/gui/tasks-component.c:406 ../mail/mail-component.c:523
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valgt"
 msgstr[1] ", %d valgt"
 
-#: calendar/gui/tasks-component.c:453
+#: ../calendar/gui/tasks-component.c:453
 msgid "Failed upgrading tasks."
 msgstr "Feil under oppgradering av oppgaver."
 
-#: calendar/gui/tasks-component.c:747
+#: ../calendar/gui/tasks-component.c:747
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne oppgaveliste «%s» for oppretting av hendelser og møter"
 
-#: calendar/gui/tasks-component.c:762
+#: ../calendar/gui/tasks-component.c:762
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
-#: calendar/gui/tasks-component.c:856
+#: ../calendar/gui/tasks-component.c:856
 msgid "Task Source Selector"
 msgstr "Valgt av oppgavekilde"
 
-#: calendar/gui/tasks-component.c:1039
+#: ../calendar/gui/tasks-component.c:1039
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/tasks-component.c:1040
+#: ../calendar/gui/tasks-component.c:1040
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: calendar/gui/tasks-component.c:1041
+#: ../calendar/gui/tasks-component.c:1041
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: calendar/gui/tasks-component.c:1047
+#: ../calendar/gui/tasks-component.c:1047
 msgid "New assigned task"
 msgstr "Ny tildelt oppgave"
 
-#: calendar/gui/tasks-component.c:1048
+#: ../calendar/gui/tasks-component.c:1048
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
-#: calendar/gui/tasks-component.c:1049
+#: ../calendar/gui/tasks-component.c:1049
 msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
-#: calendar/gui/tasks-component.c:1055
+#: ../calendar/gui/tasks-component.c:1055
 msgid "New task list"
 msgstr "Ny oppgaveliste"
 
-#: calendar/gui/tasks-component.c:1056
+#: ../calendar/gui/tasks-component.c:1056
 msgid "Task l_ist"
 msgstr "Oppgave_liste"
 
-#: calendar/gui/tasks-component.c:1057
+#: ../calendar/gui/tasks-component.c:1057
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
-#: calendar/gui/tasks-control.c:372
+#: ../calendar/gui/tasks-control.c:370
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7486,52 +7641,52 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: calendar/gui/tasks-control.c:375
+#: ../calendar/gui/tasks-control.c:373
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
-#: calendar/gui/tasks-control.c:433
+#: ../calendar/gui/tasks-control.c:408
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
 #. The first letter of each day of the week starting with Sunday
-#: calendar/gui/weekday-picker.c:319
+#: ../calendar/gui/weekday-picker.c:319
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligent import for Evolution kalender"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar-import"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar-import"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-filer (.ics)"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:82
+#: ../calendar/importers/icalendar-importer.c:82
 msgid "Appointments and Meetings"
 msgstr "Avtaler og møter"
 
-#: calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:486
 msgid "Reminder!!"
 msgstr "Påminnelse!!"
 
-#: calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:694
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
 
-#: calendar/importers/icalendar-importer.c:727
+#: ../calendar/importers/icalendar-importer.c:719
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7544,1595 +7699,1539 @@ msgstr ""
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: calendar/zones.h:7
+#: ../calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidjan"
 
-#: calendar/zones.h:8
+#: ../calendar/zones.h:8
 msgid "Africa/Accra"
 msgstr "Afrika/Akkra"
 
-#: calendar/zones.h:9
+#: ../calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Addis_Abeba"
 
-#: calendar/zones.h:10
+#: ../calendar/zones.h:10
 msgid "Africa/Algiers"
 msgstr "Afrika/Algier"
 
-#: calendar/zones.h:11
+#: ../calendar/zones.h:11
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: calendar/zones.h:12
+#: ../calendar/zones.h:12
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: calendar/zones.h:13
+#: ../calendar/zones.h:13
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: calendar/zones.h:14
+#: ../calendar/zones.h:14
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: calendar/zones.h:15
+#: ../calendar/zones.h:15
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: calendar/zones.h:16
+#: ../calendar/zones.h:16
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: calendar/zones.h:17
+#: ../calendar/zones.h:17
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: calendar/zones.h:18
+#: ../calendar/zones.h:18
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: calendar/zones.h:19
+#: ../calendar/zones.h:19
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: calendar/zones.h:20
+#: ../calendar/zones.h:20
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: calendar/zones.h:21
+#: ../calendar/zones.h:21
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: calendar/zones.h:22
+#: ../calendar/zones.h:22
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: calendar/zones.h:23
+#: ../calendar/zones.h:23
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: calendar/zones.h:24
+#: ../calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_salaam"
 
-#: calendar/zones.h:25
+#: ../calendar/zones.h:25
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: calendar/zones.h:26
+#: ../calendar/zones.h:26
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: calendar/zones.h:27
+#: ../calendar/zones.h:27
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: calendar/zones.h:28
+#: ../calendar/zones.h:28
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: calendar/zones.h:29
+#: ../calendar/zones.h:29
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: calendar/zones.h:30
+#: ../calendar/zones.h:30
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: calendar/zones.h:31
+#: ../calendar/zones.h:31
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: calendar/zones.h:32
+#: ../calendar/zones.h:32
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: calendar/zones.h:33
+#: ../calendar/zones.h:33
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: calendar/zones.h:34
+#: ../calendar/zones.h:34
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: calendar/zones.h:35
+#: ../calendar/zones.h:35
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: calendar/zones.h:36
+#: ../calendar/zones.h:36
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: calendar/zones.h:37
+#: ../calendar/zones.h:37
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: calendar/zones.h:38
+#: ../calendar/zones.h:38
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: calendar/zones.h:39
+#: ../calendar/zones.h:39
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: calendar/zones.h:40
+#: ../calendar/zones.h:40
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: calendar/zones.h:41
+#: ../calendar/zones.h:41
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: calendar/zones.h:42
+#: ../calendar/zones.h:42
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: calendar/zones.h:43
+#: ../calendar/zones.h:43
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: calendar/zones.h:44
+#: ../calendar/zones.h:44
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: calendar/zones.h:45
+#: ../calendar/zones.h:45
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: calendar/zones.h:46
+#: ../calendar/zones.h:46
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: calendar/zones.h:47
+#: ../calendar/zones.h:47
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: calendar/zones.h:48
+#: ../calendar/zones.h:48
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: calendar/zones.h:49
+#: ../calendar/zones.h:49
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: calendar/zones.h:50
+#: ../calendar/zones.h:50
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: calendar/zones.h:51
+#: ../calendar/zones.h:51
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: calendar/zones.h:52
+#: ../calendar/zones.h:52
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: calendar/zones.h:53
+#: ../calendar/zones.h:53
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: calendar/zones.h:54
+#: ../calendar/zones.h:54
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: calendar/zones.h:55
+#: ../calendar/zones.h:55
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: calendar/zones.h:56
+#: ../calendar/zones.h:56
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: calendar/zones.h:57
+#: ../calendar/zones.h:57
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: calendar/zones.h:58
+#: ../calendar/zones.h:58
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: calendar/zones.h:59
+#: ../calendar/zones.h:59
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: calendar/zones.h:60
+#: ../calendar/zones.h:60
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: calendar/zones.h:61
+#: ../calendar/zones.h:61
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: calendar/zones.h:62
+#: ../calendar/zones.h:62
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: calendar/zones.h:63
+#: ../calendar/zones.h:63
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: calendar/zones.h:64
+#: ../calendar/zones.h:64
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: calendar/zones.h:65
+#: ../calendar/zones.h:65
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: calendar/zones.h:66
+#: ../calendar/zones.h:66
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: calendar/zones.h:67
+#: ../calendar/zones.h:67
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: calendar/zones.h:68
+#: ../calendar/zones.h:68
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: calendar/zones.h:69
+#: ../calendar/zones.h:69
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: calendar/zones.h:70
+#: ../calendar/zones.h:70
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: calendar/zones.h:71
+#: ../calendar/zones.h:71
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: calendar/zones.h:72
+#: ../calendar/zones.h:72
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: calendar/zones.h:73
+#: ../calendar/zones.h:73
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: calendar/zones.h:74
+#: ../calendar/zones.h:74
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: calendar/zones.h:75
+#: ../calendar/zones.h:75
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: calendar/zones.h:76
+#: ../calendar/zones.h:76
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: calendar/zones.h:77
+#: ../calendar/zones.h:77
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: calendar/zones.h:78
+#: ../calendar/zones.h:78
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: calendar/zones.h:79
+#: ../calendar/zones.h:79
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: calendar/zones.h:80
+#: ../calendar/zones.h:80
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: calendar/zones.h:81
+#: ../calendar/zones.h:81
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: calendar/zones.h:82
+#: ../calendar/zones.h:82
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
-#: calendar/zones.h:83
+#: ../calendar/zones.h:83
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: calendar/zones.h:84
+#: ../calendar/zones.h:84
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: calendar/zones.h:85
+#: ../calendar/zones.h:85
 msgid "America/Danmarkshavn"
 msgstr "Amerika/Danmarkshavn"
 
-#: calendar/zones.h:86
+#: ../calendar/zones.h:86
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: calendar/zones.h:87
+#: ../calendar/zones.h:87
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: calendar/zones.h:88
+#: ../calendar/zones.h:88
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: calendar/zones.h:89
+#: ../calendar/zones.h:89
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: calendar/zones.h:90
+#: ../calendar/zones.h:90
 msgid "America/Dominica"
 msgstr "Amerika/Dominika"
 
-#: calendar/zones.h:91
+#: ../calendar/zones.h:91
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: calendar/zones.h:92
+#: ../calendar/zones.h:92
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: calendar/zones.h:93
+#: ../calendar/zones.h:93
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: calendar/zones.h:94
+#: ../calendar/zones.h:94
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: calendar/zones.h:95
+#: ../calendar/zones.h:95
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: calendar/zones.h:96
+#: ../calendar/zones.h:96
 msgid "America/Godthab"
 msgstr "Amerika/Kapp_det_gode_håp"
 
-#: calendar/zones.h:97
+#: ../calendar/zones.h:97
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: calendar/zones.h:98
+#: ../calendar/zones.h:98
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: calendar/zones.h:99
+#: ../calendar/zones.h:99
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: calendar/zones.h:100
+#: ../calendar/zones.h:100
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: calendar/zones.h:101
+#: ../calendar/zones.h:101
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: calendar/zones.h:102
+#: ../calendar/zones.h:102
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: calendar/zones.h:103
+#: ../calendar/zones.h:103
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: calendar/zones.h:104
+#: ../calendar/zones.h:104
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: calendar/zones.h:105
+#: ../calendar/zones.h:105
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: calendar/zones.h:106
+#: ../calendar/zones.h:106
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: calendar/zones.h:107
+#: ../calendar/zones.h:107
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: calendar/zones.h:108
+#: ../calendar/zones.h:108
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: calendar/zones.h:109
+#: ../calendar/zones.h:109
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: calendar/zones.h:110
+#: ../calendar/zones.h:110
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: calendar/zones.h:111
+#: ../calendar/zones.h:111
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: calendar/zones.h:112
+#: ../calendar/zones.h:112
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: calendar/zones.h:113
+#: ../calendar/zones.h:113
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: calendar/zones.h:114
+#: ../calendar/zones.h:114
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
-#: calendar/zones.h:115
+#: ../calendar/zones.h:115
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: calendar/zones.h:116
+#: ../calendar/zones.h:116
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: calendar/zones.h:117
+#: ../calendar/zones.h:117
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: calendar/zones.h:118
+#: ../calendar/zones.h:118
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: calendar/zones.h:119
+#: ../calendar/zones.h:119
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: calendar/zones.h:120
+#: ../calendar/zones.h:120
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: calendar/zones.h:121
+#: ../calendar/zones.h:121
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: calendar/zones.h:122
+#: ../calendar/zones.h:122
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: calendar/zones.h:123
+#: ../calendar/zones.h:123
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: calendar/zones.h:124
+#: ../calendar/zones.h:124
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: calendar/zones.h:125
+#: ../calendar/zones.h:125
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: calendar/zones.h:126
+#: ../calendar/zones.h:126
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: calendar/zones.h:127
+#: ../calendar/zones.h:127
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: calendar/zones.h:128
+#: ../calendar/zones.h:128
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: calendar/zones.h:129
+#: ../calendar/zones.h:129
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: calendar/zones.h:130
+#: ../calendar/zones.h:130
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: calendar/zones.h:131
+#: ../calendar/zones.h:131
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: calendar/zones.h:132
+#: ../calendar/zones.h:132
 msgid "America/Miquelon"
 msgstr "America/Miquelon"
 
-#: calendar/zones.h:133
+#: ../calendar/zones.h:133
 msgid "America/Monterrey"
 msgstr "Amerika/Menterrey"
 
-#: calendar/zones.h:134
+#: ../calendar/zones.h:134
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: calendar/zones.h:135
+#: ../calendar/zones.h:135
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: calendar/zones.h:136
+#: ../calendar/zones.h:136
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: calendar/zones.h:137
+#: ../calendar/zones.h:137
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: calendar/zones.h:138 widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../calendar/zones.h:138
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: calendar/zones.h:139
+#: ../calendar/zones.h:139
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: calendar/zones.h:140
+#: ../calendar/zones.h:140
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: calendar/zones.h:141
+#: ../calendar/zones.h:141
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: calendar/zones.h:142
+#: ../calendar/zones.h:142
 msgid "America/North_Dakota/Center"
 msgstr "Amerika/North_Dakota/Center"
 
-#: calendar/zones.h:143
+#: ../calendar/zones.h:143
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: calendar/zones.h:144
+#: ../calendar/zones.h:144
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: calendar/zones.h:145
+#: ../calendar/zones.h:145
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: calendar/zones.h:146
+#: ../calendar/zones.h:146
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: calendar/zones.h:147
+#: ../calendar/zones.h:147
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: calendar/zones.h:148
+#: ../calendar/zones.h:148
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: calendar/zones.h:149
+#: ../calendar/zones.h:149
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: calendar/zones.h:150
+#: ../calendar/zones.h:150
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: calendar/zones.h:151
+#: ../calendar/zones.h:151
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: calendar/zones.h:152
+#: ../calendar/zones.h:152
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: calendar/zones.h:153
+#: ../calendar/zones.h:153
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: calendar/zones.h:154
+#: ../calendar/zones.h:154
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: calendar/zones.h:155
+#: ../calendar/zones.h:155
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: calendar/zones.h:156
+#: ../calendar/zones.h:156
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: calendar/zones.h:157
+#: ../calendar/zones.h:157
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: calendar/zones.h:158
+#: ../calendar/zones.h:158
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: calendar/zones.h:159
+#: ../calendar/zones.h:159
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: calendar/zones.h:160
+#: ../calendar/zones.h:160
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: calendar/zones.h:161
+#: ../calendar/zones.h:161
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: calendar/zones.h:162
+#: ../calendar/zones.h:162
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: calendar/zones.h:163
+#: ../calendar/zones.h:163
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: calendar/zones.h:164
+#: ../calendar/zones.h:164
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: calendar/zones.h:165
+#: ../calendar/zones.h:165
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: calendar/zones.h:166
+#: ../calendar/zones.h:166
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: calendar/zones.h:167
+#: ../calendar/zones.h:167
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: calendar/zones.h:168
+#: ../calendar/zones.h:168
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: calendar/zones.h:169
+#: ../calendar/zones.h:169
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: calendar/zones.h:170
+#: ../calendar/zones.h:170
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: calendar/zones.h:171
+#: ../calendar/zones.h:171
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: calendar/zones.h:172
+#: ../calendar/zones.h:172
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: calendar/zones.h:173
+#: ../calendar/zones.h:173
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: calendar/zones.h:174
+#: ../calendar/zones.h:174
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: calendar/zones.h:175
+#: ../calendar/zones.h:175
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: calendar/zones.h:176
+#: ../calendar/zones.h:176
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: calendar/zones.h:177
+#: ../calendar/zones.h:177
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: calendar/zones.h:178
+#: ../calendar/zones.h:178
 msgid "Antarctica/Casey"
 msgstr "Antarktis/Casey"
 
-#: calendar/zones.h:179
+#: ../calendar/zones.h:179
 msgid "Antarctica/Davis"
 msgstr "Antarktis/Davis"
 
-#: calendar/zones.h:180
+#: ../calendar/zones.h:180
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktis/DumontDUrville"
 
-#: calendar/zones.h:181
+#: ../calendar/zones.h:181
 msgid "Antarctica/Mawson"
 msgstr "Antarktis/Mawson"
 
-#: calendar/zones.h:182
+#: ../calendar/zones.h:182
 msgid "Antarctica/McMurdo"
 msgstr "Antarktis/McMurdo"
 
-#: calendar/zones.h:183
+#: ../calendar/zones.h:183
 msgid "Antarctica/Palmer"
 msgstr "Antarktis/Palmer"
 
-#: calendar/zones.h:184
+#: ../calendar/zones.h:184
 msgid "Antarctica/South_Pole"
 msgstr "Antarktis/Sydpolen"
 
-#: calendar/zones.h:185
+#: ../calendar/zones.h:185
 msgid "Antarctica/Syowa"
 msgstr "Antarktis/Syowa"
 
-#: calendar/zones.h:186
+#: ../calendar/zones.h:186
 msgid "Antarctica/Vostok"
 msgstr "Antarktis/Vostok"
 
-#: calendar/zones.h:187
+#: ../calendar/zones.h:187
 msgid "Arctic/Longyearbyen"
 msgstr "Arktis/Longyearbyen"
 
-#: calendar/zones.h:188
+#: ../calendar/zones.h:188
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: calendar/zones.h:189
+#: ../calendar/zones.h:189
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: calendar/zones.h:190
+#: ../calendar/zones.h:190
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: calendar/zones.h:191
+#: ../calendar/zones.h:191
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: calendar/zones.h:192
+#: ../calendar/zones.h:192
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: calendar/zones.h:193
+#: ../calendar/zones.h:193
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: calendar/zones.h:194
+#: ../calendar/zones.h:194
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: calendar/zones.h:195
+#: ../calendar/zones.h:195
 msgid "Asia/Baghdad"
 msgstr "Asia/Bagdad"
 
-#: calendar/zones.h:196
+#: ../calendar/zones.h:196
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: calendar/zones.h:197
+#: ../calendar/zones.h:197
 msgid "Asia/Baku"
 msgstr "Asia/Bakuc"
 
-#: calendar/zones.h:198
+#: ../calendar/zones.h:198
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: calendar/zones.h:199
+#: ../calendar/zones.h:199
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: calendar/zones.h:200
+#: ../calendar/zones.h:200
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: calendar/zones.h:201
+#: ../calendar/zones.h:201
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: calendar/zones.h:202
+#: ../calendar/zones.h:202
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: calendar/zones.h:203
+#: ../calendar/zones.h:203
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: calendar/zones.h:204
+#: ../calendar/zones.h:204
 msgid "Asia/Chongqing"
 msgstr "Asia Chongqing"
 
-#: calendar/zones.h:205
+#: ../calendar/zones.h:205
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: calendar/zones.h:206
+#: ../calendar/zones.h:206
 msgid "Asia/Damascus"
 msgstr "Asia/Damaskus"
 
-#: calendar/zones.h:207
+#: ../calendar/zones.h:207
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: calendar/zones.h:208
+#: ../calendar/zones.h:208
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: calendar/zones.h:209
+#: ../calendar/zones.h:209
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: calendar/zones.h:210
+#: ../calendar/zones.h:210
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: calendar/zones.h:211
+#: ../calendar/zones.h:211
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: calendar/zones.h:212
+#: ../calendar/zones.h:212
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: calendar/zones.h:213
+#: ../calendar/zones.h:213
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: calendar/zones.h:214
+#: ../calendar/zones.h:214
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: calendar/zones.h:215
+#: ../calendar/zones.h:215
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: calendar/zones.h:216
+#: ../calendar/zones.h:216
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: calendar/zones.h:217
+#: ../calendar/zones.h:217
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: calendar/zones.h:218
+#: ../calendar/zones.h:218
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: calendar/zones.h:219
+#: ../calendar/zones.h:219
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: calendar/zones.h:220
+#: ../calendar/zones.h:220
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: calendar/zones.h:221
+#: ../calendar/zones.h:221
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: calendar/zones.h:222
+#: ../calendar/zones.h:222
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: calendar/zones.h:223
+#: ../calendar/zones.h:223
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: calendar/zones.h:224
+#: ../calendar/zones.h:224
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: calendar/zones.h:225
+#: ../calendar/zones.h:225
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: calendar/zones.h:226
+#: ../calendar/zones.h:226
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: calendar/zones.h:227
+#: ../calendar/zones.h:227
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: calendar/zones.h:228
+#: ../calendar/zones.h:228
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: calendar/zones.h:229
+#: ../calendar/zones.h:229
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: calendar/zones.h:230
+#: ../calendar/zones.h:230
 msgid "Asia/Macau"
 msgstr "Asia/Mucau"
 
-#: calendar/zones.h:231
+#: ../calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: calendar/zones.h:232
+#: ../calendar/zones.h:232
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: calendar/zones.h:233
+#: ../calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: calendar/zones.h:234
+#: ../calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: calendar/zones.h:235
+#: ../calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: calendar/zones.h:236
+#: ../calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: calendar/zones.h:237
+#: ../calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: calendar/zones.h:238
+#: ../calendar/zones.h:238
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: calendar/zones.h:239
+#: ../calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: calendar/zones.h:240
+#: ../calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: calendar/zones.h:241
+#: ../calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: calendar/zones.h:242
+#: ../calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: calendar/zones.h:243
+#: ../calendar/zones.h:243
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: calendar/zones.h:244
+#: ../calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: calendar/zones.h:245
+#: ../calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: calendar/zones.h:246
+#: ../calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: calendar/zones.h:247
+#: ../calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: calendar/zones.h:248
+#: ../calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: calendar/zones.h:249
+#: ../calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: calendar/zones.h:250
+#: ../calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: calendar/zones.h:251
+#: ../calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: calendar/zones.h:252
+#: ../calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: calendar/zones.h:253
+#: ../calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: calendar/zones.h:254
+#: ../calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: calendar/zones.h:255
+#: ../calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asia/Teheran"
 
-#: calendar/zones.h:256
+#: ../calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: calendar/zones.h:257
+#: ../calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: calendar/zones.h:258
+#: ../calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: calendar/zones.h:259
+#: ../calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: calendar/zones.h:260
+#: ../calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: calendar/zones.h:261
+#: ../calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: calendar/zones.h:262
+#: ../calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: calendar/zones.h:263
+#: ../calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: calendar/zones.h:264
+#: ../calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: calendar/zones.h:265
+#: ../calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: calendar/zones.h:266
+#: ../calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlanteren/Azorene"
 
-#: calendar/zones.h:267
+#: ../calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantisk/Bermuda"
 
-#: calendar/zones.h:268
+#: ../calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlanteren/Kanariøyene"
 
-#: calendar/zones.h:269
+#: ../calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantisk/Kapp_Verde"
 
-#: calendar/zones.h:270
+#: ../calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlanteren/Færøyene"
 
-#: calendar/zones.h:271
+#: ../calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlanteren/Jan_Mayen"
 
-#: calendar/zones.h:272
+#: ../calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlanteren/Madeira"
 
-#: calendar/zones.h:273
+#: ../calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlanteren/Reykjavik"
 
-#: calendar/zones.h:274
+#: ../calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlanteren/Syd-Georgia"
 
-#: calendar/zones.h:275
+#: ../calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlanteren/St_Helena"
 
-#: calendar/zones.h:276
+#: ../calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlanteren/Stanley"
 
-#: calendar/zones.h:277
+#: ../calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: calendar/zones.h:278
+#: ../calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: calendar/zones.h:279
+#: ../calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: calendar/zones.h:280
+#: ../calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: calendar/zones.h:281
+#: ../calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: calendar/zones.h:282
+#: ../calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: calendar/zones.h:283
+#: ../calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: calendar/zones.h:284
+#: ../calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: calendar/zones.h:285
+#: ../calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: calendar/zones.h:286
+#: ../calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: calendar/zones.h:287
+#: ../calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: calendar/zones.h:288
+#: ../calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:289
+#: ../calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Aten"
 
-#: calendar/zones.h:290
+#: ../calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:291
+#: ../calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Beograd"
 
-#: calendar/zones.h:292
+#: ../calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: calendar/zones.h:293
+#: ../calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:294
+#: ../calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Brussel"
 
-#: calendar/zones.h:295
+#: ../calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukuresti"
 
-#: calendar/zones.h:296
+#: ../calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: calendar/zones.h:297
+#: ../calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: calendar/zones.h:298
+#: ../calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/København"
 
-#: calendar/zones.h:299
+#: ../calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: calendar/zones.h:300
+#: ../calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: calendar/zones.h:301
+#: ../calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: calendar/zones.h:302
+#: ../calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: calendar/zones.h:303
+#: ../calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: calendar/zones.h:304
+#: ../calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: calendar/zones.h:305
+#: ../calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: calendar/zones.h:306
+#: ../calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: calendar/zones.h:307
+#: ../calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: calendar/zones.h:308
+#: ../calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxembourg"
 
-#: calendar/zones.h:309
+#: ../calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: calendar/zones.h:310
+#: ../calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:311
+#: ../calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:312
+#: ../calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: calendar/zones.h:313
+#: ../calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Moskva"
 
-#: calendar/zones.h:314
+#: ../calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: calendar/zones.h:315
+#: ../calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:316
+#: ../calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: calendar/zones.h:317
+#: ../calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Praha"
 
-#: calendar/zones.h:318
+#: ../calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:319
+#: ../calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: calendar/zones.h:320
+#: ../calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:321
+#: ../calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: calendar/zones.h:322
+#: ../calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:323
+#: ../calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: calendar/zones.h:324
+#: ../calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:325
+#: ../calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: calendar/zones.h:326
+#: ../calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: calendar/zones.h:327
+#: ../calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:328
+#: ../calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tirane"
 
-#: calendar/zones.h:329
+#: ../calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: calendar/zones.h:330
+#: ../calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:331
+#: ../calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikanet"
 
-#: calendar/zones.h:332
+#: ../calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Wien"
 
-#: calendar/zones.h:333
+#: ../calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:334
+#: ../calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Warshava"
 
-#: calendar/zones.h:335
+#: ../calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: calendar/zones.h:336
+#: ../calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: calendar/zones.h:337
+#: ../calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Zürich"
 
-#: calendar/zones.h:338
+#: ../calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indiske hav/Antananarivo"
 
-#: calendar/zones.h:339
+#: ../calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indiske hav/Chagos"
 
-#: calendar/zones.h:340
+#: ../calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indiske hav/Juleøya"
 
-#: calendar/zones.h:341
+#: ../calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indiske hav/Cocos"
 
-#: calendar/zones.h:342
+#: ../calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indiske hav/Komorene"
 
-#: calendar/zones.h:343
+#: ../calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indiske hav/Kerguelen"
 
-#: calendar/zones.h:344
+#: ../calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indiske hav/Mahe"
 
-#: calendar/zones.h:345
+#: ../calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indiske hav/Maldivene"
 
-#: calendar/zones.h:346
+#: ../calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indiske hav/Mauritius"
 
-#: calendar/zones.h:347
+#: ../calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indiske hav/Mayotte"
 
-#: calendar/zones.h:348
+#: ../calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indiske hav/Reunion"
 
-#: calendar/zones.h:349
+#: ../calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Stillehavet/Apia"
 
-#: calendar/zones.h:350
+#: ../calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Stillehavet/Auckland"
 
-#: calendar/zones.h:351
+#: ../calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Stillehavet/Chatham"
 
-#: calendar/zones.h:352
+#: ../calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Stillehavet/Påskeøya"
 
-#: calendar/zones.h:353
+#: ../calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Stillehavet/Efate"
 
-#: calendar/zones.h:354
+#: ../calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Stillehavet/Enderbury"
 
-#: calendar/zones.h:355
+#: ../calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Stillehavet/Fakaofo"
 
-#: calendar/zones.h:356
+#: ../calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Stillehavet/Fijiøyene"
 
-#: calendar/zones.h:357
+#: ../calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Stillehavet/Funafuti"
 
-#: calendar/zones.h:358
+#: ../calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Stillehavet/Galapagos"
 
-#: calendar/zones.h:359
+#: ../calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Stillehavet/Gambier"
 
-#: calendar/zones.h:360
+#: ../calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Stillehavet/Guadalcanal"
 
-#: calendar/zones.h:361
+#: ../calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Stillehavet/Guam"
 
-#: calendar/zones.h:362
+#: ../calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Stillehavet/Honolulu"
 
-#: calendar/zones.h:363
+#: ../calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Stillehavet/Johnston"
 
-#: calendar/zones.h:364
+#: ../calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Stillehavet/Kiritimati"
 
-#: calendar/zones.h:365
+#: ../calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Stillehavet/Kosrae"
 
-#: calendar/zones.h:366
+#: ../calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Stillehavet/Kwajalein"
 
-#: calendar/zones.h:367
+#: ../calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Stillehavet/Majuro"
 
-#: calendar/zones.h:368
+#: ../calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Stillehavet/Marquesas"
 
-#: calendar/zones.h:369
+#: ../calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Stillehavet/Midway"
 
-#: calendar/zones.h:370
+#: ../calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Stillehavet/Nauru"
 
-#: calendar/zones.h:371
+#: ../calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Stillehavet/Niue"
 
-#: calendar/zones.h:372
+#: ../calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Stillehavet/Norfolk"
 
-#: calendar/zones.h:373
+#: ../calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Stillehavet/Noumea"
 
-#: calendar/zones.h:374
+#: ../calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Stillehavet/Pago_Pago"
 
-#: calendar/zones.h:375
+#: ../calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Stillehavet/Palau"
 
-#: calendar/zones.h:376
+#: ../calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Stillehavet/Pitcairn"
 
-#: calendar/zones.h:377
+#: ../calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Stillehavet/Ponape"
 
-#: calendar/zones.h:378
+#: ../calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Stillehavet/Port_Moresby"
 
-#: calendar/zones.h:379
+#: ../calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Stillehavet/Rarotonga"
 
-#: calendar/zones.h:380
+#: ../calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Stillehavet/Saipan"
 
-#: calendar/zones.h:381
+#: ../calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Stillehavet/Tahiti"
 
-#: calendar/zones.h:382
+#: ../calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Stillehavet/Tarawa"
 
-#: calendar/zones.h:383
+#: ../calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Stillehavet/Tongatapu"
 
-#: calendar/zones.h:384
+#: ../calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Stillehavet/Truk"
 
-#: calendar/zones.h:385
+#: ../calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Stillehavet/Wake"
 
-#: calendar/zones.h:386
+#: ../calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Stillehavet/Wallis"
 
-#: calendar/zones.h:387
+#: ../calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: composer/e-msg-composer-attachment-bar.c:101
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: composer/e-msg-composer-attachment-bar.c:107
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: composer/e-msg-composer-attachment-bar.c:293 mail/em-utils.c:436
-msgid "attachment"
-msgstr "vedlegg"
-
-#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2762
-#: ui/evolution-mail-list.xml.h:27
-msgid "_Properties"
-msgstr "Egenska_per..."
-
-#: composer/e-msg-composer-attachment-bar.c:443
-msgid "_Add attachment..."
-msgstr "_Legg til vedlegg..."
-
-#: composer/e-msg-composer-attachment.c:174
-#: composer/e-msg-composer-attachment.c:190
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Kan ikke legge ved fil: %s: %s"
-
-#: composer/e-msg-composer-attachment.c:182
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Egenskaper for vedlegg"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Filnavn:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME-type:"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:93
-#: composer/e-msg-composer-select-file.c:112
-msgid "Suggest automatic display of attachment"
-msgstr "Foreslå automatisk visning av vedlegg"
-
-#: composer/e-msg-composer.c:727
+#: ../composer/e-msg-composer.c:727
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: composer/e-msg-composer.c:734
+#: ../composer/e-msg-composer.c:734
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9140,65 +9239,65 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: composer/e-msg-composer.c:1233 composer/e-msg-composer.c:1254
+#: ../composer/e-msg-composer.c:1233 ../composer/e-msg-composer.c:1254
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
-#: composer/e-msg-composer.c:1291
+#: ../composer/e-msg-composer.c:1291
 msgid "Could not open file"
 msgstr "Kunne ikke åpne fil"
 
-#: composer/e-msg-composer.c:1299
+#: ../composer/e-msg-composer.c:1299
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1569
+#: ../composer/e-msg-composer.c:1569
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
-#: composer/e-msg-composer.c:1599
+#: ../composer/e-msg-composer.c:1599
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:2006 mail/em-account-editor.c:578
-#: mail/em-account-editor.c:623 mail/em-account-editor.c:690
+#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:578
+#: ../mail/em-account-editor.c:623 ../mail/em-account-editor.c:690
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: composer/e-msg-composer.c:2105
+#: ../composer/e-msg-composer.c:2105
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: composer/e-msg-composer.c:2364 composer/e-msg-composer.c:3355
-#: composer/e-msg-composer.c:3356
+#: ../composer/e-msg-composer.c:2364 ../composer/e-msg-composer.c:3355
+#: ../composer/e-msg-composer.c:3356
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2671
+#: ../composer/e-msg-composer.c:2671
 #, c-format
 msgid "Attached message - %s"
 msgstr "Vedlagt melding - %s"
 
 #. translators, this count will always be >1
-#: composer/e-msg-composer.c:2676 composer/e-msg-composer.c:2839
+#: ../composer/e-msg-composer.c:2676 ../composer/e-msg-composer.c:2839
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt melding"
 msgstr[1] "%d vedlagte meldinger"
 
-#: composer/e-msg-composer.c:2902 mail/em-folder-tree.c:1037
-#: mail/em-folder-tree.c:2255 mail/em-folder-view.c:823
-#: mail/message-list.c:1713
+#: ../composer/e-msg-composer.c:2902 ../mail/em-folder-tree.c:1037
+#: ../mail/em-folder-tree.c:2263 ../mail/em-folder-view.c:827
+#: ../mail/message-list.c:1713
 msgid "_Move"
 msgstr "_Flytt"
 
-#: composer/e-msg-composer.c:2904 mail/em-folder-tree.c:1039
-#: mail/message-list.c:1715
+#: ../composer/e-msg-composer.c:2904 ../mail/em-folder-tree.c:1039
+#: ../mail/message-list.c:1715
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
-#: composer/e-msg-composer.c:4536
+#: ../composer/e-msg-composer.c:4536
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9206,15 +9305,15 @@ msgstr ""
 "<b>(Redigering inneholder en meldingskropp som ikke er tekst, og derfor ikke "
 "kan redigeres.)<b>"
 
-#: composer/e-msg-composer-hdrs.c:512
+#: ../composer/e-msg-composer-hdrs.c:519
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: composer/e-msg-composer-hdrs.c:513
+#: ../composer/e-msg-composer-hdrs.c:520
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
-#: composer/e-msg-composer-hdrs.c:547
+#: ../composer/e-msg-composer-hdrs.c:554
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
@@ -9225,45 +9324,45 @@ msgstr "Klikk her for å få opp adresseboken"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:577
+#: ../composer/e-msg-composer-hdrs.c:584
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: ../composer/e-msg-composer-hdrs.c:591
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:591
+#: ../composer/e-msg-composer-hdrs.c:598
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: composer/e-msg-composer-hdrs.c:601
+#: ../composer/e-msg-composer-hdrs.c:608
 msgid "_To:"
 msgstr "_Til:"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: ../composer/e-msg-composer-hdrs.c:609
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:605
+#: ../composer/e-msg-composer-hdrs.c:612
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: composer/e-msg-composer-hdrs.c:606
+#: ../composer/e-msg-composer-hdrs.c:613
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:609
+#: ../composer/e-msg-composer-hdrs.c:616
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:610
+#: ../composer/e-msg-composer-hdrs.c:617
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9274,39 +9373,35 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:617
+#: ../composer/e-msg-composer-hdrs.c:624
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: composer/e-msg-composer-hdrs.c:622
+#: ../composer/e-msg-composer-hdrs.c:629
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: composer/e-msg-composer-hdrs.c:628
+#: ../composer/e-msg-composer-hdrs.c:635
 msgid "Post To:"
 msgstr "Post til:"
 
-#: composer/e-msg-composer-select-file.c:187
-msgid "Attach file(s)"
-msgstr "Legg ved fil(er)"
-
 #. mail-composer:no-attach primary
-#: composer/mail-composer-errors.xml.h:2
+#: ../composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Du kan ikke legge ved filen «{0}» i denne meldingen."
 
 #. mail-composer:attach-notfile primary
-#: composer/mail-composer-errors.xml.h:6
+#: ../composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Filen «{0}» er ikke en vanlig fil og kan ikke sendes i en melding."
 
 #. mail-composer:attach-directory primary
-#: composer/mail-composer-errors.xml.h:8
+#: ../composer/mail-composer-errors.xml.h:8
 msgid "Directories can not be attached to Messages."
 msgstr "Kataloger kan ikke legges ved meldinger."
 
 #. mail-composer:attach-directory secondary
-#: composer/mail-composer-errors.xml.h:10
+#: ../composer/mail-composer-errors.xml.h:10
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
@@ -9315,7 +9410,7 @@ msgstr ""
 "hver for seg eller opprette et arkiv av katalogen og legge ved dette."
 
 #. mail-composer:attach-nomessages primary
-#: composer/mail-composer-errors.xml.h:12
+#: ../composer/mail-composer-errors.xml.h:12
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Kunne ikke hente meldinger som skal legges ved fra {0}."
 
@@ -9325,25 +9420,25 @@ msgstr "Kunne ikke hente meldinger som skal legges ved fra {0}."
 #. mail:no-delete-folder secondary
 #. system:no-save-file secondary
 #. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:14
-#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
+#: ../composer/mail-composer-errors.xml.h:14
+#: ../composer/mail-composer-errors.xml.h:42 ../mail/mail-errors.xml.h:105
+#: ../mail/mail-errors.xml.h:117 ../widgets/misc/e-system-errors.xml.h:11
+#: ../widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
 msgstr "pga «{1}»."
 
 #. mail-composer:recover-autosave title
-#: composer/mail-composer-errors.xml.h:16
+#: ../composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Uferdige meldinger funnet"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:18
+#: ../composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Vil du gjenopprette uferdige meldinger?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:20
+#: ../composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -9351,31 +9446,31 @@ msgstr ""
 "Evolution avsluttet uventet mens du skrev en ny melding. Gjenoppretting av "
 "meldingen vil la deg fortsette der du slapp."
 
-#: composer/mail-composer-errors.xml.h:21
+#: ../composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Ikke gjenopprett"
 
-#: composer/mail-composer-errors.xml.h:22
+#: ../composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Gjenopprett"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:24
+#: ../composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Kunne ikke lagre til fil for autolagring: «{0}»."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:26
+#: ../composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Feil under automatisk lagring pga «{1}»."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:28
+#: ../composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:30
+#: ../composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -9383,7 +9478,7 @@ msgstr ""
 "Er du sikker på at du vil forkaste meldingen du skriver med tittel «{0}?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:32
+#: ../composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -9393,53 +9488,53 @@ msgstr ""
 "velger å lagre meldingen i mappen Skisser. Dette vil la deg fortsette å "
 "skrive på meldingen på et senere tidspunkt."
 
-#: composer/mail-composer-errors.xml.h:33
+#: ../composer/mail-composer-errors.xml.h:33
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
-#: composer/mail-composer-errors.xml.h:34
+#: ../composer/mail-composer-errors.xml.h:34
 msgid "_Save Message"
 msgstr "_Lagre melding"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:36
+#: ../composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Kunne ikke opprette melding."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:38
+#: ../composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Pga «{0}» vil du kanskje måtte velge andre alternativer for e-post."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:40
+#: ../composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Kunne ikke lagre signaturfil «{0}»."
 
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:44
+#: ../composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Alle kontoer er fjernet."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:46
+#: ../composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Du må konfigurere en konto før du kan skrive meldinger."
 
 #. mail-composer:no-address-control primary
 #. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:48
-#: composer/mail-composer-errors.xml.h:52
+#: ../composer/mail-composer-errors.xml.h:48
+#: ../composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "Kunne ikke opprette vindu for å skrive melding."
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: ../composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "Klarte ikke å aktivere kontroll for adressevelger."
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:54
+#: ../composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9450,23 +9545,23 @@ msgstr ""
 "Vennligst sjekk at du har installert korrekt versjon av gtkhtml og "
 "libgtkhtml."
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:520
+#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:520
 msgid "Evolution"
 msgstr "Evolution"
 
-#: data/evolution.desktop.in.in.h:2
+#: ../data/evolution.desktop.in.in.h:2
 msgid "The Evolution Groupware Suite"
 msgstr "Gruppevaresuiten Evolution"
 
-#: data/evolution.keys.in.in.h:1
+#: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "adressekort"
 
-#: data/evolution.keys.in.in.h:2
+#: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
-#: designs/OOA/ooa.glade.h:1
+#: ../designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
@@ -9476,15 +9571,16 @@ msgstr ""
 "\n"
 "Ønsker du å endre status til «Inne»?"
 
-#: designs/OOA/ooa.glade.h:4
+#: ../designs/OOA/ooa.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Melding ved fravær:</b>"
 
-#: designs/OOA/ooa.glade.h:5
+#: ../designs/OOA/ooa.glade.h:5
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:106
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b> "
 
-#: designs/OOA/ooa.glade.h:6
+#: ../designs/OOA/ooa.glade.h:6
 msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
@@ -9494,39 +9590,39 @@ msgstr ""
 "deg\n"
 "e-post mens du er borte fra kontoret.</small>"
 
-#: designs/OOA/ooa.glade.h:8
+#: ../designs/OOA/ooa.glade.h:8
 msgid "I am currently in the office"
 msgstr "Jeg er inne"
 
-#: designs/OOA/ooa.glade.h:9
+#: ../designs/OOA/ooa.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Jeg er borte"
 
-#: designs/OOA/ooa.glade.h:10
+#: ../designs/OOA/ooa.glade.h:10
 msgid "No, Don't Change Status"
 msgstr "Nei, ikke endre status"
 
-#: designs/OOA/ooa.glade.h:12
+#: ../designs/OOA/ooa.glade.h:12
 msgid "Out of Office Assistant"
 msgstr "Fraværsassistent"
 
-#: designs/OOA/ooa.glade.h:13
+#: ../designs/OOA/ooa.glade.h:13
 msgid "Yes, Change Status"
 msgstr "Ja, endre status"
 
-#: designs/read_receipts/read.glade.h:1
+#: ../designs/read_receipts/read.glade.h:1
 msgid "      "
 msgstr "      "
 
-#: designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Innkommende e-post</b>"
 
-#: designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Utgående e-post:</b>"
 
-#: designs/read_receipts/read.glade.h:4
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -9538,32 +9634,32 @@ msgstr ""
 "har sendt blir lest, og oppgi hva Evolution skal gjøre når noen ber om en "
 "kvittering ra deg.</small>"
 
-#: designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read reciept"
 msgstr "Alltid send en kvittering tilbake"
 
-#: designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Spør meg om jeg vil sende en kvittering tilbake"
 
-#: designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Aldri send en kvittering tilbake"
 
-#: designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Lesekvittering"
 
-#: designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Spør etter lesekvittering for alle meldinger jeg sender"
 
-#: designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 "Med mindre meldingen sendes til en e-postliste, og ikke til meg personlig"
 
-#: designs/read_receipts/read.glade.h:12
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -9571,7 +9667,7 @@ msgstr ""
 "Hva skal Evolution gjøre når du mottar en e-post med en forespørsel om "
 "lesekvittering?"
 
-#: e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -9580,19 +9676,19 @@ msgstr ""
 "Overskriv den?"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:269 widgets/misc/e-system-errors.xml.h:2
+#: ../e-util/e-dialog-utils.c:269 ../widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:119
 msgid "The orientation of the tray."
 msgstr "Orientering for trauet."
 
-#: e-util/e-passwords.c:468
+#: ../e-util/e-passwords.c:468
 msgid "_Remember this password"
 msgstr "Husk dette passo_rdet"
 
-#: e-util/e-passwords.c:469
+#: ../e-util/e-passwords.c:469
 msgid "_Remember this password for the remainder of this session"
 msgstr "Husk dette passo_rdet for resten av denne sesjonen"
 
@@ -9600,7 +9696,7 @@ msgstr "Husk dette passo_rdet for resten av denne sesjonen"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %H.%M"
 
@@ -9608,65 +9704,65 @@ msgstr "%a %d.%m.%Y %H.%M"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: ../e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d.%m.%Y %H"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: ../e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: ../e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %H.%M.%S"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: ../e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H.%M.%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: ../e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y %H.%M"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: ../e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H.%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: ../e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: ../e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%H.%M.%S"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
@@ -9675,8 +9771,8 @@ msgstr "%H.%M.%S"
 #. strftime format of a time in 12-hour format,
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1431 widgets/misc/e-dateedit.c:1697
+#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
+#: ../widgets/misc/e-dateedit.c:1431 ../widgets/misc/e-dateedit.c:1697
 msgid "%I:%M %p"
 msgstr "%H.%M"
 
@@ -9684,160 +9780,160 @@ msgstr "%H.%M"
 #. strftime format of a time in 24-hour format,
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1694
+#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
+#: ../widgets/misc/e-dateedit.c:1428 ../widgets/misc/e-dateedit.c:1694
 msgid "%H:%M"
 msgstr "%H.%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: ../e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%H"
 
-#: filter/filter-datespec.c:73
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: filter/filter-datespec.c:74
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: filter/filter-datespec.c:75
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 time siden"
 msgstr[1] "%d timer siden"
 
-#: filter/filter-datespec.c:76
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag siden"
 msgstr[1] "%d dager siden"
 
-#: filter/filter-datespec.c:77
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 uke siden"
 msgstr[1] "%d uker siden"
 
-#: filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 måned siden"
 msgstr[1] "%d måneder siden"
 
-#: filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år siden"
 msgstr[1] "%d år siden"
 
-#: filter/filter-datespec.c:280
+#: ../filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
+#: ../filter/filter-datespec.c:283 ../filter/filter-datespec.c:294
 msgid "now"
 msgstr "nå"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: filter/filter-datespec.c:406
+#: ../filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
 #. filter:no-date primary
-#: filter/filter-errors.xml.h:2
+#: ../filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Mangler dato."
 
 #. filter:no-date secondary
-#: filter/filter-errors.xml.h:4
+#: ../filter/filter-errors.xml.h:4
 msgid "You must choose a date."
 msgstr "Du må velge en dato."
 
 #. filter:no-file primary
-#: filter/filter-errors.xml.h:6
+#: ../filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Mangler filnavn."
 
 #. filter:no-file secondary
 #. filter:bad-file secondary
-#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+#: ../filter/filter-errors.xml.h:8 ../filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Du må oppgi et filnavn."
 
 #. filter:bad-file primary
-#: filter/filter-errors.xml.h:10
+#: ../filter/filter-errors.xml.h:10
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Filen «{0}» eksisterer ikke eller er ikke en vanlig fil."
 
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:14
+#: ../filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Ugyldig regulært uttrykk «{0}»."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:16
+#: ../filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "Kunne ikke sette sammen regulært uttrykk «{1}»."
 
 #. filter:no-name primary
 #. mail:no-name-vfolder primary
-#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
+#: ../filter/filter-errors.xml.h:18 ../mail/mail-errors.xml.h:219
 msgid "Missing name."
 msgstr "Mangler navn."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:20
+#: ../filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Du må gi navn til dette filteret."
 
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:22
+#: ../filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "Navn «{0}» er allerede brukt."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:24
+#: ../filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Vennligst velg et annet navn."
 
-#: filter/filter-file.c:288
+#: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Velg en fil"
 
-#: filter/filter.glade.h:1
+#: ../filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filterregler</b>"
 
-#: filter/filter.glade.h:2
+#: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Sammenligne med"
 
-#: filter/filter.glade.h:3 filter/filter-rule.c:975
+#: ../filter/filter.glade.h:3 ../filter/filter-rule.c:975
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: filter/filter.glade.h:4
+#: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
-msgstr ""
+msgstr "Vis filtre for e-post:"
 
-#: filter/filter.glade.h:5
+#: ../filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -9845,7 +9941,7 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "12:00 på spesifiserert dato."
 
-#: filter/filter.glade.h:7
+#: ../filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -9853,7 +9949,7 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "en tid relativ til tiden da filtreringen skjer."
 
-#: filter/filter.glade.h:9
+#: ../filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -9861,113 +9957,114 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "tiden da filtreringen skjer."
 
-#: filter/filter.glade.h:12
+#: ../filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "en tid relativ til tiden nå"
 
-#: filter/filter.glade.h:13
+#: ../filter/filter.glade.h:13
 msgid "ago"
 msgstr "siden"
 
-#: filter/filter.glade.h:17
+#: ../filter/filter.glade.h:17
 msgid "months"
 msgstr "måneder"
 
-#: filter/filter.glade.h:18 mail/mail-config.glade.h:173
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:172
 msgid "seconds"
 msgstr " sekunder"
 
-#: filter/filter.glade.h:19
+#: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "tiden nå"
 
-#: filter/filter.glade.h:20
+#: ../filter/filter.glade.h:20
 msgid "the time you specify"
 msgstr "tiden du spesifiserer"
 
-#: filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22
 msgid "years"
 msgstr "år"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:75 mail/mail-config.glade.h:91
+#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1011 ../mail/mail-config.c:75
+#: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:78
-#: mail/mail-config.glade.h:139
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1014
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:139
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:79
-#: mail/mail-config.glade.h:94
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1015
+#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Senere"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:790
+#: ../filter/filter-rule.c:790
 msgid "_Rule name:"
 msgstr "_Regelnavn:"
 
-#: filter/filter-rule.c:818
+#: ../filter/filter-rule.c:818
 msgid "<b>If</b>"
 msgstr "<b>Hvis</b> "
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:855
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:855
 msgid "if any criteria are met"
 msgstr "hvis ethvert kriterie er møtt"
 
-#: filter/filter-rule.c:857
+#: ../filter/filter-rule.c:857
 msgid "Execute actions"
 msgstr "Utfør handlinger"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "Replies"
 msgstr "Svar"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "Replies and parents"
 msgstr "Svar med opphav"
 
-#: filter/filter-rule.c:880
+#: ../filter/filter-rule.c:880
 msgid "Include threads"
 msgstr "Ta med tråder"
 
-#: filter/filter-rule.c:975
+#: ../filter/filter-rule.c:975
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: filter/rule-editor.c:285
+#: ../filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:361
+#: ../filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: filter/rule-editor.c:685
+#: ../filter/rule-editor.c:685
 msgid "Rule name"
 msgstr "Regelnavn"
 
-#: mail/em-account-editor.c:377
+#: ../mail/em-account-editor.c:377
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisensavtale for %s"
 
-#: mail/em-account-editor.c:384
+#: ../mail/em-account-editor.c:384
 #, c-format
 msgid ""
 "\n"
@@ -9980,74 +10077,74 @@ msgstr ""
 "under nøye\n"
 "og kryss av i ruten for å akseptere den\n"
 
-#: mail/em-account-editor.c:454 mail/em-filter-folder-element.c:237
-#: mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:454 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: mail/em-account-editor.c:1812
+#: ../mail/em-account-editor.c:1813
 msgid "Automatically check for _new mail every"
 msgstr "Se etter _nye meldinger automatisk"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: mail/em-account-editor.c:2081 mail/em-account-editor.c:2159
+#: ../mail/em-account-editor.c:2082 ../mail/em-account-editor.c:2160
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: mail/em-account-editor.c:2082 mail/em-account-editor.c:2160
+#: ../mail/em-account-editor.c:2083 ../mail/em-account-editor.c:2161
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: mail/em-account-editor.c:2504 mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2505 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: mail/em-account-editor.c:2504 mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2505 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:422
+#: ../mail/em-account-prefs.c:422
 msgid "[Default]"
 msgstr "[Forvalg]"
 
-#: mail/em-account-prefs.c:476
+#: ../mail/em-account-prefs.c:476
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: mail/em-account-prefs.c:478
+#: ../mail/em-account-prefs.c:478
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:425
-#: mail/mail-config.c:934
+#: ../mail/em-composer-prefs.c:306 ../mail/em-composer-prefs.c:425
+#: ../mail/mail-config.c:934
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: mail/em-composer-prefs.c:949
+#: ../mail/em-composer-prefs.c:890
 msgid "Language(s)"
 msgstr "Språk"
 
-#: mail/em-composer-prefs.c:995
+#: ../mail/em-composer-prefs.c:933
 msgid "Add signature script"
 msgstr "Legg til signaturskript"
 
-#: mail/em-composer-prefs.c:1015
+#: ../mail/em-composer-prefs.c:953
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: mail/em-composer-utils.c:897
+#: ../mail/em-composer-utils.c:910
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: mail/em-composer-utils.c:1513
+#: ../mail/em-composer-utils.c:1526
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1560
+#: ../mail/em-composer-utils.c:1573
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10055,739 +10152,754 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day},.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:147
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
 #. Automatically generated. Do not edit.
-#: mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Juster poeng"
 
-#: mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Tilegn farge"
 
-#: mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: mail/em-filter-i18n.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr "Pip"
 
-#: mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:7
 msgid "contains"
 msgstr "inneholder"
 
-#: mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:9
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Slettet"
 
-#: mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:13
 msgid "does not contain"
 msgstr "inneholder ikke"
 
-#: mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:14
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:15
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:16
 msgid "does not return"
 msgstr "returnerer ikke"
 
-#: mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:17
 msgid "does not sound like"
 msgstr "ligner ikke"
 
-#: mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:18
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
-#: mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:20
 msgid "Draft"
 msgstr "Skisse"
 
-#: mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:21
 msgid "ends with"
 msgstr "slutter med"
 
-#: mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:22
 msgid "Exist"
 msgstr "Eksisterer"
 
-#: mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:23
 msgid "exists"
 msgstr "eksisterer"
 
-#: mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:24
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:25
 msgid "Follow Up"
 msgstr "Følg opp"
 
-#: mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:27
 msgid "is"
 msgstr "er"
 
-#: mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:28
 msgid "is after"
 msgstr "er etter"
 
-#: mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:29
 msgid "is before"
 msgstr "er før"
 
-#: mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:30
 msgid "is Flagged"
 msgstr "er merket"
 
-#: mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:31
 msgid "is greater than"
 msgstr "er større enn"
 
-#: mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:32
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:33
 msgid "is not"
 msgstr "er ikke"
 
-#: mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:34
 msgid "is not Flagged"
 msgstr "er ikke merket"
 
-#: mail/em-filter-i18n.h:35 mail/mail-config.glade.h:93
-#: ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Søppel"
 
-#: mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr "Søppeltest"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:960
-#: widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:964
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
 
-#: mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:38
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:39
 msgid "Match All"
 msgstr "Treff på alle"
 
-#: mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:41
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
 msgstr "Meldingen er søppel"
 
-#: mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
 msgstr "Meldingen er ikke søppel"
 
-#: mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "Send til program"
 
-#: mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "Spill lyd"
 
-#: mail/em-filter-i18n.h:47 mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Les"
 
-#: mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr "Treff på vanlig uttrykk"
 
-#: mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:50
 msgid "Replied to"
 msgstr "Svart til"
 
-#: mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "returnerer"
 
-#: mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:52
 msgid "returns greater than"
 msgstr "returnerer større enn"
 
-#: mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:53
 msgid "returns less than"
 msgstr "returnerer mindre enn"
 
-#: mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:54
 msgid "Run Program"
 msgstr "Kjør program"
 
-#: mail/em-filter-i18n.h:55 mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Gi poeng"
 
-#: mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Avsender"
 
-#: mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:57
 msgid "Set Status"
 msgstr "Sett status"
 
-#: mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "Størrelse (kB)"
 
-#: mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:59
 msgid "sounds like"
 msgstr "lyder som"
 
-#: mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:60
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:61
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:62
 msgid "starts with"
 msgstr "starter med"
 
-#: mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:64
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: mail/em-filter-i18n.h:65 mail/em-format.c:853 mail/em-format-html.c:1533
-#: mail/em-format-quote.c:306 mail/em-mailer-prefs.c:88
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
-#: plugins/shared-folder/properties.glade.h:14 smime/lib/e-cert.c:1131
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format.c:853
+#: ../mail/em-format-html.c:1533 ../mail/em-format-quote.c:306
+#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:330
+#: ../plugins/shared-folder/properties.glade.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Emne"
 
-#: mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:66
 msgid "Unset Status"
 msgstr "Nullstill status"
 
 #. and now for the action area
-#: mail/em-filter-rule.c:488
+#: ../mail/em-filter-rule.c:488
 msgid "<b>Then</b>"
 msgstr "<b>Så</b> "
 
-#: mail/em-folder-browser.c:133
+#: ../mail/em-folder-browser.c:133
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe fra søk..."
 
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:143
+#: ../mail/em-folder-properties.c:143
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Totalt antall melding:"
 msgstr[1] "Totalt antall meldinger:"
 
-#: mail/em-folder-properties.c:155
+#: ../mail/em-folder-properties.c:155
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ulest melding:"
 msgstr[1] "Uleste meldinger:"
 
-#: mail/em-folder-properties.c:269 plugins/shared-folder/properties.glade.h:9
+#: ../mail/em-folder-properties.c:270
+#: ../plugins/shared-folder/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
-#: mail/em-folder-selection-button.c:121
+#: ../mail/em-folder-selection-button.c:121
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: mail/em-folder-selector.c:166
+#: ../mail/em-folder-selector.c:166
 msgid "Create New Folder"
 msgstr "Opprett ny mappe"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2471
-#: mail/mail-component.c:732 plugins/shared-folder/share-folder-common.c:346
+#: ../mail/em-folder-selector.c:166 ../mail/em-folder-tree.c:2479
+#: ../mail/mail-component.c:732 ../plugins/shared-folder/install-shared.c:144
+#: ../plugins/shared-folder/share-folder-common.c:345
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: mail/em-folder-selector.c:304
+#: ../mail/em-folder-selector.c:304
 msgid "Create"
 msgstr "Opprett"
 
-#: mail/em-folder-selector.c:308
+#: ../mail/em-folder-selector.c:308
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree.c:678
+#: ../mail/em-folder-tree.c:678
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: mail/em-folder-tree.c:911
+#: ../mail/em-folder-tree.c:911
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: mail/em-folder-tree.c:913
+#: ../mail/em-folder-tree.c:913
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: mail/em-folder-tree.c:920 mail/message-list.c:1617
+#: ../mail/em-folder-tree.c:920 ../mail/message-list.c:1617
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:922 mail/message-list.c:1619
+#: ../mail/em-folder-tree.c:922 ../mail/message-list.c:1619
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:938
+#: ../mail/em-folder-tree.c:938
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: mail/em-folder-tree.c:1034 ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-tree.c:1034 ../ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: mail/em-folder-tree.c:1035 ui/evolution-mail-message.xml.h:119
+#: ../mail/em-folder-tree.c:1035 ../ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: mail/em-folder-tree.c:1734 mail/mail-ops.c:1017
+#: ../mail/em-folder-tree.c:1734 ../mail/mail-ops.c:1017
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: mail/em-folder-tree.c:2241 mail/em-folder-tree.c:2255
-#: mail/em-folder-view.c:823 mail/em-folder-view.c:838
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-tree.c:2007
+#, c-format
+msgid "Copying `%s' to `%s'"
+msgstr "Kopierer «%s» til «%s»"
+
+#: ../mail/em-folder-tree.c:2249 ../mail/em-folder-tree.c:2263
+#: ../mail/em-folder-view.c:827 ../mail/em-folder-view.c:842
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: mail/em-folder-tree.c:2241 mail/em-folder-view.c:838
+#: ../mail/em-folder-tree.c:2249 ../mail/em-folder-view.c:842
 msgid "C_opy"
 msgstr "K_opier"
 
-#: mail/em-folder-tree.c:2282 plugins/shared-folder/share-folder-common.c:138
+#: ../mail/em-folder-tree.c:2290
+#: ../plugins/shared-folder/share-folder-common.c:138
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: mail/em-folder-tree.c:2471 mail/mail-component.c:732
-#: plugins/shared-folder/share-folder-common.c:346
+#: ../mail/em-folder-tree.c:2479 ../mail/mail-component.c:732
+#: ../plugins/shared-folder/install-shared.c:144
+#: ../plugins/shared-folder/share-folder-common.c:345
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: mail/em-folder-tree.c:2664
+#: ../mail/em-folder-tree.c:2672
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappe «%s» til:"
 
-#: mail/em-folder-tree.c:2666
+#: ../mail/em-folder-tree.c:2674
 msgid "Rename Folder"
 msgstr "Endre navn på mappe"
 
-#: mail/em-folder-tree.c:2669
+#: ../mail/em-folder-tree.c:2680
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet «/»"
 
-#: mail/em-folder-tree.c:2746 ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:49
+#: ../mail/em-folder-tree.c:2754 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:53 ../ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2747
+#: ../mail/em-folder-tree.c:2755
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
-#: mail/em-folder-tree.c:2751
+#: ../mail/em-folder-tree.c:2759
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: mail/em-folder-tree.c:2752
+#: ../mail/em-folder-tree.c:2760
 msgid "_Move..."
 msgstr "_Flytt..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2756
+#: ../mail/em-folder-tree.c:2764
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2759
+#: ../mail/em-folder-tree.c:2767
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
-#: mail/mail-vfolder.c:891
+#: ../mail/em-folder-tree-model.c:200 ../mail/em-folder-tree-model.c:202
+#: ../mail/mail-vfolder.c:891
 msgid "VFolders"
 msgstr "VFoldere"
 
 #. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+#: ../mail/em-folder-tree-model.c:206 ../mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
 #. Inbox is always first
 #. translators: standard local mailbox names
-#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
-#: mail/mail-component.c:138
+#: ../mail/em-folder-tree-model.c:212 ../mail/em-folder-tree-model.c:214
+#: ../mail/mail-component.c:138
 msgid "Inbox"
 msgstr "Innboks"
 
-#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
+#: ../mail/em-folder-tree-model.c:491 ../mail/em-folder-tree-model.c:795
 msgid "Loading..."
 msgstr "Laster..."
 
-#: mail/em-folder-view.c:426 mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:531
-#: mail/mail-component.c:582
+#: ../mail/em-folder-view.c:438 ../mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: ../mail/importers/elm-importer.c:418
+#: ../mail/importers/netscape-importer.c:1902
+#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:531
+#: ../mail/mail-component.c:582
 msgid "Mail"
 msgstr "E-post"
 
-#: mail/em-folder-view.c:928 ui/evolution-mail-message.xml.h:113
+#: ../mail/em-folder-view.c:932 ../ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/em-folder-view.c:930
+#: ../mail/em-folder-view.c:934
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:933 ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:937 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-folder-view.c:934 mail/em-popup.c:502
-#: ui/evolution-mail-message.xml.h:88
+#: ../mail/em-folder-view.c:938 ../mail/em-popup.c:497
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:935 mail/em-popup.c:503
-#: ui/evolution-mail-message.xml.h:87
+#: ../mail/em-folder-view.c:939 ../mail/em-popup.c:498
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:936 mail/em-popup.c:505
-#: ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-view.c:940 ../mail/em-popup.c:500
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:939
+#: ../mail/em-folder-view.c:943
 msgid "Follo_w Up..."
 msgstr "Føl_g opp..."
 
-#: mail/em-folder-view.c:940
+#: ../mail/em-folder-view.c:944
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: mail/em-folder-view.c:941
+#: ../mail/em-folder-view.c:945
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: mail/em-folder-view.c:944 ui/evolution-mail-message.xml.h:50
+#: ../mail/em-folder-view.c:948 ../ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/em-folder-view.c:945
+#: ../mail/em-folder-view.c:949
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/em-folder-view.c:946
+#: ../mail/em-folder-view.c:950
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/em-folder-view.c:947
+#: ../mail/em-folder-view.c:951
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: mail/em-folder-view.c:948 ui/evolution-mail-message.xml.h:54
+#: ../mail/em-folder-view.c:952 ../ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Merk som _søppel"
 
-#: mail/em-folder-view.c:949 ui/evolution-mail-message.xml.h:55
+#: ../mail/em-folder-view.c:953 ../ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: mail/em-folder-view.c:953
+#: ../mail/em-folder-view.c:957
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/em-folder-view.c:956
+#: ../mail/em-folder-view.c:960
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/em-folder-view.c:957 ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:961 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/em-folder-view.c:965
+#: ../mail/em-folder-view.c:969
 msgid "Add Sender to Address_book"
 msgstr "Legg til avsender i adresse_bok"
 
-#: mail/em-folder-view.c:968
+#: ../mail/em-folder-view.c:972
 msgid "Appl_y Filters"
 msgstr "_Påfør filtre"
 
-#: mail/em-folder-view.c:969
+#: ../mail/em-folder-view.c:973
 msgid "F_ilter Junk"
 msgstr "F_iltrer søppel"
 
-#: mail/em-folder-view.c:972
+#: ../mail/em-folder-view.c:976
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:977
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/em-folder-view.c:974
+#: ../mail/em-folder-view.c:978
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/em-folder-view.c:975
+#: ../mail/em-folder-view.c:979
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/em-folder-view.c:976
+#: ../mail/em-folder-view.c:980
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/em-folder-view.c:980
+#: ../mail/em-folder-view.c:984
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/em-folder-view.c:981
+#: ../mail/em-folder-view.c:985
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/em-folder-view.c:982
+#: ../mail/em-folder-view.c:986
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/em-folder-view.c:983
+#: ../mail/em-folder-view.c:987
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1760 mail/em-folder-view.c:1803
+#: ../mail/em-folder-view.c:1764 ../mail/em-folder-view.c:1807
 msgid "Default"
 msgstr "Forvalgt"
 
-#: mail/em-folder-view.c:1900
+#: ../mail/em-folder-view.c:1903
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:2179
+#: ../mail/em-folder-view.c:2182
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
-#: mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2465
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: mail/em-format.c:848 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:326
+#: ../mail/em-format.c:848 ../mail/em-format-html.c:1424
+#: ../mail/em-format-quote.c:193 ../mail/em-mailer-prefs.c:83
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Fra"
 
-#: mail/em-format.c:849 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:84
+#: ../mail/em-format.c:849 ../mail/em-format-html.c:1424
+#: ../mail/em-format-quote.c:193 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/em-format.c:850 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
+#: ../mail/em-format.c:850 ../mail/em-format-html.c:1424
+#: ../mail/em-format-quote.c:193 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/em-format.c:851 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:86
+#: ../mail/em-format.c:851 ../mail/em-format-html.c:1424
+#: ../mail/em-format-quote.c:193 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format.c:852 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:87
+#: ../mail/em-format.c:852 ../mail/em-format-html.c:1424
+#: ../mail/em-format-quote.c:193 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format.c:854 mail/em-format-html.c:1577 mail/em-format-quote.c:322
-#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
+#: ../mail/em-format.c:854 ../mail/em-format-html.c:1577
+#: ../mail/em-format-quote.c:322 ../mail/em-mailer-prefs.c:89
+#: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/em-format.c:855 mail/em-format-html.c:1600 mail/em-mailer-prefs.c:90
+#: ../mail/em-format.c:855 ../mail/em-format-html.c:1600
+#: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: mail/em-format.c:1104
+#: ../mail/em-format.c:1104
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/em-format.c:1143 mail/em-format.c:1276
+#: ../mail/em-format.c:1143 ../mail/em-format.c:1276
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: mail/em-format.c:1266
+#: ../mail/em-format.c:1266
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
-#: mail/em-format.c:1414
+#: ../mail/em-format.c:1414
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/em-format.c:1433
+#: ../mail/em-format.c:1433
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1441
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1441
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: mail/em-format-html.c:472 mail/em-format-html.c:474
+#: ../mail/em-format-html.c:472 ../mail/em-format-html.c:474
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter «%s»"
 
-#: mail/em-format-html.c:579 mail/em-format-html-display.c:638
+#: ../mail/em-format-html.c:579 ../mail/em-format-html-display.c:645
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: mail/em-format-html.c:580 mail/em-format-html-display.c:639
+#: ../mail/em-format-html.c:580 ../mail/em-format-html-display.c:646
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: mail/em-format-html.c:581 mail/em-format-html-display.c:640
+#: ../mail/em-format-html.c:581 ../mail/em-format-html-display.c:647
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: mail/em-format-html.c:582
+#: ../mail/em-format-html.c:582
 msgid "Valid signature but cannot verify sender"
 msgstr "Gyldig signatur, men ikke verifisere avsender"
 
-#: mail/em-format-html.c:588 mail/em-format-html-display.c:647
+#: ../mail/em-format-html.c:588 ../mail/em-format-html-display.c:654
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: mail/em-format-html.c:589 mail/em-format-html-display.c:648
+#: ../mail/em-format-html.c:589 ../mail/em-format-html-display.c:655
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: mail/em-format-html.c:590 mail/em-format-html-display.c:649
+#: ../mail/em-format-html.c:590 ../mail/em-format-html-display.c:656
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: mail/em-format-html.c:591 mail/em-format-html-display.c:650
+#: ../mail/em-format-html.c:591 ../mail/em-format-html-display.c:657
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: mail/em-format-html.c:840
+#: ../mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: mail/em-format-html.c:870
+#: ../mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/em-format-html.c:881
+#: ../mail/em-format-html.c:881
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: mail/em-format-html.c:883
+#: ../mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/em-format-html.c:904
+#: ../mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/em-format-html.c:915
+#: ../mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
-#: mail/em-format-html.c:1137
+#: ../mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
 #. pseudo-header
-#: mail/em-format-html.c:1537 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:984
+#: ../mail/em-format-html.c:1537 ../mail/em-format-quote.c:315
+#: ../mail/em-mailer-prefs.c:986
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1564
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1567
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:405
+#: ../mail/em-format-html-display.c:412
 #, c-format
 msgid "Matches: %d"
 msgstr "Treff: %d"
 
-#: mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:645
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10795,7 +10907,7 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: mail/em-format-html-display.c:639
+#: ../mail/em-format-html-display.c:646
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10803,7 +10915,7 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: mail/em-format-html-display.c:640
+#: ../mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10811,11 +10923,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: mail/em-format-html-display.c:641
+#: ../mail/em-format-html-display.c:648
 msgid "Valid signature, cannot verify sender"
 msgstr "Gyldig signatur. Kan ikke verifisere avsender"
 
-#: mail/em-format-html-display.c:641
+#: ../mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10823,7 +10935,7 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: mail/em-format-html-display.c:647
+#: ../mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -10831,7 +10943,7 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -10841,7 +10953,7 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: mail/em-format-html-display.c:649
+#: ../mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10849,7 +10961,7 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
-#: mail/em-format-html-display.c:650
+#: ../mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -10858,64 +10970,64 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil være meget "
 "vanskelig for en utenforstående å se innholdet i denne meldingen på kort tid."
 
-#: mail/em-format-html-display.c:751 smime/gui/smime-ui.glade.h:47
+#: ../mail/em-format-html-display.c:758 ../smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: mail/em-format-html-display.c:766
+#: ../mail/em-format-html-display.c:773
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:1002
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ferdigstilt på %d %B, %Y, %H.%M"
 
-#: mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:1010
 msgid "Overdue:"
 msgstr "Utgått:"
 
-#: mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:1013
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "til %d %B %Y %H.%M"
 
-#: mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: mail/em-format-html-display.c:1054
+#: ../mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: mail/em-format-html-display.c:1298
+#: ../mail/em-format-html-display.c:1305
 msgid "Attachment Button"
 msgstr "Vedleggsknapp"
 
-#: mail/em-format-html-print.c:130
+#: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/em-junk-filter.c:110
+#: ../mail/em-junk-filter.c:110
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrert)"
 
-#: mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:101
 msgid "Every time"
 msgstr "Hver gang"
 
-#: mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:102
 msgid "Once per day"
 msgstr "En gang om dagen"
 
-#: mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:103
 msgid "Once per week"
 msgstr "En gang i uken"
 
-#: mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per month"
 msgstr "En gang i måneden"
 
-#: mail/em-migrate.c:1168
+#: ../mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -10927,49 +11039,49 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: mail/em-migrate.c:1602
+#: ../mail/em-migrate.c:1602
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kan ikke opprette ny mappe «%s»: %s"
 
-#: mail/em-migrate.c:1628
+#: ../mail/em-migrate.c:1628
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
 
-#: mail/em-migrate.c:1813
+#: ../mail/em-migrate.c:1813
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan ikke søke etter eksisterende postbokser på «%s»: %s"
 
-#: mail/em-migrate.c:2017
+#: ../mail/em-migrate.c:2017
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 "Kunne ikke åpne gamle data om meldinger som er beholdt på tjeneren for POP-"
 "tjener «%s»: %s"
 
-#: mail/em-migrate.c:2031
+#: ../mail/em-migrate.c:2031
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Klarte ikke å opprette katalog «%s»: %s"
 
-#: mail/em-migrate.c:2060
+#: ../mail/em-migrate.c:2060
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2494 mail/em-migrate.c:2506
+#: ../mail/em-migrate.c:2494 ../mail/em-migrate.c:2506
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
 
-#: mail/em-migrate.c:2657
+#: ../mail/em-migrate.c:2657
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
 
-#: mail/em-migrate.c:2675
+#: ../mail/em-migrate.c:2675
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -10977,340 +11089,350 @@ msgstr ""
 "Kan ikke lese innstillinger fra tidligere Evolution-installasjon. «evolution/"
 "config.xmldb» er korrupt eller ser ikke ut til å eksistere."
 
-#: mail/em-popup.c:386
+#: ../mail/em-popup.c:381
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/em-popup.c:405
+#: ../mail/em-popup.c:400
 #, c-format
 msgid "untitled_image.%s"
 msgstr "bilde_uten_navn.%s"
 
-#: mail/em-popup.c:499
+#: ../mail/em-popup.c:494
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: mail/em-popup.c:501
+#: ../mail/em-popup.c:496
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-popup.c:553
+#: ../mail/em-popup.c:548
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: mail/em-popup.c:554
+#: ../mail/em-popup.c:549
 msgid "Se_nd message to..."
 msgstr "Se_nd melding til..."
 
-#: mail/em-popup.c:555
+#: ../mail/em-popup.c:550
 msgid "_Add to Addressbook"
 msgstr "Legg til i _adressebok"
 
-#: mail/em-popup.c:686
+#: ../mail/em-popup.c:681
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/em-subscribe-editor.c:613
+#: ../mail/em-subscribe-editor.c:613
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Dette lageret støtter ikke abonnering, eller så er dette ikke aktivert."
 
-#: mail/em-subscribe-editor.c:642
+#: ../mail/em-subscribe-editor.c:642
 msgid "Subscribed"
 msgstr "Abonnert"
 
-#: mail/em-subscribe-editor.c:646
+#: ../mail/em-subscribe-editor.c:646
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:861
+#: ../mail/em-subscribe-editor.c:861
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
-#: mail/em-subscribe-editor.c:882
+#: ../mail/em-subscribe-editor.c:882
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: mail/em-utils.c:105
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Ikke vis denne meldingen igjen."
 
-#: mail/em-utils.c:294
+#: ../mail/em-utils.c:294
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/em-utils.c:434
+#: ../mail/em-utils.c:434
 msgid "message"
 msgstr "melding"
 
-#: mail/em-utils.c:543
+#: ../mail/em-utils.c:543
 msgid "Save Message..."
 msgstr "Lagre melding..."
 
-#: mail/em-utils.c:592
+#: ../mail/em-utils.c:592
 msgid "Add address"
 msgstr "Legg til adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1055
+#: ../mail/em-utils.c:1055
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
 
-#: mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:104
 msgid "Virtual _Folders"
 msgstr "Virtuelle _mapper"
 
-#: mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "VFolder-kilde"
 
-#: mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automatisk gjenkjenning av lenker"
 
-#: mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
 msgstr "Automatisk gjenkjenning av smilefjes"
 
-#: mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
 msgstr "Sjekk om innkommende meldinger er søppel"
 
-#: mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
 msgstr "Farge for utheving av sitattekst"
 
-#: mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight color."
 msgstr "Farge for utheving av sitattekst."
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Forvalgt høyde for skrivevindu"
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Forvalgt bredde for skrivevindu"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Forvalgt tegnsett for nye meldinger"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Forvalgt tegnsett for nye meldinger."
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Forvalgt tegnsett for visning av meldinger"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Forvalgt tegnsett for visning av meldinger."
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Forvalgt videresendingsstil"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Forvalgt høyde for meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Forvalgt høyde for meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Forvalgt høyde for dialog for abonnering"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Forvalgt svarstil"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Forvalgt bredde for meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Forvalgt bredde for meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Forvalgt bredde for abonneringsdialogen"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vis indikatorer for stavefeil mens du skriver."
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkurven når programmet avsluttes"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm alle papirkurver når programmet avsluttes."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:27
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Sist gang søppelkurven ble tømt"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Liste med godtatte lisenser"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Liste med kontoer"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Last bilder for HTML-meldinger og http"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlinger"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Logg filterhandlinger til oppgitt loggfil."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Forvalgt høyde på meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Forvalgt bredde på meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Lydfil for varsel om ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Type varsel for ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:60
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr "Spør når bruker prøver å åpne 10 eller flere meldinger samtidig"
+
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11318,88 +11440,88 @@ msgstr ""
 "Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
 "å motta HTML-meldinger."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Spør når bruker prøver å sende en melding uten Til- eller Cc-mottakere."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Spør når bruker prøver å sende uønsket HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Gjenkjenn smilefjes i tekst og erstatt dem med bilder."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Kjør søppeltest på innkommende e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Send HTML e-post som forvalg."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis slettede meldinger i meldingslisten (gjennomstreket)."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Lydfil som skal spilles av når nye meldinger ankommer."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Forvalgt høyde på abonneringsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Forvalgt bredde på abonneringsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Terminalskrift for meldingsvisning"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Skrift med variabel bredde for meldingsvisning"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11407,189 +11529,192 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Bruk meldingsliste med tråder."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Bruk meldingsliste med tråder"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:109
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:110
 msgid "spamd port"
 msgstr "port for spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "Konfigurer e-post-kontoer her"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
 msgstr "Evolution e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail accounts configuration control"
 msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
 msgstr "Evolution e-postkomponent"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail composer"
 msgstr "Evolution e-postredigering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer configuration control"
 msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail preferences control"
 msgstr "Brukervalg-kontroll for Evolution e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
 msgstr "_E-post"
 
-#: mail/importers/elm-importer.c:88
+#: ../mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
 
-#: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:225
-#: mail/importers/evolution-outlook-importer.c:259
-#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
+#: ../mail/importers/elm-importer.c:89
+#: ../mail/importers/evolution-mbox-importer.c:225
+#: ../mail/importers/evolution-outlook-importer.c:259
+#: ../mail/importers/netscape-importer.c:1251
+#: ../mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerer..."
 
-#: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:227
-#: mail/importers/evolution-outlook-importer.c:261
-#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
+#: ../mail/importers/elm-importer.c:91
+#: ../mail/importers/evolution-mbox-importer.c:227
+#: ../mail/importers/evolution-outlook-importer.c:261
+#: ../mail/importers/netscape-importer.c:1253
+#: ../mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Vennligst vent"
 
-#: mail/importers/elm-importer.c:244
+#: ../mail/importers/elm-importer.c:244
 msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
-#: mail/importers/elm-importer.c:436
+#: ../mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11597,71 +11722,71 @@ msgstr ""
 "Evolution har funnet Elm e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/elm-importer.c:444
+#: ../mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:117
-#: mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
 msgstr "Målmappe:"
 
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
-#: mail/importers/evolution-mbox-importer.c:223
-#: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/mail-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-outlook-importer.c:257
+#: ../mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer «%s»"
 
-#: mail/importers/evolution-outlook-importer.c:305
-#: mail/importers/mail-importer.c:140
+#: ../mail/importers/evolution-outlook-importer.c:305
+#: ../mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Import fra Elm for Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Import av Netscape e-post for Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr "Import fra Outlook Express 4 for Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Import fra Pine for Evolutions"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 msgid "Evolution mbox importer"
 msgstr "mbox-import for Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
 msgid "MBox (mbox)"
 msgstr "MBox (.mbox)"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr "Outlook Express 4 (.mbx)"
 
-#: mail/importers/mail-importer.c:363
+#: ../mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
 
-#: mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter: «%s»"
 
-#: mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11676,7 +11801,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11684,7 +11809,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11693,23 +11818,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Importerer data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "E-post filtre"
 
-#: mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11717,15 +11842,15 @@ msgstr ""
 "Evolution har funnet Netscape e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/pine-importer.c:116
+#: ../mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerer gammel e-post fra Pine"
 
-#: mail/importers/pine-importer.c:314
+#: ../mail/importers/pine-importer.c:314
 msgid "Importing Pine data"
 msgstr "Importerer data fra Pine"
 
-#: mail/importers/pine-importer.c:498
+#: ../mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11733,349 +11858,350 @@ msgstr ""
 "Evolution har funnet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/pine-importer.c:506
+#: ../mail/importers/pine-importer.c:506
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-autofilter.c:74
+#: ../mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: mail/mail-autofilter.c:238
+#: ../mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:254
+#: ../mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:271
+#: ../mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:326
+#: ../mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-component.c:139
+#: ../mail/mail-component.c:139
 msgid "Drafts"
 msgstr "Skisser"
 
-#: mail/mail-component.c:140
+#: ../mail/mail-component.c:140
 msgid "Outbox"
 msgstr "Utboks"
 
-#: mail/mail-component.c:141
+#: ../mail/mail-component.c:141
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-component.c:484
+#: ../mail/mail-component.c:484
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: mail/mail-component.c:486
+#: ../mail/mail-component.c:486
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d søppel"
 msgstr[1] "%d søppel"
 
-#: mail/mail-component.c:509
+#: ../mail/mail-component.c:509
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: mail/mail-component.c:511
+#: ../mail/mail-component.c:511
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: mail/mail-component.c:513
+#: ../mail/mail-component.c:513
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: mail/mail-component.c:517
+#: ../mail/mail-component.c:517
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: mail/mail-component.c:519
+#: ../mail/mail-component.c:519
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d ulest"
 msgstr[1] ", %d uleste"
 
-#: mail/mail-component.c:684
+#: ../mail/mail-component.c:684
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/mail-component.c:685
+#: ../mail/mail-component.c:685
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/mail-component.c:686
+#: ../mail/mail-component.c:686
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: mail/mail-component.c:692
+#: ../mail/mail-component.c:692
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: mail/mail-component.c:693
+#: ../mail/mail-component.c:693
 msgid "Mail _Folder"
 msgstr "_E-postmappe"
 
-#: mail/mail-component.c:694
+#: ../mail/mail-component.c:694
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: mail/mail-component.c:841
+#: ../mail/mail-component.c:841
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
-#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
 
-#: mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "Sj_ekk støttede typer "
 
-#: mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL er ikke støttet i denne versjonen av Evolution</b>"
 
-#: mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>S_ignaturer</b> "
 
-#: mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>Språk</b> "
 
-#: mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:8
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>Dette vil gjøre filteret mer pålitelig, men tregere</small>"
 
-#: mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Kontoinformasjon</span>"
 
-#: mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Varsel</span>"
 
-#: mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Autentiseringstyper</span>"
 
-#: mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentisering</span>"
 
-#: mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Skriving av meldinger</span>"
 
-#: mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfigurasjon</span>"
 
-#: mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Forvalgt oppførsel</span>"
 
-#: mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Sletting av e-post</span>"
 
-#: mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">_Meldingshoder som vises</span>"
 
-#: mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Alternativer for filtre</span>"
 
-#: mail/mail-config.glade.h:19 plugins/itip-formatter/itip-formatter.c:1641
+#: ../mail/mail-config.glade.h:19
+#: ../plugins/itip-formatter/itip-formatter.c:1657
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Generelt</span>"
 
-#: mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiketter og farger</span>"
 
-#: mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Lasting av bilder</span>"
 
-#: mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Meldingsvisning</span>"
 
-#: mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for meldinger</span>"
 
-#: mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Melding om ny e-post</span>"
 
-#: mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Tilleggsinformasjon</span>"
 
-#: mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Alternativer</span>"
 
-#: mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for utskrift</span>"
 
-#: mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Nødvendig informasjon</span>"
 
-#: mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Sikkerhet</span>"
 
-#: mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Sendte meldinger og skisser</span>"
 
-#: mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Tjenerkonfigurasjon</span>"
 
-#: mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
-#: mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur..."
 
-#: mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Legg til _skript"
 
-#: mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "All_tid signer utgående meldinger når denne kontoen brukes"
 
-#: mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 "Send krypterte me_ldinger til meg selv også ved sending av kryptert e-post"
 
-#: mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
 
-#: mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Alltid krypter til _meg selv ved sending av kryptert e-post"
 
-#: mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Legg ved opprinnelig melding"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically _insert smiley images"
 msgstr "Sett _inn smilefjes automatisk"
 
-#: mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "_Pip når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "Sj_ekk støttede typer "
 
-#: mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:52
 msgid "Check _incoming mail for junk"
 msgstr "Sjekk om innkommende meldinger er søppel"
 
-#: mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sjekker om innkommende meldinger er søppel"
 
-#: mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Tøm"
 
-#: mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "Tø_m"
 
-#: mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Farger"
 
-#: mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tømming av en mappe"
 
-#: mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12091,126 +12217,126 @@ msgstr ""
 "\n"
 "Klikk «Fullfør» for å lagre dine innstillinger."
 
-#: mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Signer utgående meldinger digitalt (som forvalg)"
 
-#: mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Ikke siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:72 shell/evolution-startup-wizard.glade.h:1
+#: ../mail/mail-config.glade.h:72 ../shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-post kontoer"
 
-#: mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm søppelkurven når programmet avsluttes"
 
-#: mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter ut_gående meldinger (som forvalg)"
 
-#: mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "Kjør kommando..."
 
-#: mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
-#: mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML-e-post"
 
-#: mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:89
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
-#: mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:99
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
 
-#: mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:100
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:101
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:104
 msgid "Play sound file when new mail arri_ves"
 msgstr "Spill en l_ydfil når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:105
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12218,7 +12344,7 @@ msgstr ""
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:106
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12228,119 +12354,125 @@ msgstr ""
 "under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:107
 msgid "Please select among the following options"
 msgstr "Vennligst velg mellom følgende alternativer"
 
-#: mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:108
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
 
-#: mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:109
 msgid "Quote original message"
 msgstr "Siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:110
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:111
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:112
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:113
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:114
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:115
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:116
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:117
 msgid "Se_lect..."
 msgstr "Ve_lg..."
 
-#: mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:118
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:119
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:120
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:121
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:122
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:123
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:124
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:125
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:126
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:127
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:128
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:129
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:130
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:131
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:132
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:133
 msgid "T_erminal Font:"
 msgstr "T_erminalskrift:"
 
-#: mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:134
 msgid "T_ype: "
 msgstr "T_ype:"
 
-#: mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:135
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "Språklisten som vises her reflekterer kun de språkene du har installert en ordbok for."
+
+#: ../mail/mail-config.glade.h:136
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12350,16 +12482,7 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: mail/mail-config.glade.h:138
-msgid ""
-"This page allows you to configure spell checking behavior and language. The "
-"list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Denne siden lar deg konfigurere oppførsel for stavekontroll og språk. "
-"Språklisten her reflekterer kun de språkene du har installert en ordbok for."
-
-#: mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:140
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12367,15 +12490,15 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:142
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:143
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:144
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12385,7 +12508,7 @@ msgstr ""
 "\n"
 "Klikk «Neste» for å begynne. "
 
-#: mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12399,91 +12522,91 @@ msgstr ""
 "et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
 "visning på skjermen."
 
-#: mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:149
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:150
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ikke gi beskjed når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:152
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:154
-msgid "_Enable"
-msgstr "_Aktiver"
-
-#: mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:154
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
+msgid "_Full Name:"
+msgstr "_Fullt navn:"
+
+#: ../mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:157
 msgid "_Load images if sender is in address book"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:161
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:163
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_pør ved sending av meldinger med tomt emnefelt"
 
-#: mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:166
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:167
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre applikasjoner"
 
-#: mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:170
 msgid "color"
 msgstr "farge"
 
-#: mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:171
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.glade.h:1
 msgid ""
 "\n"
 " Please read carefully the license agreement displayed\n"
@@ -12493,60 +12616,60 @@ msgstr ""
 "Vennligst les lisensavtalen som vises under nøye\n"
 "og kryss av i ruten for å akseptere den\n"
 
-#: mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.glade.h:7
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>Kilder for virtuelle mapper</b>"
 
-#: mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:8
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Digital signatur</span>"
 
-#: mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:9
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Kryptering</span>"
 
-#: mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Case _Sensitive"
 msgstr "_Skill mellom store/små bokstaver"
 
-#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
-#: mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:13
 msgid "F_ind:"
 msgstr "F_inn:"
 
-#: mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: mail/mail-dialogs.glade.h:15 mail/message-tag-followup.c:295
-#: mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:15 ../mail/message-tag-followup.c:295
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
-#: mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:16
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:17
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:18
 msgid "None Selected"
 msgstr "Ingen valgt"
 
-#: mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:19
 msgid "S_erver:"
 msgstr "Tj_ener:"
 
-#: mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:20
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12554,53 +12677,53 @@ msgstr ""
 "Meldingene du har valgt for oppfølging er listet under.\n"
 "Vennligst velg en handling for oppfølging fra menyen «Flagg»."
 
-#: mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: mail/mail-dialogs.glade.h:25 mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:26 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:27
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:29
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: mail/mail-dialogs.glade.h:30
+#: ../mail/mail-dialogs.glade.h:30
 msgid "specific folders only"
 msgstr "kun spesifikke mapper"
 
-#: mail/mail-dialogs.glade.h:31
+#: ../mail/mail-dialogs.glade.h:31
 msgid "with all active remote folders"
 msgstr "med alle aktive eksterne mapper"
 
-#: mail/mail-dialogs.glade.h:32
+#: ../mail/mail-dialogs.glade.h:32
 msgid "with all local and active remote folders"
 msgstr "med alle lokale og aktive eksterne mapper"
 
-#: mail/mail-dialogs.glade.h:33
+#: ../mail/mail-dialogs.glade.h:33
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
 #. mail:camel-service-auth-invalid primary
-#: mail/mail-errors.xml.h:2
+#: ../mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
 msgstr "Ugyldig autentisering"
 
 #. mail:camel-service-auth-invalid secondary
-#: mail/mail-errors.xml.h:4
+#: ../mail/mail-errors.xml.h:4
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -12609,12 +12732,12 @@ msgstr ""
 "støtter autentisering i det hele tatt."
 
 #. mail:camel-service-auth-failed primary
-#: mail/mail-errors.xml.h:6
+#: ../mail/mail-errors.xml.h:6
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Din pålogging på tjener «{0}» som «{0}» feilet."
 
 #. mail:camel-service-auth-failed secondary
-#: mail/mail-errors.xml.h:8
+#: ../mail/mail-errors.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -12623,12 +12746,12 @@ msgstr ""
 "mellom store og små bokstaver. Caps lock kan være på."
 
 #. mail:ask-send-html primary
-#: mail/mail-errors.xml.h:10
+#: ../mail/mail-errors.xml.h:10
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Er du sikker på at du vil sende en melding i HTML-format?"
 
 #. mail:ask-send-html secondary
-#: mail/mail-errors.xml.h:12
+#: ../mail/mail-errors.xml.h:12
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12641,12 +12764,12 @@ msgstr ""
 "Send likevel?"
 
 #. mail:ask-send-no-subject primary
-#: mail/mail-errors.xml.h:17
+#: ../mail/mail-errors.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Er du sikker på at du vil sende en melding uten emne?"
 
 #. mail:ask-send-no-subject secondary
-#: mail/mail-errors.xml.h:19
+#: ../mail/mail-errors.xml.h:19
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -12656,12 +12779,12 @@ msgstr ""
 
 #. mail:ask-send-only-bcc-contact primary
 #. mail:ask-send-only-bcc primary
-#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#: ../mail/mail-errors.xml.h:22 ../mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
 
 #. mail:ask-send-only-bcc-contact secondary
-#: mail/mail-errors.xml.h:24
+#: ../mail/mail-errors.xml.h:24
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12672,7 +12795,7 @@ msgid ""
 msgstr ""
 
 #. mail:ask-send-only-bcc secondary
-#: mail/mail-errors.xml.h:31
+#: ../mail/mail-errors.xml.h:31
 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 "
@@ -12681,25 +12804,25 @@ msgid ""
 msgstr ""
 
 #. mail:send-no-recipients primary
-#: mail/mail-errors.xml.h:34
+#: ../mail/mail-errors.xml.h:34
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
 #. mail:send-no-recipients secondary
-#: mail/mail-errors.xml.h:36
+#: ../mail/mail-errors.xml.h:36
 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."
 msgstr ""
 
 #. mail:ask-default-drafts primary
-#: mail/mail-errors.xml.h:38
+#: ../mail/mail-errors.xml.h:38
 msgid "Use default drafts folder?"
 msgstr "Bruk forvalgt mappe for skisser?"
 
 #. mail:ask-default-drafts secondary
-#: mail/mail-errors.xml.h:40
+#: ../mail/mail-errors.xml.h:40
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -12707,12 +12830,12 @@ msgstr ""
 "Kunne ikke åpne skisse-mappen for denne kontoen. Vil du bruke standard "
 "skisse-mappe?"
 
-#: mail/mail-errors.xml.h:41
+#: ../mail/mail-errors.xml.h:41
 msgid "Use _Default"
 msgstr "Bruk _forvalg"
 
 #. mail:ask-expunge primary
-#: mail/mail-errors.xml.h:43
+#: ../mail/mail-errors.xml.h:43
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
@@ -12722,16 +12845,16 @@ msgstr ""
 
 #. mail:ask-expunge secondary
 #. mail:ask-empty-trash secondary
-#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+#: ../mail/mail-errors.xml.h:45 ../mail/mail-errors.xml.h:50
 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-errors.xml.h:46
+#: ../mail/mail-errors.xml.h:46
 msgid "_Expunge"
 msgstr "T_øm"
 
 #. mail:ask-empty-trash primary
-#: mail/mail-errors.xml.h:48
+#: ../mail/mail-errors.xml.h:48
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -12739,17 +12862,31 @@ msgstr ""
 "Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper "
 "permanent?"
 
-#: mail/mail-errors.xml.h:51
+#: ../mail/mail-errors.xml.h:51
 msgid "_Empty Trash"
 msgstr "Tøm søpp_elkurven"
 
+#. mail:ask-open-many primary
+#: ../mail/mail-errors.xml.h:53
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr "Er du sikker på at du vil åpne {0} meldinger samtidig?"
+
+#. mail:ask-open-many secondary
+#: ../mail/mail-errors.xml.h:55
+msgid "Opening too many messages at once may take a long time."
+msgstr ""
+
+#: ../mail/mail-errors.xml.h:56
+msgid "_Open Messages"
+msgstr "_Åpne meldinger"
+
 #. mail:exit-unsaved primary
-#: mail/mail-errors.xml.h:53
+#: ../mail/mail-errors.xml.h:58
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
 
 #. mail:exit-unsaved secondary
-#: mail/mail-errors.xml.h:55
+#: ../mail/mail-errors.xml.h:60
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -12758,12 +12895,12 @@ msgstr ""
 "igjen."
 
 #. mail:camel-exception primary
-#: mail/mail-errors.xml.h:57
+#: ../mail/mail-errors.xml.h:62
 msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Din melding med emne «{0}» ble ikke levert."
 
 #. mail:camel-exception secondary
-#: mail/mail-errors.xml.h:59
+#: ../mail/mail-errors.xml.h:64
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
 "reports the following error: status 67: mail not sent.\n"
@@ -12772,81 +12909,81 @@ msgid ""
 msgstr ""
 
 #. mail:async-error primary
-#: mail/mail-errors.xml.h:62
+#: ../mail/mail-errors.xml.h:67
 msgid "Error while {0}."
 msgstr "Feil under {0}."
 
 #. mail:async-error secondary
-#: mail/mail-errors.xml.h:64
+#: ../mail/mail-errors.xml.h:69
 msgid "{1}."
 msgstr "{1}."
 
 #. mail:async-error-nodescribe primary
-#: mail/mail-errors.xml.h:66
+#: ../mail/mail-errors.xml.h:71
 msgid "Error while performing operation."
 msgstr "Feil under utføring av operasjon."
 
 #. mail:async-error-nodescribe secondary
-#: mail/mail-errors.xml.h:68
+#: ../mail/mail-errors.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
 #. mail:ask-session-password primary
-#: mail/mail-errors.xml.h:82
+#: ../mail/mail-errors.xml.h:87
 msgid "Enter password."
 msgstr "Oppgi passord."
 
 #. mail:filter-load-error primary
-#: mail/mail-errors.xml.h:86
+#: ../mail/mail-errors.xml.h:91
 msgid "Error loading filter definitions."
 msgstr "Feil under lasting av filterdefinisjoner."
 
 #. mail:no-save-path primary
-#: mail/mail-errors.xml.h:90
+#: ../mail/mail-errors.xml.h:95
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikke lagre til katalog «{0}»."
 
 #. mail:no-create-path primary
 #. mail:no-write-path-exists primary
 #. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
-#: mail/mail-errors.xml.h:106
+#: ../mail/mail-errors.xml.h:99 ../mail/mail-errors.xml.h:107
+#: ../mail/mail-errors.xml.h:111
 msgid "Cannot save to file \"{0}\"."
 msgstr "Kan ikke lagre til fil «{0}»."
 
 #. mail:no-create-path secondary
-#: mail/mail-errors.xml.h:96
+#: ../mail/mail-errors.xml.h:101
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Kan ikke opprette katalog for lagring pga «{1}»"
 
 #. mail:no-create-tmp-path primary
-#: mail/mail-errors.xml.h:98
+#: ../mail/mail-errors.xml.h:103
 msgid "Cannot create temporary save directory."
 msgstr "Kan ikke opprette midlertidig katalog."
 
 #. mail:no-write-path-exists secondary
-#: mail/mail-errors.xml.h:104
+#: ../mail/mail-errors.xml.h:109
 msgid "File exists but cannot overwrite it."
 msgstr "Filen eksisterer men kan ikke overskrives."
 
 #. mail:no-write-path-notfile secondary
-#: mail/mail-errors.xml.h:108
+#: ../mail/mail-errors.xml.h:113
 msgid "File exists but is not a regular file."
 msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
 #. mail:no-delete-folder primary
-#: mail/mail-errors.xml.h:110
+#: ../mail/mail-errors.xml.h:115
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kunne ikke slette mappe «{0}»."
 
 #. mail:no-delete-special-folder primary
-#: mail/mail-errors.xml.h:114
+#: ../mail/mail-errors.xml.h:119
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Kan ikke slette systemmappe «{0}»."
 
 #. mail:no-delete-special-folder secondary
 #. mail:no-rename-special-folder secondary
-#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+#: ../mail/mail-errors.xml.h:121 ../mail/mail-errors.xml.h:125
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -12855,22 +12992,22 @@ msgstr ""
 "endre navn på, flytte eller slette disse."
 
 #. mail:no-rename-special-folder primary
-#: mail/mail-errors.xml.h:118
+#: ../mail/mail-errors.xml.h:123
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Kan ikke endre navn på eller flytte systemmappe «{0}»."
 
 #. mail:ask-delete-folder title
-#: mail/mail-errors.xml.h:122
+#: ../mail/mail-errors.xml.h:127
 msgid "Delete \"{0}\"?"
 msgstr "Slett «{0}»?"
 
 #. mail:ask-delete-folder primary
-#: mail/mail-errors.xml.h:124
+#: ../mail/mail-errors.xml.h:129
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Vil du virkelig slette mappen «{0}» og alle dens undermapper?"
 
 #. mail:ask-delete-folder secondary
-#: mail/mail-errors.xml.h:126
+#: ../mail/mail-errors.xml.h:131
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -12880,154 +13017,154 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#: ../mail/mail-errors.xml.h:133 ../mail/mail-errors.xml.h:137
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Kan ikke endre navn på «{0}» til {1}."
 
 #. mail:no-rename-folder-exists secondary
 #. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+#: ../mail/mail-errors.xml.h:135 ../mail/mail-errors.xml.h:197
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "En mappe med navn «{1}» eksisterer allerede. Vennligst bruk et annet navn."
 
 #. mail:no-rename-folder secondary
-#: mail/mail-errors.xml.h:134
+#: ../mail/mail-errors.xml.h:139
 msgid "Because \"{2}\"."
 msgstr "fordi «{2}»."
 
 #. mail:no-move-folder-nostore primary
 #. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#: ../mail/mail-errors.xml.h:141 ../mail/mail-errors.xml.h:145
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kunne ikke flytte mappe «{0}» til «{1}»."
 
 #. mail:no-move-folder-nostore secondary
 #. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#: ../mail/mail-errors.xml.h:143 ../mail/mail-errors.xml.h:151
 msgid "Cannot open source \"{2}\"."
 msgstr "Kan ikke åpne kilde «{2}»."
 
 #. mail:no-move-folder-to-nostore secondary
 #. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#: ../mail/mail-errors.xml.h:147 ../mail/mail-errors.xml.h:155
 msgid "Cannot open target \"{2}\"."
 msgstr "Kan ikke åpne mål «{2}»."
 
 #. mail:no-copy-folder-nostore primary
 #. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#: ../mail/mail-errors.xml.h:149 ../mail/mail-errors.xml.h:153
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kan ikke kopiere mappe «{0}» til «{1}»."
 
 #. mail:no-create-folder-nostore primary
-#: mail/mail-errors.xml.h:152
+#: ../mail/mail-errors.xml.h:157
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kan ikke opprette mappe «{0}»."
 
 #. mail:no-create-folder-nostore secondary
-#: mail/mail-errors.xml.h:154
+#: ../mail/mail-errors.xml.h:159
 msgid "Cannot open source \"{1}\""
 msgstr "Kan ikke åpne kilde «{1}»"
 
 #. mail:account-incomplete primary
 #. mail:account-notunique primary
-#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#: ../mail/mail-errors.xml.h:161 ../mail/mail-errors.xml.h:165
 msgid "Cannot save changes to account."
 msgstr "Kan ikke lagre endringer for kontoen."
 
 #. mail:account-incomplete secondary
-#: mail/mail-errors.xml.h:158
+#: ../mail/mail-errors.xml.h:163
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
 #. mail:account-notunique secondary
-#: mail/mail-errors.xml.h:162
+#: ../mail/mail-errors.xml.h:167
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
 #. mail:ask-delete-account title
-#: mail/mail-errors.xml.h:164
+#: ../mail/mail-errors.xml.h:169
 msgid "Delete account?"
 msgstr "Slett konto?"
 
 #. mail:ask-delete-account primary
-#: mail/mail-errors.xml.h:166
+#: ../mail/mail-errors.xml.h:171
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne kontoen?"
 
 #. mail:ask-delete-account secondary
-#: mail/mail-errors.xml.h:168
+#: ../mail/mail-errors.xml.h:173
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
-#: mail/mail-errors.xml.h:169
+#: ../mail/mail-errors.xml.h:174
 msgid "Don't delete"
 msgstr "Ikke slett"
 
 #. mail:no-save-signature primary
-#: mail/mail-errors.xml.h:171
+#: ../mail/mail-errors.xml.h:176
 msgid "Could not save signature file."
 msgstr "Kunne ikke lagre signaturfil."
 
 #. mail:no-save-signature secondary
-#: mail/mail-errors.xml.h:173
+#: ../mail/mail-errors.xml.h:178
 msgid "Because \"{0}\"."
 msgstr "Fordi «{0}»."
 
 #. mail:signature-notscript primary
-#: mail/mail-errors.xml.h:175
+#: ../mail/mail-errors.xml.h:180
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Kan ikke sette signaturskript «{0}»."
 
 #. mail:signature-notscript secondary
-#: mail/mail-errors.xml.h:177
+#: ../mail/mail-errors.xml.h:182
 msgid "The script file must exist and be executable."
 msgstr "Skriptfilen må eksistere og være kjørbar."
 
 #. mail:ask-signature-changed title
-#: mail/mail-errors.xml.h:179
+#: ../mail/mail-errors.xml.h:184
 msgid "Discard changed?"
 msgstr "Forkast endringer?"
 
 #. mail:ask-signature-changed primary
-#: mail/mail-errors.xml.h:181
+#: ../mail/mail-errors.xml.h:186
 msgid "Do you wish to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
 #. mail:ask-signature-changed secondary
-#: mail/mail-errors.xml.h:183
+#: ../mail/mail-errors.xml.h:188
 msgid "This signature has been changed, but has not been saved."
 msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: mail/mail-errors.xml.h:184
+#: ../mail/mail-errors.xml.h:189
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
 #. mail:vfolder-notexist primary
-#: mail/mail-errors.xml.h:186
+#: ../mail/mail-errors.xml.h:191
 msgid "Cannot edit vFolder \"{0}\" as it does not exist."
 msgstr "Kan ikke redigere virtuell mappe «{0}» da den ikke eksisterer."
 
 #. mail:vfolder-notexist secondary
-#: mail/mail-errors.xml.h:188
+#: ../mail/mail-errors.xml.h:193
 msgid ""
 "This folder may have been added implictly, go to the virtual folder editor "
 "to add it explictly, if required."
 msgstr ""
 
 #. mail:vfolder-notunique primary
-#: mail/mail-errors.xml.h:190
+#: ../mail/mail-errors.xml.h:195
 msgid "Cannot add vFolder \"{0}\"."
 msgstr "Kan ikke legge til virtuell mappe «{0}»."
 
 #. mail:vfolder-updated primary
-#: mail/mail-errors.xml.h:194
+#: ../mail/mail-errors.xml.h:199
 msgid "vFolders automatically updated."
 msgstr "Virtuelle mapper oppdatert automatisk."
 
 #. mail:vfolder-updated secondary
-#: mail/mail-errors.xml.h:196
+#: ../mail/mail-errors.xml.h:201
 msgid ""
 "The following vFolder(s):\n"
 "{0}\n"
@@ -13042,12 +13179,12 @@ msgstr ""
 "og ble oppdatert."
 
 #. mail:filter-updated primary
-#: mail/mail-errors.xml.h:202
+#: ../mail/mail-errors.xml.h:207
 msgid "Mail filters automatically updated."
 msgstr "E-postfiltre oppdatert automatisk."
 
 #. mail:filter-updated secondary
-#: mail/mail-errors.xml.h:204
+#: ../mail/mail-errors.xml.h:209
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13062,27 +13199,27 @@ msgstr ""
 "og ble oppdatert."
 
 #. mail:no-folder primary
-#: mail/mail-errors.xml.h:210
+#: ../mail/mail-errors.xml.h:215
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
 #. mail:no-folder secondary
-#: mail/mail-errors.xml.h:212
+#: ../mail/mail-errors.xml.h:217
 msgid "You must specify a folder."
 msgstr "Du må oppgi en mappe."
 
 #. mail:no-name-vfolder secondary
-#: mail/mail-errors.xml.h:216
+#: ../mail/mail-errors.xml.h:221
 msgid "You must name this vFolder."
 msgstr "Du må gi navn til denne virtuelle mappen."
 
 #. mail:vfolder-no-source primary
-#: mail/mail-errors.xml.h:218
+#: ../mail/mail-errors.xml.h:223
 msgid "No sources selected."
 msgstr "Ingen kilder valgt."
 
 #. mail:vfolder-no-source secondary
-#: mail/mail-errors.xml.h:220
+#: ../mail/mail-errors.xml.h:225
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting\n"
@@ -13090,12 +13227,12 @@ msgid ""
 msgstr ""
 
 #. mail:ask-migrate-existing primary
-#: mail/mail-errors.xml.h:224
+#: ../mail/mail-errors.xml.h:229
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:226
+#: ../mail/mail-errors.xml.h:231
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13103,25 +13240,25 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:230
+#: ../mail/mail-errors.xml.h:235
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
+#: ../mail/mail-errors.xml.h:236 ../widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: mail/mail-errors.xml.h:232
+#: ../mail/mail-errors.xml.h:237
 msgid "_Append"
 msgstr "_Legg til"
 
 #. mail:no-load-license primary
-#: mail/mail-errors.xml.h:234
+#: ../mail/mail-errors.xml.h:239
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
 #. mail:no-load-license secondary
-#: mail/mail-errors.xml.h:236
+#: ../mail/mail-errors.xml.h:241
 msgid ""
 "Cannot read the license file \"{0}\", due to an\n"
 "      installation problem.  You will not be able to use this provider "
@@ -13130,22 +13267,22 @@ msgid ""
 msgstr ""
 
 #. mail:checking-service title
-#: mail/mail-errors.xml.h:240
+#: ../mail/mail-errors.xml.h:245
 msgid "Querying server"
 msgstr "Spør tjener"
 
 #. mail:checking-service primary
-#: mail/mail-errors.xml.h:242
+#: ../mail/mail-errors.xml.h:247
 msgid "Please wait."
 msgstr "Vennligst vent."
 
 #. mail:checking-service secondary
-#: mail/mail-errors.xml.h:244
+#: ../mail/mail-errors.xml.h:249
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
 
 #. mail:gw-accountsetup-error primary
-#: mail/mail-errors.xml.h:246
+#: ../mail/mail-errors.xml.h:251
 msgid ""
 "Unable to connect to the GroupWise\n"
 "server."
@@ -13154,31 +13291,31 @@ msgstr ""
 "tjener."
 
 #. mail:gw-accountsetup-error secondary
-#: mail/mail-errors.xml.h:249
+#: ../mail/mail-errors.xml.h:254
 msgid ""
 "\n"
 "Please check your account settings and try again.\n"
 msgstr ""
 
-#: mail/mail-folder-cache.c:813
+#: ../mail/mail-folder-cache.c:813
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: mail/mail-ops.c:101
+#: ../mail/mail-ops.c:101
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:262
+#: ../mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:556
+#: ../mail/mail-ops.c:556
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: mail/mail-ops.c:581
+#: ../mail/mail-ops.c:581
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13187,114 +13324,114 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: mail/mail-ops.c:590
+#: ../mail/mail-ops.c:590
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: mail/mail-ops.c:687
+#: ../mail/mail-ops.c:687
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:718
+#: ../mail/mail-ops.c:718
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: mail/mail-ops.c:720 mail/mail-send-recv.c:607
+#: ../mail/mail-ops.c:720 ../mail/mail-send-recv.c:607
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: mail/mail-ops.c:722
+#: ../mail/mail-ops.c:722
 msgid "Complete."
 msgstr "Fullført."
 
-#: mail/mail-ops.c:819
+#: ../mail/mail-ops.c:819
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:904
+#: ../mail/mail-ops.c:904
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:904
+#: ../mail/mail-ops.c:904
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:1130
+#: ../mail/mail-ops.c:1130
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1173
+#: ../mail/mail-ops.c:1173
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1245
+#: ../mail/mail-ops.c:1245
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1323
+#: ../mail/mail-ops.c:1323
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: mail/mail-ops.c:1482
+#: ../mail/mail-ops.c:1482
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: mail/mail-ops.c:1483
+#: ../mail/mail-ops.c:1483
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: mail/mail-ops.c:1538
+#: ../mail/mail-ops.c:1538
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: mail/mail-ops.c:1574 mail/mail-ops.c:1625
+#: ../mail/mail-ops.c:1574 ../mail/mail-ops.c:1625
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1622
+#: ../mail/mail-ops.c:1622
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: mail/mail-ops.c:1623
+#: ../mail/mail-ops.c:1623
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1778
+#: ../mail/mail-ops.c:1778
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1864
+#: ../mail/mail-ops.c:1864
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1914
+#: ../mail/mail-ops.c:1914
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13303,7 +13440,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1942
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13312,11 +13449,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:2013
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2025
+#: ../mail/mail-ops.c:2025
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13325,782 +13462,898 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: ../mail/mail-ops.c:2035
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2185
+#: ../mail/mail-ops.c:2185
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2185
+#: ../mail/mail-ops.c:2185
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: mail/mail-ops.c:2301
+#: ../mail/mail-ops.c:2301
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-send-recv.c:158
+#: ../mail/mail-send-recv.c:158
 msgid "Cancelling..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:265
+#: ../mail/mail-send-recv.c:265
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tjener: %s, Type: %s"
 
-#: mail/mail-send-recv.c:267
+#: ../mail/mail-send-recv.c:267
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sti: %s, Type: %s"
 
-#: mail/mail-send-recv.c:269
+#: ../mail/mail-send-recv.c:269
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:320
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: mail/mail-send-recv.c:323
+#: ../mail/mail-send-recv.c:323
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: mail/mail-send-recv.c:410
+#: ../mail/mail-send-recv.c:410
 msgid "Updating..."
 msgstr "Oppdaterer..."
 
-#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:462
+#: ../mail/mail-send-recv.c:410 ../mail/mail-send-recv.c:462
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:208
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: mail/mail-session.c:210
+#: ../mail/mail-session.c:210
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: mail/mail-session.c:239
+#: ../mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Rediger signatur"
 
-#: mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Oppgi et navn for denne signaturen."
 
-#: mail/mail-signature-editor.c:415
-#: plugins/shared-folder/properties.glade.h:11
+#: ../mail/mail-signature-editor.c:415
+#: ../plugins/shared-folder/properties.glade.h:5
 msgid "Name:"
 msgstr "Navn:"
 
-#: mail/mail-tools.c:115
+#: ../mail/mail-tools.c:115
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Kan ikke opprette spool-katalog «%s»: %s"
 
-#: mail/mail-tools.c:142
+#: ../mail/mail-tools.c:142
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Prøver å bruke movemail på en kilde som ikke er i mbox-format «%s»"
 
-#: mail/mail-tools.c:277
+#: ../mail/mail-tools.c:277
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:279
+#: ../mail/mail-tools.c:279
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: mail/mail-tools.c:320
+#: ../mail/mail-tools.c:320
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Ugyldig mappe: «%s»"
 
-#: mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Setter opp virtuell mappe: %s"
 
-#: mail/mail-vfolder.c:235
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating vFolders for '%s:%s'"
 msgstr "Oppdaterer virtuelle mapper for «%s:%s»"
 
-#: mail/mail-vfolder.c:242
+#: ../mail/mail-vfolder.c:242
 #, c-format
 msgid "Updating vFolders for '%s'"
 msgstr "Oppdaterer virtuelle mapper for «%s»"
 
-#: mail/mail-vfolder.c:961
+#: ../mail/mail-vfolder.c:961
 msgid "vFolders"
 msgstr "Virtuelle mapper"
 
-#: mail/mail-vfolder.c:1000
+#: ../mail/mail-vfolder.c:1000
 msgid "Edit VFolder"
 msgstr "Rediger virtuell mappe"
 
-#: mail/mail-vfolder.c:1084
+#: ../mail/mail-vfolder.c:1084
 msgid "New VFolder"
 msgstr "Ny virtuell mappe"
 
-#: mail/message-list.c:999
+#: ../mail/message-list.c:999
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:1000
+#: ../mail/message-list.c:1000
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:1001
+#: ../mail/message-list.c:1001
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:1002
+#: ../mail/message-list.c:1002
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:1003
+#: ../mail/message-list.c:1003
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:1007
+#: ../mail/message-list.c:1007
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:1008
+#: ../mail/message-list.c:1008
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:1012
+#: ../mail/message-list.c:1012
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:1013
+#: ../mail/message-list.c:1013
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:1341
+#: ../mail/message-list.c:1341
 msgid "?"
 msgstr "?"
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: mail/message-list.c:1348 plugins/itip-formatter/itip-view.c:160
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:160
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: mail/message-list.c:1357
+#: ../mail/message-list.c:1357
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:1369
+#: ../mail/message-list.c:1369
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:1377
+#: ../mail/message-list.c:1377
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: mail/message-list.c:1379
+#: ../mail/message-list.c:1379
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2044
+#: ../mail/message-list.c:2044
 msgid "Message List"
 msgstr "Meldingsliste"
 
-#: mail/message-list.c:3381
+#: ../mail/message-list.c:3381
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: mail/message-list.etspec.h:3
+#: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Ferdig til"
 
-#: mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Status for merking"
 
-#: mail/message-list.etspec.h:5
+#: ../mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Merket"
 
-#: mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Følg opp-flagg"
 
-#: mail/message-list.etspec.h:8
+#: ../mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Opprinnelig lokasjon"
 
-#: mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Mottatt"
 
-#: mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:74
 msgid "Call"
 msgstr "Ring"
 
-#: mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:75
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:76
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:77
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:79
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:83
 msgid "Review"
 msgstr "Gjennomgå"
 
-#: mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
-#: mail/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Kropp inneholder ikke"
-
-#: mail/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Kropp eller emne inneholder"
-
-#: mail/searchtypes.xml.h:4
+#: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
 msgstr "Melding inneholder"
 
-#: mail/searchtypes.xml.h:5
+#: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
-#: mail/searchtypes.xml.h:6
+#: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
-#: mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
-#: mail/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Emne inneholder ikke"
+#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Sender contains"
+msgstr "Emne eller avsender inneholder"
 
-#: plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup.c:109
 msgid "Backup Evolution directory"
 msgstr "Ta sikkerhetskopi av Evolution-mapper"
 
-#: plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:111
 msgid "Restore Evolution directory"
 msgstr "Gjenopprett Evolution-mapper"
 
-#: plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:113
 msgid "Check Evolution archive"
 msgstr "Sjekk arkiv for Evolution"
 
-#: plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:115
 msgid "Restart Evolution"
 msgstr "Start Evolution på nytt"
 
-#: plugins/backup-restore/backup-restore.c:51
+#: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
 msgstr ""
 
-#: plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:61
 msgid "_Restart Evolution after backup"
 msgstr ""
 
-#: plugins/backup-restore/backup-restore.c:89
+#: ../plugins/backup-restore/backup-restore.c:89
 msgid "Select Evolution archive to restore"
 msgstr ""
 
-#: plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:97
 msgid "_Restart Evolution after restore"
 msgstr ""
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
 msgstr "Innstillinger for sikkerhetskopiering..."
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-#, fuzzy
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
-msgstr "Endre innstillinger for Evolution"
+msgstr "Sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution"
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
 msgstr "Gjenopprett innstillinger..."
 
-#: plugins/bbdb/bbdb.c:388
+#: ../plugins/bbdb/bbdb.c:388
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
-#: plugins/bbdb/bbdb.c:397
+#: ../plugins/bbdb/bbdb.c:397
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automatiske kontakter</span>"
 
 #. Enable BBDB checkbox
-#: plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:410
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 
-#: plugins/bbdb/bbdb.c:428
+#: ../plugins/bbdb/bbdb.c:428
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Kontakter for lynmeldinger</span>"
 
 #. Enable Gaim Checkbox
-#: plugins/bbdb/bbdb.c:441
+#: ../plugins/bbdb/bbdb.c:441
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
 msgstr ""
 
 #. Synchronize now button.
-#: plugins/bbdb/bbdb.c:448
+#: ../plugins/bbdb/bbdb.c:448
 msgid "Synchronize with _buddy list now"
 msgstr "Synkroniser med _vennelisten nå"
 
-#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
+msgid "Weather: Cloudy"
+msgstr "Vær: overskyet"
+
+#: ../plugins/calendar-weather/calendar-weather.c:61
+msgid "Weather: Fog"
+msgstr "Vær: tåke"
+
+#: ../plugins/calendar-weather/calendar-weather.c:62
+msgid "Weather: Partly Cloudy"
+msgstr "Vær: delvis skyet"
+
+#: ../plugins/calendar-weather/calendar-weather.c:63
+msgid "Weather: Rain"
+msgstr "Vær: regn"
+
+#: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Snow"
+msgstr "Vær: snø"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Sunny"
+msgstr "Vær: sol"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Thunderstorms"
+msgstr "Vær: tordenvær"
+
+#: ../plugins/calendar-weather/calendar-weather.c:100
+msgid "Weather"
+msgstr "Vær"
+
+#: ../plugins/calendar-weather/calendar-weather.c:268
+msgid "Select a location"
+msgstr "Velg en lokasjon"
+
+#: ../plugins/calendar-weather/calendar-weather.c:655
+msgid "_Units:"
+msgstr "_Enheter:"
+
+#: ../plugins/calendar-weather/calendar-weather.c:662
+msgid "Metric (Celsius, cm, etc)"
+msgstr "Metrisk (celcius, cm, osv)"
+
+#: ../plugins/calendar-weather/calendar-weather.c:663
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr "Imerisk (Fahrenheit, tommer, osv)"
+
+#: ../plugins/default-source/default-source.c:82
+msgid "Mark  as default folder"
+msgstr "Sett som forvalgt mappe"
+
+#: ../plugins/default-source/default-source.c:108
+msgid "Mark as default folder"
+msgstr "Sett som forvalgt mappe"
+
+#. Description section
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:91
+#, fuzzy
+msgid ""
+"The message specified below will be automatically sent to \n"
+"each person who sends mail to you while you are out of the office."
+msgstr ""
+"<small>Meldingen spesifisert under vil sendes automatisk til alle som sender "
+"deg\n"
+"e-post mens du er borte fra kontoret.</small>"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:115
+msgid "I am in the office"
+msgstr "Jeg er på kontoret"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:129
+msgid "I am out of the office"
+msgstr "Jeg er ute av kontoret"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:143
+msgid "Out of office Message:"
+msgstr "Melding ved fravær fra kontoret"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:194
+msgid "Exchange Settings"
+msgstr "Innstillinger for Exchange"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:329
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:193
+msgid "A_uthenticate"
+msgstr "A_utentiser"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:336
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:200
+msgid "_OWA Url:"
+msgstr "_OWA-URL:"
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Fjerner abonnement på mappe «%s»"
 
-#: plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
 msgid "Checklist"
 msgstr "Sjekkliste"
 
-#: plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
+msgid "Add Send Options to groupwise messages"
+msgstr ""
+
+#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:20
+msgid "Send Options"
+msgstr "Alternativer for sending"
+
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppføring"
 
-#: plugins/itip-formatter/itip-formatter.c:750
+#: ../plugins/itip-formatter/itip-formatter.c:750
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kunne ikke sende oppføring til kalender «%s». %s"
 
-#: plugins/itip-formatter/itip-formatter.c:761
+#: ../plugins/itip-formatter/itip-formatter.c:761
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som godtatt"
 
-#: plugins/itip-formatter/itip-formatter.c:765
+#: ../plugins/itip-formatter/itip-formatter.c:765
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: plugins/itip-formatter/itip-formatter.c:770
+#: ../plugins/itip-formatter/itip-formatter.c:770
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: plugins/itip-formatter/itip-formatter.c:775
+#: ../plugins/itip-formatter/itip-formatter.c:775
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: plugins/itip-formatter/itip-formatter.c:825
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:826
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
+msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
 
-#: plugins/itip-formatter/itip-formatter.c:836
+#: ../plugins/itip-formatter/itip-formatter.c:837
 #, c-format
-msgid "Unable to update attendee statusAttendee status updated. %s"
-msgstr ""
+msgid "Unable to update attendee. %s"
+msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: plugins/itip-formatter/itip-formatter.c:840
+#: ../plugins/itip-formatter/itip-formatter.c:841
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: plugins/itip-formatter/itip-formatter.c:965
+#: ../plugins/itip-formatter/itip-formatter.c:966
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: plugins/itip-formatter/itip-formatter.c:966
+#: ../plugins/itip-formatter/itip-formatter.c:967
 msgid ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1000
-#: plugins/itip-formatter/itip-formatter.c:1056
+#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1057
 msgid "The item in the calendar is not valid"
-msgstr ""
+msgstr "Oppføringen i kalenderen er ikke gyldig"
 
-#: plugins/itip-formatter/itip-formatter.c:1001
-#: plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1002
+#: ../plugins/itip-formatter/itip-formatter.c:1058
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1012
+#: ../plugins/itip-formatter/itip-formatter.c:1013
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1014
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1632
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Meetings and Tasks"
 msgstr "Møter og oppgaver"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid "_Delete message after acting"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1665
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">Søk etter konflikter</span>"
 
 #. Source selector
-#: plugins/itip-formatter/itip-formatter.c:1678
+#: ../plugins/itip-formatter/itip-formatter.c:1694
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:146 ui/evolution-calendar.xml.h:34
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:450
+#: ../plugins/itip-formatter/itip-view.c:146 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:450
 msgid "Today"
 msgstr "I dag"
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:151
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:151
 msgid "Today %H:%M"
 msgstr "I dag %H:%M"
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:155
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:155
 msgid "Today %H:%M:%S"
 msgstr "I dag %H:%M:%S"
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:164
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:164
 msgid "Today %l:%M:%S %p"
 msgstr "I dag %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:172
-#: plugins/itip-formatter/itip-view.c:224
-msgid "%A, %B %e"
-msgstr "%A, %e %B"
+#: ../plugins/itip-formatter/itip-view.c:172
+msgid "Tomorrow"
+msgstr "I morgen"
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:177
-#: plugins/itip-formatter/itip-view.c:229
-msgid "%A, %B %e %H:%M"
-msgstr "%A, %e %B %H:%M"
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:177
+msgid "Tomorrow %H:%M"
+msgstr "I morgen %H.%M"
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:181
-#: plugins/itip-formatter/itip-view.c:233
-msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %e %B %H.%M.%S"
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:181
+msgid "Tomorrow %H:%M:%S"
+msgstr "I morgen %H.%M.%S"
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:186
-#: plugins/itip-formatter/itip-view.c:238
-msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %e %B %l:%M %p"
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:186
+msgid "Tomorrow %l:%M %p"
+msgstr "I morgen %l.%M %p"
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:190
-#: plugins/itip-formatter/itip-view.c:242
-msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %e %B %l.%M.%S %p"
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:190
+#, fuzzy
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "I morgen %l.%M.%S %p"
 
-#. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:198
+#. strftime format of a weekday.
+#: ../plugins/itip-formatter/itip-view.c:198
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#. strftime format of a weekday, a date and a
+#. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:203
+#: ../plugins/itip-formatter/itip-view.c:203
 msgid "%A %H:%M"
 msgstr "%A %H.%M"
 
-#. strftime format of a weekday, a date and a
+#. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "%A %H:%M:%S"
 msgstr "%A %H.%M.%S"
 
-#. strftime format of a weekday, a date and a
+#. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "%A %l:%M %p"
 msgstr "%A %l.%M %p"
 
-#. strftime format of a weekday, a date and a
+#. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:216
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l.%M.%S %p"
 
+#. strftime format of a weekday and a date
+#. without a year.
+#: ../plugins/itip-formatter/itip-view.c:225
+msgid "%A, %B %e"
+msgstr "%A, %e %B"
+
+#. strftime format of a weekday, a date
+#. without a year and a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:231
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e %B %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:235
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e %B %H.%M.%S"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:240
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e %B %l.%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:244
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e %B %l.%M.%S %p"
+
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:248
+#: ../plugins/itip-formatter/itip-view.c:250
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:255
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:259
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B %Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l.%M.%S %p"
 
-#: plugins/itip-formatter/itip-view.c:291
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:293
+#, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> til og med %s har publisert følgende møteinformasjon:"
+msgstr "<b>%s</b> har via %s publisert følgende møteinformasjon:"
 
-#: plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:295
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> har publisert følgende møteinformasjon:"
 
-#: plugins/itip-formatter/itip-view.c:298
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:300
+#, c-format
 msgid "<b>%s</b> requests the presence of %s at the following meeting:"
-msgstr "<b>%s</b> forespør at %s er tilstede i et møte."
+msgstr "<b>%s</b> forespør at %s er tilstede i følgende møte."
 
-#: plugins/itip-formatter/itip-view.c:301
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:303
+#, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
+msgstr "<b>%s</b> forespør via %s din tilstedeværelse i et møte."
 
-#: plugins/itip-formatter/itip-view.c:303
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:305
+#, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
+msgstr "<b>%s</b> forespør din tilstedeværelse i følgende møte:"
 
-#: plugins/itip-formatter/itip-view.c:309
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:311
+#, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte."
+msgstr "<b>%s</b> ønsker via %s å legge til informasjon i et eksisterende møte:"
 
-#: plugins/itip-formatter/itip-view.c:311
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:313
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte."
+msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte:"
 
-#: plugins/itip-formatter/itip-view.c:314
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:316
+#, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
+msgstr "<b>%s</b> ønsker å motta den seneste informasjon for følgende møte:"
 
-#: plugins/itip-formatter/itip-view.c:317
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:319
+#, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> har sendt en uforståelig melding."
+msgstr "<b>%s</b> har sendt tilbake følgende svar på møteinnkalling:"
 
-#: plugins/itip-formatter/itip-view.c:321
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:323
+#, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
-msgstr "<b>%s</b> har avlyst et møte."
+msgstr "<b>%s</b> har via %s avlyst følgende møte:"
 
-#: plugins/itip-formatter/itip-view.c:323
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:325
+#, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
-msgstr "<b>%s</b> har avlyst et møte."
+msgstr "<b>%s</b> har avlyst følgende møte:"
 
-#: plugins/itip-formatter/itip-view.c:326
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:328
+#, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> har svart på en møteforespørsel."
+msgstr "<b>%s</b> har foreslått følgende endringer i møte:"
 
-#: plugins/itip-formatter/itip-view.c:330
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:332
+#, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> har svart på en møteforespørsel."
+msgstr "<b>%s</b> har via %s avslått følgende endringer for møte:"
 
-#: plugins/itip-formatter/itip-view.c:332
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:334
+#, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> har svart på en møteforespørsel."
+msgstr "<b>%s</b> har avslått følgende endringer for møte:"
 
-#: plugins/itip-formatter/itip-view.c:359
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:361
+#, c-format
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> har publisert informasjon om en oppgave."
+msgstr "<b>%s</b> har via %s publisert følgende oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:361
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:363
+#, c-format
 msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> har publisert informasjon om en oppgave."
+msgstr "<b>%s</b> har publisert følgende oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:366
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:368
+#, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> forespør at %s er tilstede i et møte."
+msgstr "<b>%s</b> forespør at %s tildeles følgende oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:369
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:371
+#, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> har avlyst en oppgave."
+msgstr "<b>%s</b> har via %s tildelt deg en oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:371
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:373
+#, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> har avlyst en oppgave."
+msgstr "<b>%s</b> har tildelt deg en oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:377
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:379
+#, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave."
+msgstr "<b>%s</b> forespør via %s å legge til informasjon i eksisterende oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:379
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:381
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave."
+msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:382
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:384
+#, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
+msgstr "<b>%s</b> ønsker å motta den seneste informasjon for følgende tildelt oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:385
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:387
+#, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> har sendt en uforståelig melding."
+msgstr "<b>%s</b> har sendt tilbake følgende svar på tildelt oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:389
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:391
+#, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
-msgstr "<b>%s</b> har avlyst en oppgave."
+msgstr "<b>%s</b> har via %s avlyst følgende tildelt oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:391
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:393
+#, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
-msgstr "<b>%s</b> har avlyst en oppgave."
+msgstr "<b>%s</b> har avlyst følgende tildelt oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:394
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:396
+#, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> har svart på en oppgavetildeling."
+msgstr "<b>%s</b> har foreslått følgende endringer i oppgavetildeling:"
 
-#: plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
+msgstr "<b>%s</b> har via %s avslått følgende tildelt oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:400
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:402
+#, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> har svart på en oppgavetildeling."
+msgstr "<b>%s</b> har avslått følgende tildelt oppgave:"
 
 #. Comment
-#: plugins/itip-formatter/itip-view.c:846
-#: plugins/itip-formatter/itip-view.c:896
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:898
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: plugins/itip-formatter/itip-view.c:1573
-msgid "_Calendar:"
-msgstr "_Kalender:"
-
 #. org.gnome.mailing-list-actions:no-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
 msgid "Action not available"
 msgstr "Handlingen er ikke tilgjengelig"
 
 #. org.gnome.mailing-list-actions:no-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
 msgid ""
 "This message does not contain the header information required for this "
 "action."
 msgstr ""
 
 #. org.gnome.mailing-list-actions:posting-not-allowed primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
 msgid "Posting not allowed"
 msgstr "Posting er ikke tillatt"
 
 #. org.gnome.mailing-list-actions:posting-not-allowed secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
 
 #. org.gnome.mailing-list-actions:ask-send-message primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
 msgid "Send e-mail message to mailing list?"
 msgstr "Send melding til e-postliste?"
 
 #. org.gnome.mailing-list-actions:ask-send-message secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
 msgid ""
 "An e-mail message will be sent to the URL \"{0}\". You can either send the "
 "message automatically, or see and change it first.\n"
@@ -14109,21 +14362,21 @@ msgid ""
 "has been sent."
 msgstr ""
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
 msgid "_Send message"
 msgstr "_Send melding"
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
 msgid "_Edit message"
 msgstr "R_ediger melding"
 
 #. org.gnome.mailing-list-actions:malformed-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
 msgid "Malformed header"
 msgstr "Feilutformet hode"
 
 #. org.gnome.mailing-list-actions:malformed-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
@@ -14131,13 +14384,12 @@ msgid ""
 msgstr ""
 
 #. org.gnome.mailing-list-actions:no-action primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
 msgid "No e-mail action"
-msgstr "Loggfør filterhandlinger"
+msgstr "Ingen handling for e-post"
 
 #. org.gnome.mailing-list-actions:no-action secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
 msgid ""
 "The action could not be performed. This means the header for this action did "
 "not contain any action we could handle.\n"
@@ -14145,149 +14397,92 @@ msgid ""
 "Header: {0}"
 msgstr ""
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-#, fuzzy
-msgid "Contact list _owner"
-msgstr "Kontaktlisteredigering"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
-#, fuzzy
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get an archive of the list this message belongs to"
-msgstr ""
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-msgid "Get list _archive"
-msgstr ""
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-#, fuzzy
-msgid "Get list _usage information"
-msgstr "Møteinformasjon"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-msgid "Mailing _List"
-msgstr "E-post_liste"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-#, fuzzy
-msgid "Post a message to the mailing list this message belongs to"
-msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-#, fuzzy
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-#, fuzzy
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-#, fuzzy
-msgid "_Post message to list"
-msgstr "Send _melding til liste..."
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-#, fuzzy
-msgid "_Subscribe to list"
-msgstr "_Abonner"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-#, fuzzy
-msgid "_Un-subscribe to list"
-msgstr "_Fjern abonnement"
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: ../plugins/new-mail-notify/new-mail-notify.c:66
+msgid "_Generates a D-BUS message when new mail arrives"
+msgstr "_Genererer en D-BUS-melding når nye meldinger ankommer"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
-msgstr ""
+msgstr "Aktiver og deaktiver tillegg"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "Manage Plugins..."
 msgstr "Håndter tillegg..."
 
-#: plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:45
 msgid "Author(s)"
 msgstr "Fofatter(e)"
 
-#: plugins/plugin-manager/plugin-manager.c:46
+#: ../plugins/plugin-manager/plugin-manager.c:46
 msgid "Id"
 msgstr "Id"
 
-#: plugins/plugin-manager/plugin-manager.c:47
+#: ../plugins/plugin-manager/plugin-manager.c:47
 msgid "Path"
 msgstr "Sti"
 
-#: plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:48
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Setup the ui
-#: plugins/plugin-manager/plugin-manager.c:188
+#: ../plugins/plugin-manager/plugin-manager.c:188
 msgid "Plugin Manager"
 msgstr "Tilleggshåndterer"
 
-#: plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:201
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 
-#: plugins/plugin-manager/plugin-manager.c:210
+#: ../plugins/plugin-manager/plugin-manager.c:210
 msgid "Plugin"
 msgstr "Tillegg"
 
-#: plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
 msgstr "Vis HTML hvis det finnes"
 
-#: plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
 msgstr "Foretrekk vanlig tekst"
 
-#: plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:107
 msgid "Only ever show PLAIN"
 msgstr "Vis kun vanlig tekst"
 
-#: plugins/prefer-plain/prefer-plain.c:150
+#: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
 msgstr "HTML-modus"
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
 msgstr "Lagre vedlegg..."
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "Lagre alle vedlegg"
 
-#: plugins/save-attachments/save-attachments.c:331
-#, fuzzy
+#: ../plugins/save-attachments/save-attachments.c:331
 msgid "Select save base name"
-msgstr "Velg en tidssone"
+msgstr "Velg basisnavn for lagring"
 
-#: plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:351
 msgid "MIME Type"
 msgstr "MIME-type"
 
-#: plugins/save-attachments/save-attachments.c:359
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
+#: ../plugins/save-attachments/save-attachments.c:359
+#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Lagre"
 
-#: plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:167
 #, c-format
 msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
-msgstr ""
+msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
 
-#: plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:370
 #, c-format
 msgid ""
 "Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
@@ -14295,246 +14490,239 @@ msgid ""
 "sAttendees List%sLocation%sModified%s"
 msgstr ""
 
-#: plugins/save-calendar/csv-format.c:519
+#: ../plugins/save-calendar/csv-format.c:519
 msgid "Advanced options for the CSV format"
-msgstr ""
+msgstr "Avanserte alternativer for CVS-format"
 
-#: plugins/save-calendar/csv-format.c:526
+#: ../plugins/save-calendar/csv-format.c:526
 msgid "Prepend a header"
-msgstr ""
+msgstr "Legg til et hode"
 
-#: plugins/save-calendar/csv-format.c:535
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:535
 msgid "Value delimiter:"
-msgstr "Lokal levering"
+msgstr "Skilletegn for verdier:"
 
-#: plugins/save-calendar/csv-format.c:541
+#: ../plugins/save-calendar/csv-format.c:541
 msgid "Record delimiter:"
-msgstr ""
+msgstr "Skilletegn for poster:"
 
-#: plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Encapsulate values with:"
 msgstr ""
 
-#: plugins/save-calendar/csv-format.c:569
+#: ../plugins/save-calendar/csv-format.c:569
 msgid "Comma separated value format (.csv)"
-msgstr ""
+msgstr "Kommaseparert verdiformat (.csv)"
 
-#: plugins/save-calendar/ical-format.c:120
+#: ../plugins/save-calendar/ical-format.c:120
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-format (.ics)"
 
-#: plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:390
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
-#: plugins/save-calendar/save-calendar.c:172
-#: plugins/save-calendar/save-calendar.c:182
+#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:182
 msgid "Select destination file"
 msgstr "Velg målfil"
 
-#: plugins/save-calendar/save-calendar.c:217
+#: ../plugins/save-calendar/save-calendar.c:217
 #, c-format
 msgid ""
 "The suggested filename extension of this filetype (%s) is unused in the "
 "chosen filename. Do you want to continue?"
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:1
-#, fuzzy
-msgid ""
-"\n"
-"Share List"
-msgstr "_Telefonliste"
-
-#: plugins/shared-folder/properties.glade.h:4
-msgid "Ad_d"
-msgstr "Le_gg til"
+#: ../plugins/shared-folder/properties.glade.h:2
+msgid "<b>Users :</b>"
+msgstr "<b>Brukere:</b> "
 
-#: plugins/shared-folder/properties.glade.h:5
-msgid "Additional Access"
-msgstr ""
-
-#: plugins/shared-folder/properties.glade.h:7
-msgid "Delet_e"
-msgstr "Sl_ett"
-
-#: plugins/shared-folder/properties.glade.h:8
-msgid "Edi_t"
-msgstr "Red_iger"
-
-#: plugins/shared-folder/properties.glade.h:10
+#: ../plugins/shared-folder/properties.glade.h:4
 msgid "Message"
 msgstr "Melding"
 
-#: plugins/shared-folder/properties.glade.h:12
-msgid "Sen_d Custom Notification"
-msgstr ""
-
-#: plugins/shared-folder/properties.glade.h:13
+#: ../plugins/shared-folder/properties.glade.h:6
 msgid "Shared Folder Notification"
-msgstr ""
+msgstr "Melding om delte mapper"
 
-#: plugins/shared-folder/properties.glade.h:15
+#: ../plugins/shared-folder/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
-msgstr ""
+msgstr "Deltakerene  vil motta følgende varsel.\n"
+
+#: ../plugins/shared-folder/properties.glade.h:11
+msgid "_Contacts..."
+msgstr "_Kontakter..."
 
-#: plugins/shared-folder/properties.glade.h:18
+#: ../plugins/shared-folder/properties.glade.h:12
+msgid "_Cutomize notification message"
+msgstr "_Tilpass varslingsmelding"
+
+#: ../plugins/shared-folder/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Ikke delt"
 
-#: plugins/shared-folder/properties.glade.h:20
+#: ../plugins/shared-folder/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Delt med..."
 
-#: plugins/shared-folder/properties.glade.h:21
+#: ../plugins/shared-folder/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Deling"
 
-#: plugins/shared-folder/share-folder-common.c:315
+#: ../plugins/shared-folder/share-folder-common.c:315
 msgid "Users"
 msgstr "Brukere"
 
-#: plugins/shared-folder/share-folder-common.c:316
+#: ../plugins/shared-folder/share-folder-common.c:316
 msgid "Enter the users and set permissions"
-msgstr ""
+msgstr "Oppgi brukere og sett rettigheter"
 
-#: plugins/shared-folder/share-folder-common.c:402
+#: ../plugins/shared-folder/share-folder-common.c:401
 msgid "Sharing"
 msgstr "Deling"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "Button style"
+#: ../shell/apps_evolution_shell.schemas.in.in.h:1
+msgid "A GNOME Print description of the current printer settings"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+msgid "Button style"
+msgstr "Knappestil"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Buttons are visible"
-msgstr ""
+msgstr "Knapper er synlige"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default width of the folder bar pane"
 msgstr "Forvalgt bredde for mappelinjen"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window height"
 msgstr "Forvalgt vinduhøyde"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Forvalgt vindubredde"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Evolution configuration version"
 msgstr "Konfigurasjonsversjon for Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID eller alias for komponenten som skal være forvalgt ved oppstart."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Last upgraded Evolution configuration version"
 msgstr "Sist oppgradert konfigurasjonsversjon for Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Printer settings"
+msgstr "Innstillinger for skriver"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The style of the displayed buttons. Can be text, icons, both, toolbar. If "
 "toolbar is set, the style of the toolbar is followed as determined by the "
 "GNOME setting."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "Toolbar is visible"
 msgstr "Verktøylinjen er synlig"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Om Evolution skal startes i frakoblet modus"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 #, fuzzy
 msgid "Whether the buttons should be visible."
 msgstr "Om verktøylinjen skal være synlig."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Whether the toolbar should be visible."
 msgstr "Om verktøylinjen skal være synlig."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Whether to skip the development warning dialog"
 msgstr "Om varseldialogen om utviklingsversjonen skal hoppes over"
 
-#: shell/e-active-connection-dialog.glade.h:1
+#: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
 msgstr "<b>Aktive forbindelser</b>"
 
-#: shell/e-active-connection-dialog.glade.h:2
+#: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
 msgstr "Aktive tilkoblinger"
 
-#: shell/e-active-connection-dialog.glade.h:3
+#: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr "Klikk OK for å lukke disse forbindelsene og arbeide frakoblet"
 
-#: shell/e-shell.c:597
+#: ../shell/e-shell.c:597
 msgid "Uknown system error."
 msgstr "Ukjent systemfeil."
 
-#: shell/e-shell.c:805 shell/e-shell.c:806
+#: ../shell/e-shell.c:805 ../shell/e-shell.c:806
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:1249 widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1249 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1251
+#: ../shell/e-shell.c:1251
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1253
+#: ../shell/e-shell.c:1253
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1255
+#: ../shell/e-shell.c:1255
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1257
+#: ../shell/e-shell.c:1257
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: shell/e-shell-folder-title-bar.c:586 shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:586
+#: ../shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:147
 msgid "Choose the type of importer to run:"
 msgstr "Velg type importerer som skal kjøres:"
 
-#: shell/e-shell-importer.c:149
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14548,15 +14736,15 @@ msgstr ""
 "Du kan velge «Automatisk» hvis du ikke vet, så vil Evolution prøve å finne "
 "ut hvilken type det er for deg."
 
-#: shell/e-shell-importer.c:155
+#: ../shell/e-shell-importer.c:156
 msgid "Choose the destination for this import"
 msgstr "Velg mål det skal importeres til"
 
-#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:750
+#: ../shell/e-shell-importer.c:159 ../shell/e-shell-startup-wizard.c:750
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
-#: shell/e-shell-importer.c:161
+#: ../shell/e-shell-importer.c:162
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14568,7 +14756,7 @@ msgstr ""
 "som kunne importeres ble funnet. Hvis du vil prøve igjen\n"
 "kan du klikke på «Tilbake»-knappen.\n"
 
-#: shell/e-shell-importer.c:232 shell/e-shell-importer.c:266
+#: ../shell/e-shell-importer.c:233 ../shell/e-shell-importer.c:267
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14577,30 +14765,30 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring %d."
 
-#: shell/e-shell-importer.c:340
+#: ../shell/e-shell-importer.c:341
 msgid "Select importer"
 msgstr "Velg importerer"
 
-#: shell/e-shell-importer.c:461 shell/e-shell-importer.c:1073
+#: ../shell/e-shell-importer.c:462 ../shell/e-shell-importer.c:1086
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:469
+#: ../shell/e-shell-importer.c:470
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:477
+#: ../shell/e-shell-importer.c:478
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Importerer %s.\n"
 
-#: shell/e-shell-importer.c:487 shell/e-shell-importer.c:488
+#: ../shell/e-shell-importer.c:488 ../shell/e-shell-importer.c:489
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: shell/e-shell-importer.c:506
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14609,31 +14797,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: shell/e-shell-importer.c:582
+#: ../shell/e-shell-importer.c:583
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:638
+#: ../shell/e-shell-importer.c:639
 msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
-#: shell/e-shell-importer.c:643
+#: ../shell/e-shell-importer.c:644
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: shell/e-shell-importer.c:655
+#: ../shell/e-shell-importer.c:656
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: shell/e-shell-importer.c:694
+#: ../shell/e-shell-importer.c:695
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: shell/e-shell-importer.c:697
+#: ../shell/e-shell-importer.c:698
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: shell/e-shell-importer.c:765 shell/e-shell-startup-wizard.c:571
+#: ../shell/e-shell-importer.c:766 ../shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14641,41 +14829,41 @@ msgstr ""
 "Vennligst vent...\n"
 "Søker etter eksisterende oppsett"
 
-#: shell/e-shell-importer.c:772
+#: ../shell/e-shell-importer.c:773
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: shell/e-shell-importer.c:898 shell/e-shell-startup-wizard.c:700
+#: ../shell/e-shell-importer.c:899 ../shell/e-shell-startup-wizard.c:700
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1092
+#: ../shell/e-shell-importer.c:1105
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Ingen importfunksjon tilgjengelig for fil %s"
 
-#: shell/e-shell-importer.c:1106
+#: ../shell/e-shell-importer.c:1119
 msgid "Unable to execute importer"
 msgstr "Kan ikke kjøre importprogram"
 
-#: shell/e-shell-importer.c:1220
+#: ../shell/e-shell-importer.c:1235
 msgid "_Import"
 msgstr "_Importer"
 
-#: shell/e-shell-offline-handler.c:589
+#: ../shell/e-shell-offline-handler.c:589
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
-#: shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Innstillinger for Evolution"
 
-#: shell/e-shell-startup-wizard.c:577
+#: ../shell/e-shell-startup-wizard.c:577
 msgid "Starting import"
 msgstr "Starter import"
 
-#: shell/e-shell-startup-wizard.c:797
+#: ../shell/e-shell-startup-wizard.c:797
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14689,181 +14877,184 @@ msgstr ""
 "\n"
 "Vil du avslutte veiviseren nå?"
 
-#: shell/e-shell-utils.c:116
+#: ../shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ingen mappenavn spesifisert."
 
-#: shell/e-shell-utils.c:123
+#: ../shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Mappenavn kan ikke inneholde linjeskift."
 
-#: shell/e-shell-utils.c:129
+#: ../shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
 msgstr "Mappenavn kan ikke inneholde tegnet «/»."
 
-#: shell/e-shell-utils.c:135
+#: ../shell/e-shell-utils.c:135
 msgid "Folder name cannot contain the character \"#\"."
 msgstr "Mappenavn kan ikke inneholde tegnet «#»."
 
-#: shell/e-shell-utils.c:141
+#: ../shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
-#: shell/e-shell-window.c:341
+#: ../shell/e-shell-window.c:341
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
 
-#: shell/e-shell-window.c:349
+#: ../shell/e-shell-window.c:349
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i ferd med å koble fra."
 
-#: shell/e-shell-window.c:356
+#: ../shell/e-shell-window.c:356
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
 
-#: shell/e-shell-window.c:708
+#: ../shell/e-shell-window.c:708
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: shell/e-shell-window-commands.c:67
+#: ../shell/e-shell-window-commands.c:67
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilot verktøyene ser ikke ut til å være installert på dette systemet."
 
-#: shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:75
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil under kjøring av %s."
 
-#: shell/e-shell-window-commands.c:124
+#: ../shell/e-shell-window-commands.c:124
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy er ikke installert."
 
-#: shell/e-shell-window-commands.c:132
+#: ../shell/e-shell-window-commands.c:132
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: shell/e-shell-window-commands.c:425
+#: ../shell/e-shell-window-commands.c:425
 msgid "translator-credits"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:439
+#: ../shell/e-shell-window-commands.c:439
 msgid "Groupware Suite"
 msgstr "Gruppevareløsning"
 
-#: shell/e-shell-window-commands.c:680
+#: ../shell/e-shell-window-commands.c:680
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: shell/e-shell-window-commands.c:693 ui/evolution.xml.h:51
+#: ../shell/e-shell-window-commands.c:693 ../ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: shell/e-shell-window-commands.c:706 ui/evolution.xml.h:34
+#: ../shell/e-shell-window-commands.c:706 ../ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Ny"
 
-#: shell/evolution-startup-wizard.glade.h:2
+#: ../shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Konfigurasjonsassistent for Evolution"
 
-#: shell/evolution-startup-wizard.glade.h:3
+#: ../shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importerer filer"
 
-#: shell/evolution-startup-wizard.glade.h:4
+#: ../shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Tidssone "
 
-#: shell/evolution-startup-wizard.glade.h:5
+#: ../shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: shell/evolution-startup-wizard.glade.h:6
+#: ../shell/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Velkommen til Evolution. De neste skjermene lar deg konfigurere Evolution til å koble til dine e-post kontoer, og importere filer fra andre applikasjoner. \n"
+"Velkommen til Evolution. De neste skjermene lar deg konfigurere Evolution "
+"til å koble til dine e-post kontoer, og importere filer fra andre "
+"applikasjoner. \n"
 "\n"
 "Vennligst klikk «Fremover» for å fortsette. "
 
-#: shell/evolution-startup-wizard.glade.h:9
+#: ../shell/evolution-startup-wizard.glade.h:9
 msgid ""
 "You have successfully entered all of the information needed to set up "
 "Evolution. \n"
 "\n"
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
-"Du har fullført inntasting av all informasjon som trengs for å konfigurere Evolution.\n"
+"Du har fullført inntasting av all informasjon som trengs for å konfigurere "
+"Evolution.\n"
 "\n"
 "Klikk på «Bruk» for å lagre dine innstillinger. "
 
-#: shell/evolution-test-component.c:140
+#: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Ny test"
 
-#: shell/evolution-test-component.c:141
+#: ../shell/evolution-test-component.c:141
 msgid "_Test"
 msgstr "_Test"
 
-#: shell/evolution-test-component.c:142
+#: ../shell/evolution-test-component.c:142
 msgid "Create a new test item"
 msgstr "Opprett en ny testoppføring"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution skall"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Testkomponent for Evolution"
 
-#: shell/importer/import.glade.h:1
+#: ../shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klikk på «Importer» for å starte import av filen til Evolution."
 
-#: shell/importer/import.glade.h:2
+#: ../shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Importeringsassistent for Evolution"
 
-#: shell/importer/import.glade.h:3
+#: ../shell/importer/import.glade.h:3
 msgid "Import File"
 msgstr "Importer fil"
 
-#: shell/importer/import.glade.h:4
+#: ../shell/importer/import.glade.h:4
 msgid "Import Location"
 msgstr "Importer lokasjon"
 
-#: shell/importer/import.glade.h:5
+#: ../shell/importer/import.glade.h:5
 msgid "Importer Type"
 msgstr "Type import"
 
-#: shell/importer/import.glade.h:6
+#: ../shell/importer/import.glade.h:6
 msgid "Select Importers"
 msgstr "Velg importprogram"
 
-#: shell/importer/import.glade.h:7
+#: ../shell/importer/import.glade.h:7
 msgid "Select a File"
 msgstr "Velg en fil"
 
-#: shell/importer/import.glade.h:8
+#: ../shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -14873,28 +15064,28 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av\n"
 "eksterne filer til Evolution."
 
-#: shell/importer/intelligent.c:193
+#: ../shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importerere"
 
-#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
+#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importer"
 
-#: shell/importer/intelligent.c:199
+#: ../shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Ikke importer"
 
-#: shell/importer/intelligent.c:203
+#: ../shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Ikke spør meg igjen"
 
-#: shell/importer/intelligent.c:211
+#: ../shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:237
+#: ../shell/main.c:237
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14929,7 +15120,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: shell/main.c:261
+#: ../shell/main.c:261
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -14937,43 +15128,43 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: shell/main.c:268
+#: ../shell/main.c:268
 msgid "Don't tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: shell/main.c:473
+#: ../shell/main.c:473
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: shell/main.c:475
+#: ../shell/main.c:475
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: shell/main.c:477
+#: ../shell/main.c:477
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: shell/main.c:480
+#: ../shell/main.c:480
 msgid "Forcibly shut down all Evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: shell/main.c:484
+#: ../shell/main.c:484
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvungen ommigrering fra Evolution 1.4"
 
-#: shell/main.c:487
+#: ../shell/main.c:487
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:490
+#: ../shell/main.c:490
 msgid "Disable the mono plugin environment."
-msgstr ""
+msgstr "Deaktiver mono-tilleggsmiljø."
 
-#: shell/main.c:493
+#: ../shell/main.c:493
 msgid "Disable loading of any plugins."
-msgstr ""
+msgstr "Slå av lasting av tillegg."
 
-#: shell/main.c:524
+#: ../shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14983,12 +15174,12 @@ msgstr ""
 "  Bruk %s --help for mer informasjon.\n"
 
 #. shell:upgrade-nospace primary
-#: shell/shell-errors.xml.h:2
+#: ../shell/shell-errors.xml.h:2
 msgid "Insufficient disk space for upgrade."
 msgstr "Ikke nok diskplass for oppgraderingen."
 
 #. shell:upgrade-nospace secondary
-#: shell/shell-errors.xml.h:4
+#: ../shell/shell-errors.xml.h:4
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
 "you only have {1} available.\n"
@@ -15002,7 +15193,7 @@ msgstr ""
 "Du må gjøre mer plass tilgjengelig i din hjemmekatalog før du kan fortsette."
 
 #. shell:upgrade-failed primary
-#: shell/shell-errors.xml.h:8
+#: ../shell/shell-errors.xml.h:8
 msgid ""
 "Upgrade from previous version failed:\n"
 "{0}"
@@ -15011,7 +15202,7 @@ msgstr ""
 "{0}"
 
 #. shell:upgrade-failed secondary
-#: shell/shell-errors.xml.h:11
+#: ../shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
 "\n"
@@ -15023,18 +15214,18 @@ msgstr ""
 "Hvis du velger å fortsette vil du kanskje ikke få tilgang til alle dine "
 "gamle data.\n"
 
-#: shell/shell-errors.xml.h:15
+#: ../shell/shell-errors.xml.h:15
 msgid "Continue"
 msgstr "Fortsett"
 
 #. shell:upgrade-remove-1-4 title
 #. shell:upgrade-remove-1-4 primary
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
+#: ../shell/shell-errors.xml.h:17 ../shell/shell-errors.xml.h:19
 msgid "Delete old data from version {0}?"
 msgstr "Slett gamle data fra versjon {0}?"
 
 #. shell:upgrade-remove-1-4 secondary
-#: shell/shell-errors.xml.h:21
+#: ../shell/shell-errors.xml.h:21
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
@@ -15044,22 +15235,22 @@ msgid ""
 "convenience.\n"
 msgstr ""
 
-#: shell/shell-errors.xml.h:25
+#: ../shell/shell-errors.xml.h:25
 msgid "_Remind Me Later"
 msgstr "_Vis påminnelse senere"
 
-#: shell/shell-errors.xml.h:26
+#: ../shell/shell-errors.xml.h:26
 msgid "_Keep Data"
 msgstr "_Behold data"
 
 #. shell:upgrade-remove-1-4-confirm title
 #. shell:upgrade-remove-1-4-confirm primary
-#: shell/shell-errors.xml.h:28 shell/shell-errors.xml.h:30
+#: ../shell/shell-errors.xml.h:28 ../shell/shell-errors.xml.h:30
 msgid "Really delete old data?"
 msgstr "Vil du virkelig slette gamle data?"
 
 #. shell:upgrade-remove-1-4-confirm secondary
-#: shell/shell-errors.xml.h:32
+#: ../shell/shell-errors.xml.h:32
 msgid ""
 "The entire contents of the \"evolution\" directory is about to be be "
 "permanently removed.\n"
@@ -15074,18 +15265,18 @@ msgstr ""
 
 #. shell:noshell title
 #. shell:noshell-reason title
-#: shell/shell-errors.xml.h:39 shell/shell-errors.xml.h:47
+#: ../shell/shell-errors.xml.h:39 ../shell/shell-errors.xml.h:47
 msgid "Cannot start Evolution"
 msgstr "Kan ikke starte Evolution."
 
 #. shell:noshell primary
 #. shell:noshell-reason primary
-#: shell/shell-errors.xml.h:41 shell/shell-errors.xml.h:49
+#: ../shell/shell-errors.xml.h:41 ../shell/shell-errors.xml.h:49
 msgid "Evolution can not start."
 msgstr "Evolution kan ikke starte."
 
 #. shell:noshell secondary
-#: shell/shell-errors.xml.h:43
+#: ../shell/shell-errors.xml.h:43
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -15093,7 +15284,7 @@ msgid ""
 msgstr ""
 
 #. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:51
+#: ../shell/shell-errors.xml.h:51
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -15102,7 +15293,7 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/ca-trust-dialog.c:91
+#: ../smime/gui/ca-trust-dialog.c:91
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -15110,69 +15301,74 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
-#: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
-#: smime/gui/certificate-manager.c:595 smime/gui/certificate-manager.c:603
+#: ../smime/gui/certificate-manager.c:134
+#: ../smime/gui/certificate-manager.c:142
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
 msgid "Select a cert to import..."
 msgstr "Velg et sertifikat som skal importeres..."
 
-#: smime/gui/certificate-manager.c:263 smime/gui/certificate-manager.c:472
-#: smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:263
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
 msgstr "Navn på sertifikat"
 
-#: smime/gui/certificate-manager.c:272 smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:272
+#: ../smime/gui/certificate-manager.c:490
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: smime/gui/certificate-manager.c:281 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:281 ../smime/gui/smime-ui.glade.h:36
+#: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: smime/gui/certificate-manager.c:289
+#: ../smime/gui/certificate-manager.c:289
 msgid "Expires"
 msgstr "Utgår"
 
-#: smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
-#: smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatvisning: %s"
 
-#: smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:145
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
 
-#: smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:149
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
 
-#: smime/gui/component.c:45
+#: ../smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Oppgi passord for «%s»"
 
 #. we're setting the password initially
-#: smime/gui/component.c:68
+#: ../smime/gui/component.c:68
 msgid "Enter new password for certificate database"
 msgstr "Oppgi passordet for «%s»"
 
-#: smime/gui/component.c:70
+#: ../smime/gui/component.c:70
 msgid "Enter new password"
 msgstr "Oppgi nytt passord"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -15181,7 +15377,7 @@ msgstr ""
 "Utstedt til:\n"
 "  Subjekt: %s\n"
 
-#: smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15190,59 +15386,59 @@ msgstr ""
 "Utstedt av:\n"
 "  Subjekt: %s\n"
 
-#: smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Velg sertifikat"
 
-#: smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Ikke en del av sertifikatet>"
 
-#: smime/gui/smime-ui.glade.h:2
+#: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
 msgstr "<b>Sertifikatfelt</b>"
 
-#: smime/gui/smime-ui.glade.h:3
+#: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
 msgstr "<b>Sertifikathierarki</b>"
 
-#: smime/gui/smime-ui.glade.h:4
+#: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
 msgstr "<b>Feltverdi</b>"
 
-#: smime/gui/smime-ui.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
 msgstr "<b>Fingeravtrykk</b>"
 
-#: smime/gui/smime-ui.glade.h:6
+#: ../smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
 msgstr "<b>Utstedt av</b> "
 
-#: smime/gui/smime-ui.glade.h:7
+#: ../smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
 msgstr "<b>Utstedt til</b> "
 
-#: smime/gui/smime-ui.glade.h:8
+#: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
 msgstr "<b>Dette sertifikatet er verifisert for følgende bruk:</b>"
 
-#: smime/gui/smime-ui.glade.h:9
+#: ../smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
 msgstr "<b>Gyldighet</b> "
 
-#: smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "Autoriteter"
 
-#: smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
 msgstr "Sikkerhetskopier"
 
-#: smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
 msgstr "Sikkerhetskopier alle"
 
-#: smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.glade.h:13
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -15250,1748 +15446,1750 @@ msgstr ""
 "Før du stoler på denne CAen for noe formål bør du undersøke sertifikatet og "
 "dets regelsett og prosedyrer (hvis tilgjengelig)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikat"
 
-#: smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
 msgstr "Tillit til sertifikatmyndighet"
 
-#: smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
 msgstr "Detaljer om sertifikat"
 
-#: smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr "Vanlig navn (CN)"
 
-#: smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.glade.h:18
 msgid "Contact Certificates"
 msgstr "Kontaktsertifikater"
 
-#: smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ikke stol på at dette sertifikatet er autentisk"
 
-#: smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Dummyvindu"
 
-#: smime/gui/smime-ui.glade.h:22
+#: ../smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Rediger"
 
-#: smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Email Certificate Trust Settings"
-msgstr "Sertifikatmyndighet for e-post"
+msgstr "Innstillinger for "
 
-#: smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat for e-postmottaker"
 
-#: smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr "Sertifikat for signering av e-post"
 
-#: smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
 msgstr "Utgår"
 
-#: smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr "Utstedt"
 
-#: smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr "MD5-fingeravtrykk"
 
-#: smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.glade.h:31
 msgid "Organization (O)"
 msgstr "Organisasjon (O)"
 
-#: smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.glade.h:32
 msgid "Organizational Unit (OU)"
 msgstr "Organisasjonsenhet (OU)"
 
-#: smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtrykk"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:34 ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-klientsertifikat"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-tjenersertifikat"
 
-#: smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/smime-ui.glade.h:37
 msgid "Trust the authenticity of this certificate"
 msgstr "Stol på at dette sertifikatet er autentisk"
 
-#: smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Stol på denne CAen for å identifisere e-postbrukere."
 
-#: smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Stol på denne CAen for å identifisere programvareutviklere."
 
-#: smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Stol på denne CAen for identifisering av nettsteder."
 
-#: smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Vis"
 
-#: smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.glade.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Du har sertifikater som identifiserer deg fra disse organisasjonene:"
 
-#: smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Du har sertifikater på lager som identifiserer disse sertifikatmyndighetene:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#: smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.glade.h:46
 msgid "_Edit CA Trust"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:48
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
-#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:424
 msgid "Sign"
 msgstr "Signer"
 
-#: smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:425
 msgid "Encrypt"
 msgstr "Krypter"
 
-#: smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versjon"
 
-#: smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versjon 1"
 
-#: smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versjon 2"
 
-#: smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versjon 3"
 
-#: smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:648
+#: ../smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:651
+#: ../smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:654
+#: ../smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:657
+#: ../smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:660
+#: ../smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-kryptering"
 
-#: smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Bruksområde for sertifikatnøkkel"
 
-#: smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape sertifikattype"
 
-#: smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Nøkkelidentifikator for sertifikatmyndighet"
 
-#: smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifikator (%s)"
 
-#: smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algoritmeidentifikator"
 
-#: smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Parametere for algoritme"
 
-#: smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Informasjon om subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritme for subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Feil: Kan ikke prosessere utvidelse"
 
-#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Signeringspart for objekt"
 
-#: smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL-sertifikatmyndighet"
 
-#: smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Sertifikatmyndighet for e-post"
 
-#: smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Signering"
 
-#: smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ingen informasjon"
 
-#: smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Nøkkelchiffer"
 
-#: smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Datachiffer"
 
-#: smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Nøkkelavtale"
 
-#: smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Sertifikatsignerer"
 
-#: smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL-signerer"
 
-#: smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritisk"
 
-#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Ikke-kritisk"
 
-#: smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Utvidelser"
 
-#: smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Signeringsalgoritme for sertifikat"
 
-#: smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Utsteder"
 
-#: smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Unik ID for utsteder"
 
-#: smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Unik ID for subjekt"
 
-#: smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Signaturverdi for sertifikat"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
+#: ../smime/lib/e-cert-db.c:612
 msgid "Certificate already exists"
 msgstr "Sertifikatet eksisterer allerede"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "Passord for PKCS12-fil"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "Enter password for PKCS12 file:"
 msgstr "Oppgi passord for PKCS12-fil:"
 
-#: smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Importert sertifikat"
 
-#: tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "Et vedlegg som skal legges til."
 
-#: tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:325
 msgid "Content type of the attachment."
 msgstr "Innholdstype for vedlegget."
 
-#: tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
 msgstr "Filnavnet som skal vises i meldingen."
 
-#: tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:327
 msgid "Description of the attachment."
 msgstr "Beskrivelse av vedlegget."
 
-#: tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
 msgstr "Merk vedlegg for visning i meldingen som forvalg."
 
-#: tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
 msgstr "Forvalgt emne for meldingen."
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:61
+#: ../tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Kunne ikke kjøre «%s»: %s\n"
 
-#: tools/killev.c:76
+#: ../tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Stenger ned %s (%s)\n"
 
-#: ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopier kontakt(er) til en annen mappe..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Kopier til mappe..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Flytt kontakt(er) til en annen mappe..."
 
-#: ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Forhåndsviser kontaktene som skal skrives ut"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail-message.xml.h:81 ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:81 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Skriv ut valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Lagre valgte kontakter som et VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Velg alle kontakter"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Send en melding til valgte kontakter."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Send melding til kontakt"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Send valgte kontakter til en annen person."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Vis vindu for forhåndsvisning av kontakter"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Stopp innlesing"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-mail-global.xml.h:15 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:19
-#: ui/evolution.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-mail-global.xml.h:15 ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:107 ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution.xml.h:36
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt..."
 
-#: ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Forhåndsvisningsvindu"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "Lagre _som VCard..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "_Velg alle"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Send melding til kontakt..."
 
-#: ui/evolution-calendar.xml.h:4
+#: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:6
+#: ../ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Slett alle hendelser"
 
-#: ui/evolution-calendar.xml.h:7
+#: ../ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Slett avtalen"
 
-#: ui/evolution-calendar.xml.h:8
+#: ../ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Slett denne hendelsen"
 
-#: ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Slett denne hendelsen"
 
-#: ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Gå til"
 
-#: ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Gå tilbake"
 
-#: ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Gå fremover"
 
-#: ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Måned"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Forhåndsviser av kalenderen som skal skrives ut"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:79
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:22
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publiser ledig/opptatt informasjon for denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Fj_ern"
 
-#: ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtaler og møter"
 
-#: ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "Velg _dato"
 
-#: ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Velg en spesifikk dato"
 
-#: ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "Velg i dag"
 
-#: ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Vis denne avtalen"
 
-#: ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Uke"
 
-#: ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
-#: ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Åpne avtale"
 
-#: ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-composer-entries.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ui/evolution-composer-entries.xml.h:3
+#: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
 msgstr "Klipp ut valgt tekst til utklippstavlen"
 
-#: ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:4
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst fra utklippstavlen"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
-#: ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Velg _alle"
 
-#: ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Tilpass Min Evolution"
 
-#: ui/evolution-mail-global.xml.h:2
+#: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ui/evolution-mail-global.xml.h:3
+#: ../ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ui/evolution-mail-global.xml.h:4
+#: ../ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Opprett eller rediger definisjoner av virtuelle mapper"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Tø_m søppelkurven"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:7
 msgid "Open a window for composing a mail message"
 msgstr "Åpne et vindu for å skrive en e-post melding"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
 msgstr "Legg ut n_y melding"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Post a message to a Public folder"
 msgstr "Legg ut en melding til en ny offentlig mappe"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "S_ubscribe to Folders..."
 msgstr "_Abonnerer på mapper..."
 
-#: ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Show message preview window"
 msgstr "Vis vindu for forhåndsvisning av melding"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering av virtuelle mapper..."
 
-#: ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-list.xml.h:1
+#: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:2 ../ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopier valgt(e) melding(er) til utklippstavlen"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Klipp ut valgt(e) melding(er) til utklippstavlen"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ../ui/evolution-mail-list.xml.h:4
 msgid "E_xpunge"
 msgstr "T_øm"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Skjul valgt_e meldinger"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Skjul slette_de meldinger"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Skjul leste meldinge_r"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Skjul slettede meldinger heller enn å vise dem gjennomstreket"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
 msgstr "Me_rk alle som lest"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Merk alle synlige meldinger som lest"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Lim inn melding(er) fra utklippstavlen"
 
-#: ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Velg _tråd"
 
-#: ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Velg alle og bare meldinger som ikke allerede er valgt"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Velg alle meldinger i samme tråd som den valgte meldingen"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "_Vis skjulte meldinger"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Vis meldinger som er midlertidig skjult"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Skjul alle leste meldinger midlertidig"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Skjul valgte meldinger midlertidig"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "_Folder"
 msgstr "M_appe"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Reverser utvalg"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "Meldingsliste med _tråder"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Lukk"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:41 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution.xml.h:37
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:39
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:39
 msgid "_File"
 msgstr "_Fil"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr "_Påfør filtre"
 
-#: ui/evolution-mail-message.xml.h:3
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "Legg til avsender i adressebok"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Caret _Mode"
 msgstr "Markør_modus"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:8
 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:11
+#: ../ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr "Lag _virtuell mappe fra melding"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:16
 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:17
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr "Lag en virtuell mappe for disse mottakerene"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr "Lag en virtuell mappe for denne e-postlisten"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr "Lag en virtuell mappe for denne avsenderen"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr "Lag en virtuell mappe for dette emnet"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Vis neste uleste tråd"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "F_orward As..."
 msgstr "V_ideresend som..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter _Junk"
 msgstr "Filtrer s_øppel"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer på e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filtrer på se_nder..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filtrer på mottake_re..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filtrer på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter søppelstatus"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Merk valgt(e) melding(er) for oppfølging"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Følg _opp..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Last b_ilder"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Merk som _viktig"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Merk som _ulest"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Merk som uv_iktig"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Merk valgt(e) melding(er) som lest"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Merk valgt(e) melding(er) som viktige"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr "Merk valgt(e) melding(er) som søppel"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Merk valgt(e) melding(er) som ikke søppel"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Merk valgt(e) melding(er) som ulest"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Merk valgt(e) melding(er) som uviktige"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Flytt valgt(e) melding(er) til en annen mappe"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr "Ikke søppel"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Åpne valgt melding i et nytt vindu"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer for editing"
 msgstr "Åpne valgt melding for redigering"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Opprinnelig st_ørrelse"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr "Legg ut et s_var"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post et svar på en melding i en offentlig mappe"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "Søk i m_elding..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "_Mindre"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Lagre meldingen som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Sett opp sideinnstillinger for din skriver"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Vis fulle _headere"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:97
 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:98
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Vis melding i normal stil"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Vis melding med fulle e-post headere"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:100
 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:101
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Tekstst_ørrelse"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Angre slett av den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder på e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "VFolder for se_nder..."
 
-#: ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "VFolder for mottake_re..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "VFolder på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "Vedl_agt"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Åpne melding"
 
-#: ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:129 ../ui/evolution.xml.h:48
 msgid "_Tools"
 msgstr "Ve_rktøy"
 
-#: ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ui/evolution-message-composer.xml.h:2
+#: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Slett alt unntatt signatur"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Krypter denne meldingen med PGP"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krypter denne meldingen med ditt S/MIME krypteringssertifikat"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:9
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Åpne en fil"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Krypter med PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Signer med PGP"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Krypter med S/MIME"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Signer med S/MIME"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Lagre som"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "L_agre utkast"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Lagre i mappe..."
 
-#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Send meldingen i HTML-format"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Vis/skjul vedlegg"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Vis _vedlegg"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Vis vedlegg"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldingen med din PGP-nøkkel"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer denne meldingen med ditt S/MIME signatursertifikat"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå av/på visning av BCC-feltet"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå av/på visning av CC-feltet"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Slå av/på visning av Fra-feltet"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Slå av/på visning av Post-til feltet"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the To field is displayed"
 msgstr "Slå av/på visning av Til-feltet"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
-#: ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "_Delete all"
 msgstr "_Slett alle"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:47
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Post-To Field"
 msgstr "_Post-til-felt"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:52
 msgid "_To Field"
 msgstr "_Til-felt"
 
-#: ui/evolution-signature-editor.xml.h:1
+#: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "L_ukk"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
 msgstr "Lagre og l_ukk"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Lagre aktiv fil og lukk vinduet"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ../ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Legg til mappe på listen over abonnerte mapper"
 
-#: ui/evolution-subscribe.xml.h:2
+#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "M_appe"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Les listen på nytt"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ../ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Les mappelisten på nytt"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ../ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Fjern mappe fra din liste over abonnerte mapper"
 
-#: ui/evolution-subscribe.xml.h:7
+#: ../ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ../ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
-#: ui/evolution-tasks.xml.h:3
+#: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopier valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:5
+#: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:7
+#: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Slett fullførte oppgaver"
 
-#: ui/evolution-tasks.xml.h:8
+#: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
-#: ui/evolution-tasks.xml.h:9
+#: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Mer_k som fullført"
 
-#: ui/evolution-tasks.xml.h:10
+#: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Merk valgte oppgaver som fullført"
 
-#: ui/evolution-tasks.xml.h:12
+#: ../ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgave fra utklippstavlen"
 
-#: ui/evolution-tasks.xml.h:13
+#: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Forhåndsviser listen over oppgaver som skal skrives ut"
 
-#: ui/evolution-tasks.xml.h:16
+#: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Skriv ut denne listen over oppgaver"
 
-#: ui/evolution-tasks.xml.h:18
+#: ../ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Vis valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Åpne oppgave"
 
-#: ui/evolution.xml.h:1
+#: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Om Evolution..."
 
-#: ui/evolution.xml.h:2
+#: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Endre innstillinger for Evolution"
 
-#: ui/evolution.xml.h:3
+#: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
 msgstr "Endre synlighet for verktøylinjen"
 
-#: ui/evolution.xml.h:6
+#: ../ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Opprett et nytt vindu som viser denne mappen"
 
-#: ui/evolution.xml.h:7
+#: ../ui/evolution.xml.h:7
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons and text"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ../ui/evolution.xml.h:9
 msgid "Display window buttons with icons only"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ../ui/evolution.xml.h:10
 msgid "Display window buttons with text only"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:11
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:12
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:13
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Glem passor_d"
 
-#: ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:15
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Glem alle passord slik at du vil bli spurt om å oppgi dem igjen"
 
-#: ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:16
 msgid "Hide window buttons"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:17
 msgid "Icons _and text"
 msgstr "Ikoner _og tekst"
 
-#: ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:20
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:21
 msgid "Pi_lot Settings..."
 msgstr "Innstillinger for pi_lot..."
 
-#: ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "_Brukervalg"
 
-#: ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr "Send kølagte oppføringer og hent nye oppføringer"
 
-#: ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:25
 msgid "Set up Pilot configuration"
 msgstr "Konfigurer Pilot"
 
-#: ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbeidsmodus."
 
-#: ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:31
 msgid "Tool_bar"
 msgstr "_Verktøylinje"
 
-#: ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar style"
 msgstr "S_til for verktøylinje"
 
-#: ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:33
 msgid "Window B_uttons"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:41
 msgid "_Hide buttons"
 msgstr ""
 
-#: ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:42
 msgid "_Icons only"
 msgstr "Kun _ikoner"
 
-#: ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:43
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:45
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:46
 msgid "_Send / Receive"
 msgstr "_Send / motta"
 
-#: ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr "Kun _tekst"
 
-#: ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:50
 msgid "_Window"
 msgstr "_Vindu"
 
-#: views/addressbook/galview.xml.h:1
+#: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Etter _firma"
 
-#: views/addressbook/galview.xml.h:2
+#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "_Adressekort"
 
-#: views/addressbook/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
 msgid "_Phone List"
 msgstr "_Telefonliste"
 
-#: views/calendar/galview.xml.h:1
+#: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
 msgstr "Uk_evisning"
 
-#: views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
 msgstr "_Dagvisning"
 
-#: views/calendar/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "_Listevisning"
 
-#: views/calendar/galview.xml.h:4
+#: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Månedsvisning"
 
-#: views/calendar/galview.xml.h:5
+#: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Ar_beidsukevisning"
 
-#: views/mail/galview.xml.h:1
+#: ../views/mail/galview.xml.h:1
 msgid "As _Sent Folder"
 msgstr "Som _Sendt-mappe"
 
-#: views/mail/galview.xml.h:2
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Etter s_tatus"
 
-#: views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Etter avse_nder"
 
-#: views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Etter _emne"
 
-#: views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Etter opp_følgingsflagg"
 
-#: views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Meldinger"
 
-#: views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "Med ferdig-dato"
 
-#: views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
 msgstr "Med _status"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr "UTC"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Tidssoner</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Utvalg</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Velg en tidssone"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-#, fuzzy
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
-msgstr "Tidssone "
+msgstr "Komboboks for tidssone"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -17001,357 +17199,547 @@ msgstr ""
 "tidssone.\n"
 "Bru høyre musknapp til å zoome ut."
 
-#: widgets/menus/gal-view-menus.c:292
+#: ../widgets/menus/gal-view-menus.c:292
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
-#: widgets/menus/gal-view-menus.c:360
+#: ../widgets/menus/gal-view-menus.c:360
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning..."
 
-#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
-#, fuzzy
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous Button"
-msgstr "Forrige"
+msgstr "Forrige knapp"
 
-#: widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Månedskalender"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1123
+#: ../widgets/misc/e-calendar-item.c:1123
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:444
 msgid "Now"
 msgstr "Nå"
 
-#: widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen må skrives inn på formatet: %s"
 
-#: widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "Sentral-europeisk"
 
-#: widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "Gresk"
 
-#: widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "Japansk"
 
-#: widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "Koreansk"
 
-#: widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "Vest-europeisk"
 
-#: widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Western European, New"
 msgstr "Vest-europeisk, ny"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "Tradisjonell"
 
-#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Forenklet"
 
-#: widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr "Synlig"
 
-#: widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:171
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukjent tegnsett: %s"
 
-#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:216
+#: ../widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Tegnkoding"
 
-#: widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
 msgstr "Skriv inn tegnsett som skal brukes"
 
-#: widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "Andre..."
 
-#: widgets/misc/e-clipped-label.c:111
+#: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:313
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:313
 msgid "Date and Time Entry"
-msgstr "Dato & klokkeslett"
+msgstr "Felt for dato & klokkeslett"
 
-#: widgets/misc/e-dateedit.c:332
+#: ../widgets/misc/e-dateedit.c:332
 msgid "Text entry to input date"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:333
+#: ../widgets/misc/e-dateedit.c:333
 msgid "Text Date Entry"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:350
+#: ../widgets/misc/e-dateedit.c:350
 msgid "Click this button to show a calendar"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:351
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:351
 msgid "Date Button"
-msgstr "Dato sendt"
+msgstr "Datoknapp"
 
-#: widgets/misc/e-dateedit.c:371
+#: ../widgets/misc/e-dateedit.c:371
 msgid "Combo box to select time"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:372
+#: ../widgets/misc/e-dateedit.c:372
 msgid "Time Combo Box"
 msgstr ""
 
-#: widgets/misc/e-error.c:84 widgets/misc/e-error.c:85
-#: widgets/misc/e-error.c:127
+#: ../widgets/misc/e-error.c:84 ../widgets/misc/e-error.c:85
+#: ../widgets/misc/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: widgets/misc/e-error.c:86 widgets/misc/e-error.c:87
-#: widgets/misc/e-error.c:125
+#: ../widgets/misc/e-error.c:86 ../widgets/misc/e-error.c:87
+#: ../widgets/misc/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution advarsel"
 
-#: widgets/misc/e-error.c:124
+#: ../widgets/misc/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution informasjon"
 
-#: widgets/misc/e-error.c:126
+#: ../widgets/misc/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution spørring"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:436
+#: ../widgets/misc/e-error.c:438
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr "<span weight=\"bold\">Intern feil, ukjent feil «%s» etterspurt</span>"
 
-#: widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Utvidet"
 
-#: widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Om utvideren er utvidet eller ikke"
 
-#: widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Tekst for utviderens etikett"
 
-#: widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Bruk understreking"
 
-#: widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
 
-#: widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Mellomrom mellom etiketten og barnet"
 
-#: widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Etikettkomponent"
 
-#: widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "En komponent som vises i stedet for den vanlige utvideretiketten"
 
-#: widgets/misc/e-expander.c:222
+#: ../widgets/misc/e-expander.c:222
 msgid "Expander Size"
 msgstr "Størrelse på utvider"
 
-#: widgets/misc/e-expander.c:223
+#: ../widgets/misc/e-expander.c:223
 msgid "Size of the expander arrow"
 msgstr "Størrelse på utviderpilen"
 
-#: widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indikatormellomrom"
 
-#: widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Mellomrom rundt utviderpilen"
 
-#: widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-filter-bar.c:195
 msgid "_Searches"
 msgstr "_Søk"
 
-#: widgets/misc/e-filter-bar.c:197
+#: ../widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr "Redigering av søk"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr "Lagre søk"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Lagre søk..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede søk..."
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_Avansert..."
 
-#: widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Velg et bilde"
 
-#: widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:647
 msgid "World Map"
 msgstr "Verdenskart"
 
-#: widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:649
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
 msgstr ""
 
-#: widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Synkroniser med:"
 
-#: widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
 msgstr "Synkroniser private oppføringer:"
 
-#: widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:120
 msgid "Sync Categories:"
 msgstr "Synkroniser kategorier:"
 
-#: widgets/misc/e-search-bar.c:341
-#, fuzzy
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:343
 msgid "Search Text Entry"
-msgstr "Kun søkebase"
+msgstr "Felt for søketekst"
 
-#: widgets/misc/e-search-bar.c:545
+#: ../widgets/misc/e-search-bar.c:547
 msgid "_Search"
 msgstr "_Søk"
 
-#: widgets/misc/e-search-bar.c:551
+#: ../widgets/misc/e-search-bar.c:553
 msgid "_Find Now"
 msgstr "_Finn nå "
 
-#: widgets/misc/e-search-bar.c:552 widgets/misc/e-search-bar.c:934
+#: ../widgets/misc/e-search-bar.c:554 ../widgets/misc/e-search-bar.c:941
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: widgets/misc/e-search-bar.c:842
+#: ../widgets/misc/e-search-bar.c:645
+msgid "Search Type"
+msgstr "Type søk"
+
+#: ../widgets/misc/e-search-bar.c:849
 msgid "Item ID"
 msgstr "ID for oppføring"
 
-#: widgets/misc/e-search-bar.c:849
+#: ../widgets/misc/e-search-bar.c:856
 msgid "Subitem ID"
 msgstr "ID for underoppføring"
 
-#: widgets/misc/e-search-bar.c:856
+#: ../widgets/misc/e-search-bar.c:863
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:936
+#: ../widgets/misc/e-search-bar.c:943
 msgid "Find _Now"
 msgstr "Finn _nå "
 
+#: ../widgets/misc/e-send-options.c:505
+msgid "When de_leted:"
+msgstr "Når s_lettet:"
+
+#: ../widgets/misc/e-send-options.glade.h:1
+msgid "<b>Delivery Options</b>"
+msgstr "<b>Alternativer for levering</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:2
+msgid "<b>Replies</b>"
+msgstr "<b>Svar</b> "
+
+#: ../widgets/misc/e-send-options.glade.h:3
+msgid "<b>Return Notification</b>"
+msgstr "<b>Returvarsling</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:4
+msgid "<b>Status Tracking</b>"
+msgstr "<b>Statusoppfølging</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:5
+msgid "A_uto-delete sent item"
+msgstr "Slett sendt-oppføring a_utomatisk"
+
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "C_lassification"
+msgstr "K_lassifisering"
+
+#: ../widgets/misc/e-send-options.glade.h:7
+#, fuzzy
+msgid "Creat_e a sent item to track information"
+msgstr "Hent siste informasjon om oppgaven"
+
+#: ../widgets/misc/e-send-options.glade.h:8
+msgid "Deli_vered and opened"
+msgstr "Le_vert og åpnet"
+
+#: ../widgets/misc/e-send-options.glade.h:9
+msgid "Gene_ral Options"
+msgstr "Gene_relle alternativer"
+
+#: ../widgets/misc/e-send-options.glade.h:10
+msgid ""
+"None\n"
+"Mail Receipt"
+msgstr ""
+"Ingen\n"
+"E-postkvittering"
+
+#: ../widgets/misc/e-send-options.glade.h:12
+msgid ""
+"None\n"
+"Mail Receipt\n"
+msgstr ""
+"Ingen\n"
+"E-postkvittering\n"
+
+#: ../widgets/misc/e-send-options.glade.h:15
+msgid ""
+"Public\n"
+"Private\n"
+"Confidential\n"
+msgstr ""
+"Offentlig\n"
+"Privat\n"
+"Konfidensiell\n"
+
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "R_eply requested"
+msgstr "Svar for_espurt"
+
+#: ../widgets/misc/e-send-options.glade.h:21
+msgid "Sta_tus  Tracking"
+msgstr "Sta_tusoppfølging"
+
+#: ../widgets/misc/e-send-options.glade.h:22
+msgid ""
+"Undefined\n"
+"High\n"
+"Standard\n"
+"Low"
+msgstr ""
+"Udefinert\n"
+"Høy\n"
+"Standard\n"
+"Lav"
+
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "W_ithin"
+msgstr "_Innen"
+
+#: ../widgets/misc/e-send-options.glade.h:27
+msgid "When acce_pted: "
+msgstr "Når go_dtatt: "
+
+#: ../widgets/misc/e-send-options.glade.h:28
+msgid "When co_mpleted:"
+msgstr "Når full_ført:"
+
+#: ../widgets/misc/e-send-options.glade.h:29
+msgid "When decli_ned:    "
+msgstr "Når _avslått:"
+
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_After:"
+msgstr "_Etter:"
+
+#: ../widgets/misc/e-send-options.glade.h:31
+msgid "_All information"
+msgstr "_All informasjon"
+
+#: ../widgets/misc/e-send-options.glade.h:32
+#, fuzzy
+msgid "_Delay message delivery"
+msgstr "Behold meldinger på tjeneren"
+
+#: ../widgets/misc/e-send-options.glade.h:33
+msgid "_Delivered"
+msgstr "_Levert"
+
+#: ../widgets/misc/e-send-options.glade.h:35
+msgid "_Set expiration  date"
+msgstr "_Sett utløpsdato"
+
+#: ../widgets/misc/e-send-options.glade.h:36
+msgid "_Until:"
+msgstr "_Inntil:"
+
+#: ../widgets/misc/e-send-options.glade.h:37
+msgid "_When convenient"
+msgstr "_Når det passer"
+
+#: ../widgets/misc/e-send-options.glade.h:38
+msgid "_When opened:     "
+msgstr "_Når den åpnes:"
+
 #. system:ask-save-file-exists-overwrite primary
-#: widgets/misc/e-system-errors.xml.h:4
+#: ../widgets/misc/e-system-errors.xml.h:4
 msgid "File exists \"{0}\"."
 msgstr "Filen eksisterer «{0}»."
 
 #. system:ask-save-file-exists-overwrite secondary
-#: widgets/misc/e-system-errors.xml.h:6
+#: ../widgets/misc/e-system-errors.xml.h:6
 msgid "Do you wish to overwrite it?"
 msgstr "Vil du overskrive den?"
 
 #. system:no-save-file primary
-#: widgets/misc/e-system-errors.xml.h:9
+#: ../widgets/misc/e-system-errors.xml.h:9
 msgid "Cannot save file \"{0}\"."
 msgstr "Kan ikke lagre fil «{0}»."
 
 #. system:no-load-file primary
-#: widgets/misc/e-system-errors.xml.h:13
+#: ../widgets/misc/e-system-errors.xml.h:13
 msgid "Cannot open file \"{0}\"."
 msgstr "Kan ikke åpne filen «{0}»."
 
-#: widgets/misc/e-task-widget.c:208
+#: ../widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:213
+#: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
+#~ msgid "Address:"
+#~ msgstr "Adresse:"
+
+#~ msgid "Calendar:"
+#~ msgstr "Kalender:"
+
+#~ msgid "PO Box:"
+#~ msgstr "Postboks:"
+
+#~ msgid "State/Province:"
+#~ msgstr "Stat/provins:"
+
+#~ msgid "Title:"
+#~ msgstr "Tittel:"
+
+#~ msgid "This contact belongs to these categories:"
+#~ msgstr "Denne kontakten hører til disse kategoriene:"
+
+#~ msgid "Edit Contact Info"
+#~ msgstr "Rediger kontaktinfo"
+
+#~ msgid "Add to Contacts"
+#~ msgstr "Legg til i kontakter"
+
+#~ msgid "Print Setup"
+#~ msgstr "Skriveroppsett"
+
+#~ msgid "_Enable"
+#~ msgstr "_Aktiver"
+
+#~ msgid "Body does not contain"
+#~ msgstr "Kropp inneholder ikke"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Kropp eller emne inneholder"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Emne inneholder ikke"
+
+#~ msgid "Mailing _List"
+#~ msgstr "E-post_liste"
+
+#~ msgid "Ad_d"
+#~ msgstr "Le_gg til"
+
+#~ msgid "Delet_e"
+#~ msgstr "Sl_ett"
+
+#~ msgid "Edi_t"
+#~ msgstr "Red_iger"
+
 #~ msgid "contact's header: "
 #~ msgstr "topptekst for kontakt: "
 
@@ -19158,9 +19546,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Retrieving POP message %d"
 #~ msgstr "Henter POP-melding %d"
 
-#~ msgid "Leave messages on server"
-#~ msgstr "Behold meldinger på tjeneren"
-
 #~ msgid "Delete after %s day(s)"
 #~ msgstr "Slett etter %s dag(er)"
 
@@ -19509,9 +19894,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Close this item"
 #~ msgstr "Lukk denne oppføringen"
 
-#~ msgid "Delete this item"
-#~ msgstr "Slett denne oppføringen"
-
 #~ msgid "Preview the printed item"
 #~ msgstr "Forhåndsvisning av oppføring som skal skrives ut"
 
@@ -19578,9 +19960,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Cancel this task"
 #~ msgstr "Avbryt denne oppgaven"
 
-#~ msgid "Obtain the latest task information"
-#~ msgstr "Hent siste informasjon om oppgaven"
-
 #~ msgid "Re_fresh Task"
 #~ msgstr "O_ppdater oppgave"
 
@@ -19623,9 +20002,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Only locations within starting point"
 #~ msgstr "Kun lokasjoner innenfor startpunktet"
 
-#~ msgid "Search scope:"
-#~ msgstr "Søkeområde:"
-
 #~ msgid "Starting point and locations within it"
 #~ msgstr "Startpunkt og lokasjoner innenfor dette"
 
@@ -20194,9 +20570,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Path to the default contacts folder"
 #~ msgstr "Sti til forvalgt mappe for kontakter"
 
-#~ msgid "Path to the default mail folder"
-#~ msgstr "Sti til forvalgt e-postmappe"
-
 #~ msgid "Path to the default tasks folder"
 #~ msgstr "Sti til forvalgt oppgavemappe"
 
@@ -20579,9 +20952,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Deleting Mail"
 #~ msgstr "Sletter meldinger"
 
-#~ msgid "Filter Options"
-#~ msgstr "Alternativer for filter"
-
 #~ msgid "Labels and Colors"
 #~ msgstr "Etiketter og farger"
 
@@ -20627,9 +20997,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "_Default signature:"
 #~ msgstr "_Forvalgt signatur:"
 
-#~ msgid "_Full name:"
-#~ msgstr "_Fullt navn:"
-
 #~ msgid "_Identity"
 #~ msgstr "_Identitet"
 
diff --git a/po/no.po b/po/no.po
index 8d616135fc..1ec4e01427 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-18 22:10+0100\n"
-"PO-Revision-Date: 2005-01-18 22:56+0100\n"
+"POT-Creation-Date: 2005-01-27 16:43+0100\n"
+"PO-Revision-Date: 2005-01-27 17:10+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -15,144 +15,145 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: a11y/addressbook/ea-addressbook-view.c:94
-#: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:172
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:172
 msgid "evolution addressbook"
 msgstr "evolution adressebok"
 
-#: a11y/addressbook/ea-minicard.c:31
-#: calendar/gui/alarm-notify/alarm-queue.c:863
-#: ui/evolution-message-composer.xml.h:10
+#: ../a11y/addressbook/ea-minicard.c:31
+#: ../calendar/gui/alarm-notify/alarm-queue.c:863
+#: ../ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Åpne"
 
-#: a11y/addressbook/ea-minicard.c:138
+#: ../a11y/addressbook/ea-minicard.c:138
 msgid "Contact List: "
 msgstr "Kontaktliste: "
 
-#: a11y/addressbook/ea-minicard.c:139
+#: ../a11y/addressbook/ea-minicard.c:139
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: a11y/addressbook/ea-minicard.c:165
+#: ../a11y/addressbook/ea-minicard.c:165
 msgid "evolution minicard"
 msgstr "evolution minikort"
 
-#: a11y/addressbook/ea-minicard-view.c:34
-#: addressbook/gui/component/addressbook-component.c:97
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:97
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: a11y/addressbook/ea-minicard-view.c:35
-#: addressbook/gui/component/addressbook-component.c:105
+#: ../a11y/addressbook/ea-minicard-view.c:35
+#: ../addressbook/gui/component/addressbook-component.c:105
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: a11y/addressbook/ea-minicard-view.c:153
+#: ../a11y/addressbook/ea-minicard-view.c:153
 msgid "current addressbook folder "
 msgstr "aktiv adressebokmappe "
 
-#: a11y/addressbook/ea-minicard-view.c:154
+#: ../a11y/addressbook/ea-minicard-view.c:154
 msgid "have "
 msgstr "har "
 
-#: a11y/addressbook/ea-minicard-view.c:154
+#: ../a11y/addressbook/ea-minicard-view.c:154
 msgid "has "
 msgstr "har "
 
-#: a11y/addressbook/ea-minicard-view.c:156
+#: ../a11y/addressbook/ea-minicard-view.c:156
 msgid " cards"
 msgstr " kort"
 
-#: a11y/addressbook/ea-minicard-view.c:156
+#: ../a11y/addressbook/ea-minicard-view.c:156
 msgid " card"
 msgstr " kort"
 
-#: a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "New Appointment"
 msgstr "Ny avtale"
 
-#: a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:307
 msgid "New All Day Event"
 msgstr "Ny avtale som varer hele dagen"
 
-#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1366
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1366
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:309
 msgid "Go to Today"
 msgstr "Gå til i dag"
 
-#: a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:310
 msgid "Go to Date"
 msgstr "Gå til dato"
 
-#: a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "alarm "
 msgstr "varsel "
 
-#: a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "recurrence "
 msgstr "gjeninntreffelse "
 
-#: a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:247
 msgid "time-zone "
 msgstr "tidssone "
 
-#: a11y/calendar/ea-cal-view-event.c:253
+#: ../a11y/calendar/ea-cal-view-event.c:253
 msgid "meeting "
 msgstr "møte"
 
-#: a11y/calendar/ea-cal-view-event.c:258
+#: ../a11y/calendar/ea-cal-view-event.c:258
 msgid "event. Summary is "
 msgstr "hendelse. Sammendraget er "
 
-#: a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "empty"
 msgstr "tomt"
 
-#: a11y/calendar/ea-cal-view-event.c:288
+#: ../a11y/calendar/ea-cal-view-event.c:288
 msgid "calendar view event"
 msgstr "vis kalenderhendelse"
 
-#: a11y/calendar/ea-cal-view-event.c:505
+#: ../a11y/calendar/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "Ta fokus"
 
-#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:147 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid ", %d event"
 msgstr ", %d hendelse"
 
-#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:147 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid ", %d events"
 msgstr ", %d hendelser"
 
-#: a11y/calendar/ea-day-view.c:150
+#: ../a11y/calendar/ea-day-view.c:150
 msgid "work week view :"
 msgstr "arbeidsukevisning:"
 
-#: a11y/calendar/ea-day-view.c:154
+#: ../a11y/calendar/ea-day-view.c:154
 msgid "day view :"
 msgstr "dagvisning:"
 
-#: a11y/calendar/ea-day-view.c:181
+#: ../a11y/calendar/ea-day-view.c:181
 msgid "calendar view for a work week"
 msgstr "kalendervisning for en arbeidsuke"
 
-#: a11y/calendar/ea-day-view.c:183
+#: ../a11y/calendar/ea-day-view.c:183
 msgid "calendar view for one or more days"
 msgstr "kalendervisning for en eller flere dager"
 
-#: a11y/calendar/ea-day-view-main-item.c:299
-#: a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "en tabell som viser og velger aktivt tidsområde"
 
-#: a11y/calendar/ea-gnome-calendar.c:187 calendar/gui/calendar-component.c:520
+#: ../a11y/calendar/ea-gnome-calendar.c:187
+#: ../calendar/gui/calendar-component.c:520
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -162,22 +163,30 @@ msgstr "%A %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:523
-#: calendar/gui/e-day-view.c:1511 calendar/gui/e-day-view-top-item.c:719
-#: calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c:190
+#: ../calendar/gui/calendar-component.c:523 ../calendar/gui/e-day-view.c:1511
+#: ../calendar/gui/e-day-view-top-item.c:719
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:192 a11y/calendar/ea-gnome-calendar.c:197
-#: a11y/calendar/ea-gnome-calendar.c:199 calendar/gui/calendar-component.c:525
-#: calendar/gui/calendar-component.c:530 calendar/gui/calendar-component.c:532
+#: ../a11y/calendar/ea-gnome-calendar.c:192
+#: ../a11y/calendar/ea-gnome-calendar.c:197
+#: ../a11y/calendar/ea-gnome-calendar.c:199
+#: ../calendar/gui/calendar-component.c:525
+#: ../calendar/gui/calendar-component.c:530
+#: ../calendar/gui/calendar-component.c:532
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: a11y/calendar/ea-gnome-calendar.c:216 a11y/calendar/ea-gnome-calendar.c:222
-#: a11y/calendar/ea-gnome-calendar.c:228 a11y/calendar/ea-gnome-calendar.c:230
-#: calendar/gui/calendar-component.c:544 calendar/gui/calendar-component.c:551
-#: calendar/gui/calendar-component.c:557 calendar/gui/calendar-component.c:559
+#: ../a11y/calendar/ea-gnome-calendar.c:216
+#: ../a11y/calendar/ea-gnome-calendar.c:222
+#: ../a11y/calendar/ea-gnome-calendar.c:228
+#: ../a11y/calendar/ea-gnome-calendar.c:230
+#: ../calendar/gui/calendar-component.c:544
+#: ../calendar/gui/calendar-component.c:551
+#: ../calendar/gui/calendar-component.c:557
+#: ../calendar/gui/calendar-component.c:559
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -186,89 +195,104 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:549
-#: calendar/gui/e-day-view.c:1527 calendar/gui/e-day-view-top-item.c:723
-#: calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c:220
+#: ../calendar/gui/calendar-component.c:549 ../calendar/gui/e-day-view.c:1527
+#: ../calendar/gui/e-day-view-top-item.c:723
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
-#: a11y/calendar/ea-gnome-calendar.c:247 a11y/calendar/ea-gnome-calendar.c:255
-#: calendar/importers/icalendar-importer.c:734
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../calendar/importers/icalendar-importer.c:726
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
-#: a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr "søkefelt"
 
-#: a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "søkefelt for Evolution kalender"
 
-#: a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:149
 msgid "Jump button"
 msgstr ""
 
-#: a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:158
 msgid "Click here, you can find more events."
 msgstr "Klikk her for å finne flere hendelser."
 
-#: a11y/calendar/ea-week-view.c:153
+#: ../a11y/calendar/ea-week-view.c:153
 msgid "month view :"
 msgstr "månedsvisning:"
 
-#: a11y/calendar/ea-week-view.c:158
+#: ../a11y/calendar/ea-week-view.c:158
 msgid "week view :"
 msgstr "ukevisning:"
 
-#: a11y/calendar/ea-week-view.c:185
+#: ../a11y/calendar/ea-week-view.c:185
 msgid "calendar view for a month"
 msgstr "kalendervisning for en måned"
 
-#: a11y/calendar/ea-week-view.c:187
+#: ../a11y/calendar/ea-week-view.c:187
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: a11y/widgets/ea-calendar-item.c:293 a11y/widgets/ea-calendar-item.c:299
+#: ../a11y/widgets/ea-calendar-item.c:293
+#: ../a11y/widgets/ea-calendar-item.c:299
 msgid " %d %B %Y"
 msgstr " %d %B %Y"
 
-#: a11y/widgets/ea-calendar-item.c:301
+#: ../a11y/widgets/ea-calendar-item.c:301
 msgid "calendar (from "
 msgstr "kalender (fra "
 
-#: a11y/widgets/ea-calendar-item.c:303
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
+#: ../a11y/widgets/ea-calendar-item.c:303
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
 msgid " to "
 msgstr " til "
 
-#: a11y/widgets/ea-calendar-item.c:305
+#: ../a11y/widgets/ea-calendar-item.c:305
 msgid ")"
 msgstr ")"
 
-#: a11y/widgets/ea-calendar-item.c:337
+#: ../a11y/widgets/ea-calendar-item.c:337
 msgid "evolution calendar item"
 msgstr "Evolution kalenderoppføring"
 
+#: ../a11y/widgets/ea-combo-button.c:40
+msgid "Combo Button"
+msgstr "Komboknapp"
+
+#: ../a11y/widgets/ea-combo-button.c:50
+msgid "Activate Default"
+msgstr "Bruk forvalg"
+
+#: ../a11y/widgets/ea-combo-button.c:52
+msgid "Popup Menu"
+msgstr "Sprettoppmeny"
+
 #. addressbook:ldap-init primary
-#: addressbook/addressbook-errors.xml.h:2
+#: ../addressbook/addressbook-errors.xml.h:2
 msgid "This addressbook could not be opened."
 msgstr "Denne adresseboken kunne ikke åpnes."
 
 #. addressbook:ldap-init secondary
-#: addressbook/addressbook-errors.xml.h:4
+#: ../addressbook/addressbook-errors.xml.h:4
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 
 #. addressbook:ldap-auth primary
-#: addressbook/addressbook-errors.xml.h:6
+#: ../addressbook/addressbook-errors.xml.h:6
 msgid "Failed to authenticate with LDAP server."
 msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. addressbook:ldap-auth secondary
-#: addressbook/addressbook-errors.xml.h:8
+#: ../addressbook/addressbook-errors.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -276,12 +300,12 @@ msgid ""
 msgstr ""
 
 #. addressbook:ldap-search-base primary
-#: addressbook/addressbook-errors.xml.h:10
+#: ../addressbook/addressbook-errors.xml.h:10
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "Denne adresseboktjeneren har ingen foreslått søkebase."
 
 #. addressbook:ldap-search-base secondary
-#: addressbook/addressbook-errors.xml.h:12
+#: ../addressbook/addressbook-errors.xml.h:12
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -289,37 +313,37 @@ msgid ""
 msgstr ""
 
 #. addressbook:ldap-v3-schema primary
-#: addressbook/addressbook-errors.xml.h:14
+#: ../addressbook/addressbook-errors.xml.h:14
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon."
 
 #. addressbook:ldap-get-schema primary
-#: addressbook/addressbook-errors.xml.h:16
+#: ../addressbook/addressbook-errors.xml.h:16
 msgid "Could not get schema information for LDAP server."
 msgstr "Kunne ikke hente schema-informasjon fra LDAP-tjener."
 
 #. addressbook:ldap-invalid-schema primary
-#: addressbook/addressbook-errors.xml.h:18
+#: ../addressbook/addressbook-errors.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
 
 #. addressbook:remove-addressbook primary
-#: addressbook/addressbook-errors.xml.h:20
+#: ../addressbook/addressbook-errors.xml.h:20
 msgid "Could not remove addressbook."
 msgstr "Kunne ikke fjerne adressebok."
 
 #. addressbook:ask-delete-addressbook primary
-#: addressbook/addressbook-errors.xml.h:22
+#: ../addressbook/addressbook-errors.xml.h:22
 msgid "Delete address book '{0}'?"
 msgstr "Slett adressebok «{0}»?"
 
 #. addressbook:ask-delete-addressbook secondary
-#: addressbook/addressbook-errors.xml.h:24
+#: ../addressbook/addressbook-errors.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "Denne adresseboken vil bli slettet for godt."
 
 #. addressbook:edit-categories primary
-#: addressbook/addressbook-errors.xml.h:26
+#: ../addressbook/addressbook-errors.xml.h:26
 msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
@@ -334,85 +358,85 @@ msgstr "Kategori editor ikke tilgjengelig."
 #. mail:session-message-error-cancel secondary
 #. mail:ask-session-password secondary
 #. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:28
-#: addressbook/addressbook-errors.xml.h:36
-#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:70
-#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
-#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
-#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
-#: mail/mail-errors.xml.h:88
+#: ../addressbook/addressbook-errors.xml.h:28
+#: ../addressbook/addressbook-errors.xml.h:36
+#: ../addressbook/addressbook-errors.xml.h:40 ../mail/mail-errors.xml.h:75
+#: ../mail/mail-errors.xml.h:77 ../mail/mail-errors.xml.h:79
+#: ../mail/mail-errors.xml.h:81 ../mail/mail-errors.xml.h:83
+#: ../mail/mail-errors.xml.h:85 ../mail/mail-errors.xml.h:89
+#: ../mail/mail-errors.xml.h:93
 msgid "{0}"
 msgstr "{0}"
 
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
 #. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:30
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+#: ../addressbook/addressbook-errors.xml.h:30
+#: ../composer/mail-composer-errors.xml.h:4 ../mail/mail-errors.xml.h:97
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:32
+#: ../addressbook/addressbook-errors.xml.h:32
 msgid "Unable to open addressbook"
 msgstr "Kan ikke åpne adressebok"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:34
+#: ../addressbook/addressbook-errors.xml.h:34
 msgid "Error loading addressbook."
 msgstr "Feil under lasting av adressebok."
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:38
+#: ../addressbook/addressbook-errors.xml.h:38
 msgid "Unable to perform search."
 msgstr "Kan ikke utføre søk."
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:42
+#: ../addressbook/addressbook-errors.xml.h:42
 msgid "Would you like to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:44
+#: ../addressbook/addressbook-errors.xml.h:44
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 "Du har gjort endringer for denne kontakten. Vil du lagre disse endringene?"
 
-#: addressbook/addressbook-errors.xml.h:45
+#: ../addressbook/addressbook-errors.xml.h:45
 msgid "_Discard"
 msgstr "_Forkast"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:47
+#: ../addressbook/addressbook-errors.xml.h:47
 msgid "Cannot move contact."
 msgstr "Kan ikke flytte kontakt."
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:49
+#: ../addressbook/addressbook-errors.xml.h:49
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
 #. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:51
+#: ../addressbook/addressbook-errors.xml.h:51
 msgid "Unable to save contact(s)."
 msgstr "Kan ikke lagre kontakt(er)."
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:53
+#: ../addressbook/addressbook-errors.xml.h:53
 msgid "Error saving contacts to {0}: {1}"
 msgstr "Feil under lagring av kontakter til {0}: {1}"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:55
+#: ../addressbook/addressbook-errors.xml.h:55
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution adressebok avsluttet uventet."
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:57
+#: ../addressbook/addressbook-errors.xml.h:57
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
@@ -420,158 +444,161 @@ msgstr ""
 "nytt."
 
 #. addressbook:ask-list-add-exists primary
-#: addressbook/addressbook-errors.xml.h:59
+#: ../addressbook/addressbook-errors.xml.h:59
 msgid "Address '{0}' already exists."
 msgstr "Adressen «{0}» eksisterer allerede."
 
 #. addressbook:ask-list-add-exists secondary
-#: addressbook/addressbook-errors.xml.h:61
+#: ../addressbook/addressbook-errors.xml.h:61
 msgid ""
 "A contact already exists with this address.  Would you like to add a new "
 "card with the same address anyway?"
-msgstr "En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny kontakt med samme adresse likevel?"
+msgstr ""
+"En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny "
+"kontakt med samme adresse likevel?"
 
-#: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494
-#: plugins/shared-folder/properties.glade.h:17
+#: ../addressbook/addressbook-errors.xml.h:62 ../mail/em-vfolder-rule.c:494
+#: ../plugins/shared-folder/properties.glade.h:10
 msgid "_Add"
 msgstr "_Legg til"
 
-#: addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Forvalgt synkroniseringsadresse:"
 
-#: addressbook/conduit/address-conduit.c:1183
-#: addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1183
+#: ../addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "Kunne ikke laste adressebok"
 
-#: addressbook/conduit/address-conduit.c:1252
-#: addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1252
+#: ../addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: addressbook/gui/component/addressbook.c:98
+#: ../addressbook/gui/component/addressbook.c:98
 msgid "Accessing LDAP Server anonymously"
 msgstr "Aksesserer LDAP-tjener anonymt"
 
-#: addressbook/gui/component/addressbook.c:185
-#: plugins/groupwise-account-setup/camel-gw-listener.c:476
+#: ../addressbook/gui/component/addressbook.c:185
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:476
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
-#: addressbook/gui/component/addressbook.c:192
-#: plugins/groupwise-account-setup/camel-gw-listener.c:460
+#: ../addressbook/gui/component/addressbook.c:192
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:460
+#: ../plugins/send-options/send-options.c:82
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
 
-#: addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-component.c:98
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:99
+#: ../addressbook/gui/component/addressbook-component.c:99
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:106
+#: ../addressbook/gui/component/addressbook-component.c:106
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-component.c:107
+#: ../addressbook/gui/component/addressbook-component.c:107
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:113
-#: addressbook/gui/component/addressbook-config.c:1116
-#: addressbook/gui/component/addressbook-view.c:757
+#: ../addressbook/gui/component/addressbook-component.c:113
+#: ../addressbook/gui/component/addressbook-config.c:1115
+#: ../addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook-component.c:114
+#: ../addressbook/gui/component/addressbook-component.c:114
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: addressbook/gui/component/addressbook-component.c:115
+#: ../addressbook/gui/component/addressbook-component.c:115
 msgid "Create a new address book"
 msgstr "Opprett en ny adressebok"
 
-#: addressbook/gui/component/addressbook-component.c:188
+#: ../addressbook/gui/component/addressbook-component.c:188
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for adressebok."
 
-#: addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:315
 msgid "Base"
-msgstr ""
+msgstr "Basis"
 
-#: addressbook/gui/component/addressbook-config.c:510
-#: calendar/gui/dialogs/calendar-setup.c:191
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../addressbook/gui/component/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:191
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type:"
 
-#: addressbook/gui/component/addressbook-config.c:609
+#: ../addressbook/gui/component/addressbook-config.c:609
 msgid "Copy book content locally for offline operation"
 msgstr "Kopier innholdet i adresseboken lokalt for frakoblet operasjon"
 
-#: addressbook/gui/component/addressbook-config.c:904
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/calendar-setup.c:361
-#: calendar/gui/dialogs/calendar-setup.c:372
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: mail/em-folder-properties.c:213 mail/mail-config.glade.h:85
-#: smime/gui/smime-ui.glade.h:27
+#: ../addressbook/gui/component/addressbook-config.c:904
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:361
+#: ../calendar/gui/dialogs/calendar-setup.c:372
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../mail/em-folder-properties.c:214 ../mail/mail-config.glade.h:85
+#: ../smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/addressbook-config.c:905
-#: mail/importers/pine-importer.c:479
+#: ../addressbook/gui/component/addressbook-config.c:905
+#: ../mail/importers/pine-importer.c:479
 msgid "Addressbook"
 msgstr "Adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Server Information"
 msgstr "Tjenerinformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:911
+#: ../addressbook/gui/component/addressbook-config.c:911
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: addressbook/gui/component/addressbook-config.c:914
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:12 smime/gui/smime-ui.glade.h:19
+#: ../addressbook/gui/component/addressbook-config.c:914
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../mail/mail-dialogs.glade.h:12 ../smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljer"
 
-#: addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Searching"
 msgstr "Søker"
 
-#: addressbook/gui/component/addressbook-config.c:917
+#: ../addressbook/gui/component/addressbook-config.c:917
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: addressbook/gui/component/addressbook-config.c:1114
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1113
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
-#: addressbook/gui/component/addressbook-migrate.c:72
-#: calendar/gui/migration.c:142 mail/em-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:72
+#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Migrerer..."
 
-#: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:189 mail/em-migrate.c:1201
+#: ../addressbook/gui/component/addressbook-migrate.c:124
+#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
 
 #. create the local source group
 #. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/migration.c:452 calendar/gui/migration.c:545
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-component.c:270 mail/mail-vfolder.c:218
+#: ../addressbook/gui/component/addressbook-migrate.c:493
+#: ../calendar/gui/migration.c:452 ../calendar/gui/migration.c:545
+#: ../mail/em-folder-tree-model.c:196 ../mail/em-folder-tree-model.c:198
+#: ../mail/mail-component.c:270 ../mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
@@ -579,28 +606,28 @@ msgstr "På denne datamaskinen"
 #. Create the default Person calendar
 #. Create the default Person task list
 #. orange
-#: addressbook/gui/component/addressbook-migrate.c:501
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: calendar/gui/migration.c:460 calendar/gui/migration.c:553
-#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:77
-#: mail/mail-config.glade.h:102
+#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/migration.c:460 ../calendar/gui/migration.c:553
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1013
+#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:102
 msgid "Personal"
 msgstr "Personlig"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:509
+#: ../addressbook/gui/component/addressbook-migrate.c:509
 msgid "On LDAP Servers"
 msgstr "På LDAP-tjenere"
 
-#: addressbook/gui/component/addressbook-migrate.c:637
+#: ../addressbook/gui/component/addressbook-migrate.c:637
 msgid "LDAP Servers"
 msgstr "LDAP-tjenere"
 
-#: addressbook/gui/component/addressbook-migrate.c:752
+#: ../addressbook/gui/component/addressbook-migrate.c:752
 msgid "Autocompletion Settings"
 msgstr "Innstillinger for autofullføring"
 
-#: addressbook/gui/component/addressbook-migrate.c:1123
+#: ../addressbook/gui/component/addressbook-migrate.c:1123
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -612,7 +639,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -622,7 +649,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1146
+#: ../addressbook/gui/component/addressbook-migrate.c:1146
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -632,7 +659,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1156
+#: ../addressbook/gui/component/addressbook-migrate.c:1156
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -642,245 +669,250 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-view.c:758
-#: addressbook/gui/widgets/e-addressbook-view.c:934
-#: calendar/gui/calendar-component.c:386 calendar/gui/tasks-component.c:330
-#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
+#: ../addressbook/gui/component/addressbook-view.c:758
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/calendar-component.c:386
+#: ../calendar/gui/tasks-component.c:330 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:24 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-view.c:760
-#: calendar/gui/calendar-component.c:387 calendar/gui/tasks-component.c:331
+#: ../addressbook/gui/component/addressbook-view.c:760
+#: ../calendar/gui/calendar-component.c:387
+#: ../calendar/gui/tasks-component.c:331
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
 #. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1119
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: calendar/gui/migration.c:378
+#: ../addressbook/gui/component/addressbook-view.c:1119
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../calendar/gui/migration.c:378
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-view.c:1130
+#: ../addressbook/gui/component/addressbook-view.c:1130
 msgid "Contact Source Selector"
 msgstr "Valg av kontaktkilde"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList XML for listen med URIer for fullføring"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML for listen med URIer for fullføring"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "Position of the vertical pane in main view"
 msgstr "Plassering av vertikalt felt i hovedvisningen"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "Position of the vertical pane in main view."
 msgstr "Plassering av vertikalt felt i hovedvisningen."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
-#: mail/evolution-mail.schemas.in.in.h:71
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Vis forhåndsvisningsvinduet"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-#: mail/evolution-mail.schemas.in.in.h:72
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Vis forhåndsvisningsvinduet."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete"
 msgstr ""
 "Antall tegn som må skrives før Evolution forsøker automatisk fullføring"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr "Antall tegn som må skrives før Evolution forsøker automatisk fullføring."
+msgstr ""
+"Antall tegn som må skrives før Evolution forsøker automatisk fullføring."
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for sist brukt mappe i dialogen for å velge navn"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for sist brukt mappe i dialogen for å velge navn."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
 msgstr "Autofullføring"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "K_ontakter"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "Sertifikater"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "Konfigurer automatisk fullføring her"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook"
 msgstr "Evolution adressebok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Evolution adressebok adressedialog"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address viewer"
 msgstr "Evolution adressebok adressevisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook card viewer"
 msgstr "Evolution adressebok kortvisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook component"
 msgstr "Evolution adressebok-komponent"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Kontroll for S/MIME sertifikathåndtering for Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
 msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
 msgstr "Håndter dine S/MIME-sertifikater her"
 
-#: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fullname.glade.h:1
-#: addressbook/gui/contact-editor/im.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-dialog.glade.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/dialogs/new-calendar.glade.h:1
-#: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
-#: plugins/shared-folder/properties.glade.h:3
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/mail-config.glade.h:3 ../mail/mail-dialogs.glade.h:6
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/shared-folder/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentisering</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Visning</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Laster ned</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Søker</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Tjenerinformasjon</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Address Book"
 msgstr "Legg til adressebok"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
-#: mail/em-account-editor.c:292
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../mail/em-account-editor.c:292
 msgid "Always"
 msgstr "Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid "Email address"
 msgstr "E-postadresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution vil bruke denne e-post adressen til å autentisere deg mot tjeneren."
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
 msgstr "Finn mulige søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "Lo_gin"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-#: mail/em-account-editor.c:290
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:290
 msgid "Never"
 msgstr "Aldri"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid "Search _base:"
 msgstr "Søke_base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
@@ -888,7 +920,7 @@ msgstr ""
 "Hvis du velger dette alternativet vil Evolution kun koble til din LDAP-"
 "tjener hvis denne støtter SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a insecure environment. For example, if you and your LDAP server "
@@ -900,7 +932,7 @@ msgstr ""
 "plassert bak en brannvegg vil ikke Evolution behøve å bruke SSL/TLS fordi "
 "tilkoblingen allerede er sikker."
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This means that your connection will be insecure, and that you will be "
@@ -910,15 +942,15 @@ msgstr ""
 "eller TLS. Dette betyr at din tilkobling vil være usikker, og at du vil være "
 "sårbar for sikkerhetshull. "
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid "Supported Search Bases"
 msgstr "Støttede søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "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 "
@@ -927,7 +959,7 @@ msgstr ""
 "Søkebasen er det distingverte navnet (DN) for oppføringen der dine søk vil "
 "starte. Hvis du lar denne stå tom vil søk starte ved roten av katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -939,14 +971,14 @@ msgstr ""
 "søkebase. Et søkeområde som «one» vil kun ta med oppføringer ett nivå under "
 "basen."
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Dette er fullt navn på din LDAP-tjener. For eksempel «ldap.mittfirma.no»."
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -954,14 +986,16 @@ msgstr ""
 "Dette er maksimalt antall oppføringer som skal lastes ned. Hvis du setter "
 "dette tallet for høyt vil adresseboken bli treg."
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
-msgstr "Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du setter denne til «E-post-adresse» kreves anonym tilgang til din LDAP-tjener."
+msgstr ""
+"Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
+"setter denne til «E-post-adresse» kreves anonym tilgang til din LDAP-tjener."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -969,7 +1003,7 @@ msgstr ""
 "Dette er navnet på denne tjeneren som vises i mappelisten i Evolution. Det "
 "brukes kun for visning på skjermen."
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -979,277 +1013,285 @@ msgstr ""
 "liste med standardporter er gitt. Spør din systemadministrator hvilken port "
 "du skal bruke."
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
 msgstr "Bruker distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
-#: mail/em-account-editor.c:291
+#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../mail/em-account-editor.c:291
 msgid "Whenever Possible"
 msgstr "Når mulig"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "_Add Address Book"
 msgstr "Legg til _adressebok"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid "_Find Possible Search Bases"
 msgstr "_Finn mulige søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "_Log in method:"
 msgstr "Metode for på_logging:"
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.c:243
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:161
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../calendar/gui/dialogs/calendar-setup.c:243
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Search scope:"
 msgstr "_Søkeområde:"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Server:"
 msgstr "Tj_ener:"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Timeout:"
 msgstr "_Tidsavbrudd:"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Use secure connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:53
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
-#: calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
-#: mail/em-account-editor.c:1820 plugins/calendar-http/calendar-http.c:263
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1821
+#: ../plugins/calendar-http/calendar-http.c:263
+#: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "minutes"
 msgstr "minutter"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-post</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Home</b>"
 msgstr "<b>Hjem</b> "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Øyeblikksmeldinger</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Job</b>"
 msgstr "<b>Jobb</b> "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Forskjellig</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Annet</b> "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefon</b> "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Nettaddresser</b>"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Arbeid</b> "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:346
 msgid "AIM"
 msgstr "AIM"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address:"
-msgstr "Adresse:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-msgid "Anniversary:"
-msgstr "Bryllupsdag:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "Assistant:"
-msgstr "Assistent:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Birthday:"
-msgstr "Fødselsdag:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "Calendar:"
-msgstr "Kalender:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "City:"
-msgstr "By:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "Company:"
-msgstr "Firma:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:181
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:533
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:531
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "Country:"
-msgstr "Land:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "Department:"
-msgstr "Avdeling:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "Free/Busy:"
-msgstr "Ledig/opptatt:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Home Page:"
-msgstr "Hjemmeside:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Bilde"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Postadresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "Manager:"
-msgstr "Leder:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
 msgstr "_Kallenavn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "Notes:"
-msgstr "Notater:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "Office:"
-msgstr "Kontor:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "PO Box:"
-msgstr "Postboks:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "Profession:"
-msgstr "Yrke:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "Spouse:"
-msgstr "Ektefelle:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
-msgid "State/Province:"
-msgstr "Stat/provins:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Telefon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:41
-msgid "Title:"
-msgstr "Tittel:"
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1012
+#: ../mail/mail-config.c:76 ../mail/mail-config.glade.h:147
+msgid "Work"
+msgstr "Arbeid"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Video Chat:"
-msgstr "Videoprat:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "_Address:"
+msgstr "_Adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-msgid "Wants to receive HTML mail"
-msgstr "Ønsker å motta HTML-formatert e-post"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Anniversary:"
+msgstr "_Bryllupsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
-msgid "Web Log:"
-msgstr "Weblogg:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Assistant:"
+msgstr "_Assistent:"
 
-#. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:76
-#: mail/mail-config.glade.h:147
-msgid "Work"
-msgstr "Arbeid"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Birthday:"
+msgstr "_Fødselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
-msgid "Zip/Postal Code:"
-msgstr "Zip/postnummer:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1575
+msgid "_Calendar:"
+msgstr "_Kalender:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_City:"
+msgstr "_By:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Company:"
+msgstr "F_irma:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Country:"
+msgstr "_Land:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_Department:"
+msgstr "Av_deling:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Lagre under:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Free/Busy:"
+msgstr "_Ledig/opptatt:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "_Home Page:"
+msgstr "_Hjemmeside:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "_Manager:"
+msgstr "_Leder:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+msgid "_Notes:"
+msgstr "_Notater:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+msgid "_Office:"
+msgstr "K_ontor:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_PO Box:"
+msgstr "_Postboks:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+msgid "_Profession:"
+msgstr "_Yrke:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+msgid "_Spouse:"
+msgstr "_Ektefelle:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_State/Province:"
+msgstr "_Stat/Provins:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+msgid "_Title:"
+msgstr "_Tittel:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+msgid "_Video Chat:"
+msgstr "_Videoprat:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+msgid "_Wants to receive HTML mail"
+msgstr "_Ønsker å motta HTML-formatert e-post"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+msgid "_Web Log:"
+msgstr "_Weblogg:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+msgid "_Zip/Postal Code:"
+msgstr "_Zip/postnummer:"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:319
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1257,7 +1299,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "slette disse kontaktene?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1265,1068 +1307,1064 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "slette denne kontakten?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:365
-#: addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Address"
 msgstr "Adresse"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:300
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:182
-#: addressbook/gui/widgets/e-addressbook-model.c:309
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: addressbook/gui/widgets/e-minicard.c:174
-#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:519
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:182
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-minicard.c:174
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view.c:519
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "De forente stater"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "Albania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "Algerie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "Amerikansk Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
 msgstr "Antigua og Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "Argentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "Østerrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "Aserbajdsjan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "Hviterussland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "Belgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia-Hercegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "Bouvetøya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "Brasil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr "Britisk-Indisk havområde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "Kambodsja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "Kapp Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "Caymanøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "Den sentralafrikanske republikk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "Tsjad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "Kina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "Christmasøya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "Colombia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "Komorene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Kongo-Brazaville"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Kongo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "Cookøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "Elfenbenskysten"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "Kuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "Kypros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "Tsjekkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "Danmark"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "Den dominikanske republikk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
 msgstr "Egypt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Ekvatorial-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
 msgstr "Estland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Falklandsøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Færøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
 msgstr "Frankrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Fransk Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Fransk Polynesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Sydlige Franske territorier"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
 msgstr "Tyskland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
 msgstr "Hellas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Grønland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadelope"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
 msgstr "Guinea-bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr "Heard og McDonald-øyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr "Vatikanstaten"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Iran"
 msgstr "Iran"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iraq"
 msgstr "Irak"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "Irland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "Italia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "Japan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Jersey"
 msgstr "Jersey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "Jordan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "Kasakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Sør-Korea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
 msgstr "Sør-Korea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Libya"
 msgstr "Libya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Macao"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "Makedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "Maldivene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "Marshalløyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "Mexico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "Mikronesiaføderasjonen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr "Moldova"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "Marokko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "De nederlandske antillene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "Ny-Caledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "Norfolkøya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "Nord-Marianene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "Norge"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr "Palestinsk område"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "Papua Ny-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "Filippinene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "Polen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "Réunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "Romania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "Russland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts og Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent og Grenadinene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr "São Tomé og Príncipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Serbia And Montenegro"
 msgstr "Serbia og Montenegro"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "Seychellene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "Singapore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "Salomonøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "Sør-Afrika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Sør-Georgia og de sørlige Sandwichøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "Spania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre-et-Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard og Jan Mayen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "Sverige"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Syria"
 msgstr "Syria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "Tadsjikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "Thailand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr "Trinidad og Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "Tyrkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr "Turks- og Caicosøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "De forente arabiske emirater"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr "USA, mindre omliggende øyer"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "Jomfruøyene, Britisk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "Jomfruøyene, USA"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis- og Futuna-øyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "Vest-Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:347
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Source Book"
 msgstr "Kildebok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
 msgid "Target Book"
 msgstr "Målbok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
 msgid "Required Fields"
 msgstr "Obligatoriske felt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Changed"
 msgstr "Endret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2463
-msgid "This contact belongs to these categories:"
-msgstr "Denne kontakten hører til disse kategoriene:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2544
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2545
 msgid "No image"
 msgstr "Uten bilde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2334,245 +2372,232 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2885
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2873
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: plugins/plugin-manager/plugin-manager.c:44
-#: plugins/save-attachments/save-attachments.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../plugins/save-attachments/save-attachments.c:362
 msgid "Name"
 msgstr "Navn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL øyeblikksmeldinger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
 msgid "Service"
 msgstr "Tjeneste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: calendar/gui/e-cal-list-view.etspec.h:3
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Location"
 msgstr "Lokasjon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
 msgid "Username"
 msgstr "Brukernavn"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:156
-msgid "_Full Name:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
+msgid "_Full name:"
 msgstr "_Fullt navn:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
 msgid "E-_mail:"
 msgstr "E-_post:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
 msgstr "_By:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Lan_d:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "Full adresse"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
-msgid "_PO Box:"
-msgstr "_Postboks:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_State/Province:"
-msgstr "_Stat/Provins:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Frk"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Hr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Fru"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Frk."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Fornavn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Etternavn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Mellomnavn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:18
-msgid "_Title:"
-msgstr "_Tittel:"
-
-#: addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
 msgstr "Legg til IM-konto"
 
-#: addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_Account name:"
 msgstr "Konton_avn:"
 
-#: addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
 msgstr "_IM-tjeneste:"
 
-#: addressbook/gui/contact-editor/im.glade.h:5
+#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../plugins/calendar-weather/calendar-weather.c:410
 msgid "_Location:"
 msgstr "_Lokasjon:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
 msgstr "\n"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
 msgstr "Legg til en e-postadresse i listen"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:819
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:819
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email adresses from Adress Book"
 msgstr "Sett inn e-postadresser fra adresseboken"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:709
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
 msgstr "Medlemmer"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Fjern en e-postadresse fra listen"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "Select"
-msgstr "Velg"
-
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skjul adresser når du sender e-post til listen"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Listenavn:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+msgid "_Select"
+msgstr "_Velg"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
-#: addressbook/gui/widgets/e-addressbook-model.c:295
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:377
-#: addressbook/gui/widgets/e-addressbook-view.c:222
-#: addressbook/gui/widgets/e-minicard-view.c:505
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: ../addressbook/gui/widgets/e-addressbook-model.c:296
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-minicard-view.c:505
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bok"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:175
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:175
 msgid "Is New List"
 msgstr "Er ny liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:712
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:709
+msgid "_Members"
+msgstr "_Medlemmer"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:712
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Endret kontakt:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Kontakt i konflikt:"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplisert kontakt funnet"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -2580,15 +2605,15 @@ msgstr ""
 "Den nye e-post adressen eller navnet for denne kontakten\n"
 "eksisterer allerede i denne mappen. Vil du legge til likevel?"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Ny kontakt:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "Opprinnelig kontakt:"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2597,191 +2622,192 @@ msgstr ""
 "i denne mappen. Vil du legge den til likevel?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: widgets/misc/e-filter-bar.c:156
+#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
+#: ../widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: addressbook/gui/widgets/eab-contact-display.c:133
-#: addressbook/gui/widgets/eab-contact-display.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:196
 msgid "(map)"
 msgstr "(kart)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:143
-#: addressbook/gui/widgets/eab-contact-display.c:209
+#: ../addressbook/gui/widgets/eab-contact-display.c:143
+#: ../addressbook/gui/widgets/eab-contact-display.c:209
 msgid "map"
 msgstr "kart"
 
-#: addressbook/gui/widgets/eab-contact-display.c:274
-#: addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:274
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:337
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:361
 msgid "Position"
 msgstr "Stilling"
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Video Conferencing"
 msgstr "Videokonferanse"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
+#: ../addressbook/gui/widgets/eab-contact-display.c:368
 msgid "work"
 msgstr "arbeid"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: ../addressbook/gui/widgets/eab-contact-display.c:375
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:376
-#: addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:376
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Blog"
 msgstr "Weblogg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:379
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:379
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:383
+#: ../addressbook/gui/widgets/eab-contact-display.c:383
 msgid "personal"
 msgstr "personlig"
 
-#: addressbook/gui/widgets/eab-contact-display.c:390
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:560
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home page"
 msgstr "Hjemmeside"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Suksess"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr "Motor opptatt"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Frakoblet lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Address Book does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "No Self Contact defined"
 msgstr "Egen kontaktinformasjon er ikke definert"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr "Kontakt ikke funnet"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID eksisterer allerede"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:232
-#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-cal-model-tasks.c:347
-#: calendar/gui/e-cal-model-tasks.c:660 calendar/gui/print.c:2352
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:232
+#: ../calendar/gui/e-calendar-table.c:458
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660 ../calendar/gui/print.c:2352
 msgid "Cancelled"
 msgstr "Avbrutt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Could not cancel"
 msgstr "Kunne ikke avbryte"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#: calendar/gui/comp-editor-factory.c:431
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgjengelig"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "No such source"
 msgstr "Ingen slik kilde"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Annen feil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: ../addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2789,7 +2815,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien eksisterer og "
 "at du har rettigheter til å aksessere den."
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: ../addressbook/gui/widgets/eab-gui-util.c:105
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2797,7 +2823,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at LDAP-tjeneren ikke kan nås."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -2807,7 +2833,7 @@ msgstr ""
 "ønsker å bruke LDAP i Evolution må du installere en pakke som har denne "
 "støtten."
 
-#: addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2815,7 +2841,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at tjeneren ikke kan nås."
 
-#: addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2823,7 +2849,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2831,45 +2857,45 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bakenden for denne adresseboken forsto ikke denne spørringen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bakenden for denne adresseboken nektet å utføre denne spørringen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:155
 msgid "This query did not complete successfully."
 msgstr "Denne spørringen ble ikke fullført."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
-#: addressbook/gui/widgets/eab-gui-util.c:650
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying contact"
 msgstr "Feil under endring av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:200
-#: addressbook/gui/widgets/eab-gui-util.c:608
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:608
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:282
+#: ../addressbook/gui/widgets/eab-gui-util.c:282
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -2884,7 +2910,7 @@ msgstr[1] ""
 "Åpning av %d kontakter vil medføre at %d nye vinduer vil\n"
 "vises på skjermen. Vil du virkelig vise alle disse kontaktene?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2893,44 +2919,44 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Overwrite"
 msgstr "Overskriv"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:393
+#: ../addressbook/gui/widgets/eab-gui-util.c:393
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:555
+#: ../addressbook/gui/widgets/eab-gui-util.c:555
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: ../addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:709
+#: ../addressbook/gui/widgets/eab-gui-util.c:709
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: ../addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: ../addressbook/gui/widgets/eab-gui-util.c:714
 msgid "Select target addressbook."
 msgstr "Velg mål-adressebok"
 
-#: addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:937
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2940,318 +2966,314 @@ msgstr "VCard for %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:198
+#: ../addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(ingen)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:431
+#: ../addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/gui/widgets/eab-popup-control.c:441
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-popup-control.c:441
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/eab-popup-control.c:451
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/eab-popup-control.c:451
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/gui/widgets/eab-popup-control.c:567
+#: ../addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Velg en handling"
 
-#: addressbook/gui/widgets/eab-popup-control.c:575
+#: ../addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Opprett en ny kontakt «%s»"
 
-#: addressbook/gui/widgets/eab-popup-control.c:591
+#: ../addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Legg til adresse for eksisterende kontakt «%s»"
 
-#: addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Kjører spørring i adressebok..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:952
-msgid "Edit Contact Info"
-msgstr "Rediger kontaktinfo"
-
-#: addressbook/gui/widgets/eab-popup-control.c:982
-msgid "Add to Contacts"
-msgstr "Legg til i kontakter"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1007
+#: ../addressbook/gui/widgets/eab-popup-control.c:970
 msgid "Merge E-Mail Address"
 msgstr "Flett E-postadresse"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
 msgid "and one other contact."
 msgid_plural "and %d other contacts."
 msgstr[0] "og en annen kontakt."
 msgstr[1] "og %d andre kontakter."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:272
+#: ../addressbook/gui/widgets/eab-vcard-control.c:223
+#: ../addressbook/gui/widgets/eab-vcard-control.c:272
 msgid "Show Full VCard"
 msgstr "Vis helt VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:227
+#: ../addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "Vis kompakt VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Ingen kontakter"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:151
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakter"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: addressbook/gui/widgets/e-addressbook-view.c:236
-#: addressbook/gui/widgets/e-minicard-view.c:512
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: ../addressbook/gui/widgets/e-addressbook-model.c:303
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-minicard-view.c:512
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Spør"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:445
+#: ../addressbook/gui/widgets/e-addressbook-model.c:446
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
 msgid "Model"
 msgstr "Modell"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:168
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Navn begynner med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-#: calendar/gui/cal-search-bar.c:53
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: calendar/gui/cal-search-bar.c:48
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-#: addressbook/gui/widgets/e-addressbook-view.c:177
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Kilde"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:243
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:244
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../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:244
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:540
-#: plugins/shared-folder/properties.glade.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.c:541
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:803
-#: addressbook/gui/widgets/e-addressbook-view.c:921
-#: addressbook/gui/widgets/e-addressbook-view.c:1972
-#: ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:804
+#: ../addressbook/gui/widgets/e-addressbook-view.c:922
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1982
+#: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Lagre som VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:917
+#: ../addressbook/gui/widgets/e-addressbook-view.c:918
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:918
+#: ../addressbook/gui/widgets/e-addressbook-view.c:919
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:922
-#: ui/evolution-addressbook.xml.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.c:923
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:923
+#: ../addressbook/gui/widgets/e-addressbook-view.c:924
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:924 calendar/gui/print.c:2483
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.c:925
+#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2489
+#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:80 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:927
+#: ../addressbook/gui/widgets/e-addressbook-view.c:928
 msgid "Copy to Address Book..."
 msgstr "Kopier til adressebok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:928
+#: ../addressbook/gui/widgets/e-addressbook-view.c:929
 msgid "Move to Address Book..."
 msgstr "Flytt til adressebok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:932
-#: calendar/gui/calendar-component.c:385 calendar/gui/tasks-component.c:329
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/calendar-component.c:385
+#: ../calendar/gui/tasks-component.c:329 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:9 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:933
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lim inn"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1526
-#: calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1750
+msgid "Print cards"
+msgstr "Skriv ut kontakter"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Assistents telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Faks på arbeid"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Arbeidstelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefon for tilbakeringing"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/dialogs/task-page.glade.h:7
-#: calendar/gui/e-calendar-table.etspec.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
 msgid "Categories"
 msgstr "Kategorier"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Lagre som"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Given Name"
 msgstr "Gitt navn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Hjemmetelefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "ISDN Phone"
 msgstr "ISDN-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Journal"
 msgstr "Journal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Leder"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Annen telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Personsøker"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:251
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
+#: ../calendar/gui/e-meeting-list-view.c:251
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Ektefelle"
 
@@ -3261,66 +3283,66 @@ msgstr "Ektefelle"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
 msgid "Title"
 msgstr "Tittel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Unit"
 msgstr "Enhet"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
 msgstr "Nettside"
 
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Bredde"
 
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Høyde"
 
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:152
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Har fokus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
+#: ../addressbook/gui/widgets/e-minicard.c:160
 msgid "Selected"
 msgstr "Valgt"
 
-#: addressbook/gui/widgets/e-minicard.c:167
+#: ../addressbook/gui/widgets/e-minicard.c:167
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Felt"
 
-#: addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Feltnavn"
 
-#: addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Tekstmodell"
 
-#: addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Maksimal lengde på feltnavn"
 
-#: addressbook/gui/widgets/e-minicard-view.c:171
+#: ../addressbook/gui/widgets/e-minicard-view.c:171
 msgid ""
 "\n"
 "\n"
@@ -3334,7 +3356,7 @@ msgstr ""
 "\n"
 "eller dobbelklikk her for å opprette en ny kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
 "\n"
@@ -3348,14 +3370,17 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:179
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr "\n\nSøk etter kontakten."
+msgstr ""
+"\n"
+"\n"
+"Søk etter kontakten."
 
-#: addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3365,330 +3390,333 @@ msgstr ""
 "\n"
 "Ingen oppføringer i denne visningen."
 
-#: addressbook/gui/widgets/e-minicard-view.c:498
+#: ../addressbook/gui/widgets/e-minicard-view.c:498
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
 msgstr "Kolonnebredde"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "Kortvisning"
 
-#: addressbook/gui/widgets/gal-view-factory-treeview.c:26
+#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
 msgstr "GTK-trevisning"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
 msgstr "LDIF-import for Evolution"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 msgid "Evolution VCard Importer"
 msgstr "Evolution VCard-import"
 
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:1000
+#: ../addressbook/printing/e-contact-print.c:1001
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: addressbook/printing/e-contact-print.c:1066
-#: addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:1066
+#: ../addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
+#: ../addressbook/printing/e-contact-print-envelope.c:213
+#: ../addressbook/printing/e-contact-print-envelope.c:234
 msgid "Print envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pkt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:2
+#: ../addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8 pot. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:3
+#: ../addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Blanke skjema på slutten:"
 
-#: addressbook/printing/e-contact-print.glade.h:4
+#: ../addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Kropp"
 
-#: addressbook/printing/e-contact-print.glade.h:5
+#: ../addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Bunn:"
 
-#: addressbook/printing/e-contact-print.glade.h:6
+#: ../addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Dimensjoner:"
 
-#: addressbook/printing/e-contact-print.glade.h:7
+#: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
 msgstr "Skr_ifttype..."
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: ../addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Bunntekst:"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: ../addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "Topptekst"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Topp-/bunntekst"
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: ../addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Topptekster"
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: ../addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Topptekst for hver bokstav"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: ../addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Høyde:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: ../addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Rett etter hverandre"
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: ../addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Inkluder:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: ../addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Landskap"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: ../addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Venstre:"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: ../addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Bokstavfaner på siden"
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: ../addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marger"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: ../addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Antall kolonner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: ../addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Alternativer"
 
-#: addressbook/printing/e-contact-print.glade.h:24 e-util/eggtrayicon.c:118
+#: ../addressbook/printing/e-contact-print.glade.h:24
+#: ../e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Orientering"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: ../addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Side"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: ../addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Sideoppsett:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Papir"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: ../addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Papirkilde:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: ../addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Portrett"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Forhåndsvis:"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: ../addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Skriv ut med gråtoner"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: ../addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Motsatt på like sider"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Høyre:"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: ../addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Seksjoner:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: ../addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Skyggelegging"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: ../addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: ../addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Start på en ny side"
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: ../addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Stilnavn:"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Topp:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
-#: calendar/gui/dialogs/calendar-setup.c:175
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:175
 msgid "Type:"
 msgstr "Type:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: ../addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Bredde:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "Skri_fttype..."
 
-#: addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
 msgstr "Test av redigering av utskriftsstil for kontakter"
 
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
+#: ../addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Opphavsrett © 2000, Ximian, Inc."
 
-#: addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr ""
 
-#: addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
 msgstr "Test på utskrift av kontakt"
 
-#: addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
 msgstr "Testfunksjon for utskrift av kontakter"
 
-#: addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Oppgi utdatafil i stedet for standard utdata"
 
-#: addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
 msgstr "UTDATAFIL"
 
-#: addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local addressbook folders"
 msgstr "Vis lokale adressebokmapper"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
 msgstr "Vis kontakter som vcard eller csv-fil"
 
-#: addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode"
 msgstr "Eksporter i asynkron modus"
 
-#: addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asychronous mode, default size 100."
-msgstr "Antall kontakter i en utdatafil i asynkron modus. Forvalgt størrelse er 100."
+msgstr ""
+"Antall kontakter i en utdatafil i asynkron modus. Forvalgt størrelse er 100."
 
-#: addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "ANTALL"
 
-#: addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:91
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
-msgstr "Feil med kommandolinjeflagg. Vennligst bruk --help for å se bruksinformasjon."
+msgstr ""
+"Feil med kommandolinjeflagg. Vennligst bruk --help for å se bruksinformasjon."
 
-#: addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
 msgstr "Støtt kun csv- eller vcard-format."
 
-#: addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
 msgstr "I asynkron modus må utdata være en fil."
 
-#: addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In normal mode, there is no need for the size option."
 msgstr "I normalt modus er ikke størrelsesflagget nødvendig."
 
-#: addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Unhandled error"
 msgstr "Uhåndtert feil"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Kan ikke åpne fil"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
 msgid "Couldn't get list of addressbooks"
 msgstr "Kunne ikke hente en liste med adressebøker"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
 msgid "failed to open book"
 msgstr "kunne ikke åpne adressebok"
 
-#: addressbook/tools/evolution-addressbook-import.c:46
+#: ../addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Feil under lasting av standard adressebok."
 
-#: addressbook/tools/evolution-addressbook-import.c:67
+#: ../addressbook/tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Innfil"
 
-#: addressbook/tools/evolution-addressbook-import.c:82
+#: ../addressbook/tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Ingen filnavn spesifisert."
 
 #. calendar:prompt-cancel-meeting primary
 #. calendar:prompt-cancel-task primary
-#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+#: ../calendar/calendar-errors.xml.h:2 ../calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Vil du sende en avlysningsmelding til alle deltakere?"
 
 #. calendar:prompt-cancel-meeting secondary
-#: calendar/calendar-errors.xml.h:4
+#: ../calendar/calendar-errors.xml.h:4
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -3696,32 +3724,32 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at møtet "
 "er avlyst."
 
-#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
-#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:87
-#: calendar/calendar-errors.xml.h:93 calendar/calendar-errors.xml.h:99
-#: calendar/calendar-errors.xml.h:105
+#: ../calendar/calendar-errors.xml.h:5 ../calendar/calendar-errors.xml.h:15
+#: ../calendar/calendar-errors.xml.h:25 ../calendar/calendar-errors.xml.h:87
+#: ../calendar/calendar-errors.xml.h:93 ../calendar/calendar-errors.xml.h:99
+#: ../calendar/calendar-errors.xml.h:105
 msgid "Don't Send"
 msgstr "Ikke send"
 
-#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
-#: calendar/calendar-errors.xml.h:26
+#: ../calendar/calendar-errors.xml.h:6 ../calendar/calendar-errors.xml.h:16
+#: ../calendar/calendar-errors.xml.h:26
 msgid "Send Notice"
 msgstr "Send melding"
 
 #. calendar:prompt-delete-meeting primary
-#: calendar/calendar-errors.xml.h:8
+#: ../calendar/calendar-errors.xml.h:8
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Er du sikker på at du vil slette dette møtet?"
 
 #. calendar:prompt-delete-meeting secondary
-#: calendar/calendar-errors.xml.h:10
+#: ../calendar/calendar-errors.xml.h:10
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "All informasjon om dette møtet vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-cancel-task secondary
-#: calendar/calendar-errors.xml.h:14
+#: ../calendar/calendar-errors.xml.h:14
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -3730,27 +3758,27 @@ msgstr ""
 "at oppgaven er slettet."
 
 #. calendar:prompt-delete-task primary
-#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#: ../calendar/calendar-errors.xml.h:18 ../calendar/calendar-errors.xml.h:44
 msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven?"
 
 #. calendar:prompt-delete-task secondary
 #. calendar:prompt-delete-named-task secondary
 #. calendar:prompt-delete-task secondary
-#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
-#: calendar/calendar-errors.xml.h:46
+#: ../calendar/calendar-errors.xml.h:20 ../calendar/calendar-errors.xml.h:42
+#: ../calendar/calendar-errors.xml.h:46
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "All informasjon om denne oppgaven vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-cancel-journal primary
-#: calendar/calendar-errors.xml.h:22
+#: ../calendar/calendar-errors.xml.h:22
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr ""
 "Er du sikker på at du vil sende en avlysing for denne journaloppføringen?"
 
 #. calendar:prompt-cancel-journal secondary
-#: calendar/calendar-errors.xml.h:24
+#: ../calendar/calendar-errors.xml.h:24
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -3759,12 +3787,12 @@ msgstr ""
 "at journalen er slettet."
 
 #. calendar:prompt-delete-journal primary
-#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#: ../calendar/calendar-errors.xml.h:28 ../calendar/calendar-errors.xml.h:52
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Er du sikker på at du vil slette denne journaloppføringen?"
 
 #. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:30
+#: ../calendar/calendar-errors.xml.h:30
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
@@ -3773,48 +3801,48 @@ msgstr ""
 "gjenopprettes."
 
 #. calendar:prompt-delete-titled-appointment primary
-#: calendar/calendar-errors.xml.h:32
+#: ../calendar/calendar-errors.xml.h:32
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Er du sikker på at du vil slette avtalen med navn «{0}»?"
 
 #. calendar:prompt-delete-titled-appointment secondary
 #. calendar:prompt-delete-appointment secondary
-#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+#: ../calendar/calendar-errors.xml.h:34 ../calendar/calendar-errors.xml.h:38
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "All informasjon i denne avtalen vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-delete-appointment primary
-#: calendar/calendar-errors.xml.h:36
+#: ../calendar/calendar-errors.xml.h:36
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Er du sikker på at du vil slette denne avtalen?"
 
 #. calendar:prompt-delete-named-task primary
-#: calendar/calendar-errors.xml.h:40
+#: ../calendar/calendar-errors.xml.h:40
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Er du sikker på at du vil slette oppgaven «{0}»?"
 
 #. calendar:prompt-delete-named-journal primary
-#: calendar/calendar-errors.xml.h:48
+#: ../calendar/calendar-errors.xml.h:48
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Er du sikker på at du vil slette journaloppføringen «{0}»?"
 
 #. calendar:prompt-delete-named-journal secondary
 #. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+#: ../calendar/calendar-errors.xml.h:50 ../calendar/calendar-errors.xml.h:54
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "All informasjon i denne journalen vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-delete-appointments primary
-#: calendar/calendar-errors.xml.h:56
+#: ../calendar/calendar-errors.xml.h:56
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Er du sikker på at du vil slette disse {0} avtalene?"
 
 #. calendar:prompt-delete-appointments secondary
-#: calendar/calendar-errors.xml.h:58
+#: ../calendar/calendar-errors.xml.h:58
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -3822,23 +3850,23 @@ msgstr ""
 "All informasjon i disse avtalene vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-delete-tasks primary
-#: calendar/calendar-errors.xml.h:60
+#: ../calendar/calendar-errors.xml.h:60
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Er du sikker på at du vil slette disse {0} oppgavene?"
 
 #. calendar:prompt-delete-tasks secondary
-#: calendar/calendar-errors.xml.h:62
+#: ../calendar/calendar-errors.xml.h:62
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "All informasjon om disse oppgavene vil bli slettet og kan ikke gjenopprettes."
 
 #. calendar:prompt-delete-journals primary
-#: calendar/calendar-errors.xml.h:64
+#: ../calendar/calendar-errors.xml.h:64
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "Er du sikker på at du vil slette disse {0} journaloppføringene?"
 
 #. calendar:prompt-delete-journals secondary
-#: calendar/calendar-errors.xml.h:66
+#: ../calendar/calendar-errors.xml.h:66
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
@@ -3847,68 +3875,68 @@ msgstr ""
 "gjenopprettes."
 
 #. calendar:prompt-save-appointment title
-#: calendar/calendar-errors.xml.h:68
+#: ../calendar/calendar-errors.xml.h:68
 msgid "Save Appointment"
 msgstr "Lagre avtale"
 
 #. calendar:prompt-save-appointment primary
-#: calendar/calendar-errors.xml.h:70
+#: ../calendar/calendar-errors.xml.h:70
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vil du lagre dine endringer i denne avtalen?"
 
 #. calendar:prompt-save-appointment secondary
-#: calendar/calendar-errors.xml.h:72
+#: ../calendar/calendar-errors.xml.h:72
 msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Du har gjort endringer i denne avtalen, men har ikke lagret dem."
 
-#: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
+#: ../calendar/calendar-errors.xml.h:73 ../calendar/calendar-errors.xml.h:81
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
-#: calendar/calendar-errors.xml.h:74 calendar/calendar-errors.xml.h:82
+#: ../calendar/calendar-errors.xml.h:74 ../calendar/calendar-errors.xml.h:82
 msgid "Save Changes"
 msgstr "Lagre endringer"
 
 #. calendar:prompt-save-task title
-#: calendar/calendar-errors.xml.h:76
+#: ../calendar/calendar-errors.xml.h:76
 msgid "Save Task"
 msgstr "Lagre oppgave"
 
 #. calendar:prompt-save-task primary
-#: calendar/calendar-errors.xml.h:78
+#: ../calendar/calendar-errors.xml.h:78
 msgid "Would you like to save your changes to this task?"
 msgstr "Vil du lagre dine endringer i denne oppgaven?"
 
 #. calendar:prompt-save-task secondary
-#: calendar/calendar-errors.xml.h:80
+#: ../calendar/calendar-errors.xml.h:80
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "Du har gjort endringer i denne oppgaven, men har ikke lagret dem."
 
 #. calendar:prompt-meeting-invite primary
-#: calendar/calendar-errors.xml.h:84
+#: ../calendar/calendar-errors.xml.h:84
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vil du sende møteinvitasjoner til deltakerene?"
 
 #. calendar:prompt-meeting-invite secondary
-#: calendar/calendar-errors.xml.h:86
+#: ../calendar/calendar-errors.xml.h:86
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan gi svar."
 
-#: calendar/calendar-errors.xml.h:88 calendar/calendar-errors.xml.h:94
-#: calendar/calendar-errors.xml.h:100 calendar/calendar-errors.xml.h:106
-#: ui/evolution-message-composer.xml.h:24
+#: ../calendar/calendar-errors.xml.h:88 ../calendar/calendar-errors.xml.h:94
+#: ../calendar/calendar-errors.xml.h:100 ../calendar/calendar-errors.xml.h:106
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Send"
 
 #. calendar:prompt-send-updated-meeting-info primary
-#: calendar/calendar-errors.xml.h:90
+#: ../calendar/calendar-errors.xml.h:90
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vil du sende oppdatert møteinformasjon til alle deltakere?"
 
 #. calendar:prompt-send-updated-meeting-info secondary
-#: calendar/calendar-errors.xml.h:92
+#: ../calendar/calendar-errors.xml.h:92
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -3917,12 +3945,12 @@ msgstr ""
 "oppdatert."
 
 #. calendar:prompt-send-task primary
-#: calendar/calendar-errors.xml.h:96
+#: ../calendar/calendar-errors.xml.h:96
 msgid "Would you like to send this task to participants?"
 msgstr "Vil du sende denne oppgaven til deltakere?"
 
 #. calendar:prompt-send-task secondary
-#: calendar/calendar-errors.xml.h:98
+#: ../calendar/calendar-errors.xml.h:98
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -3931,12 +3959,12 @@ msgstr ""
 "denne oppgaven."
 
 #. calendar:prompt-send-updated-task-info primary
-#: calendar/calendar-errors.xml.h:102
+#: ../calendar/calendar-errors.xml.h:102
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
 
 #. calendar:prompt-send-updated-task-info secondary
-#: calendar/calendar-errors.xml.h:104
+#: ../calendar/calendar-errors.xml.h:104
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -3945,198 +3973,205 @@ msgstr ""
 "oppgavelister oppdatert."
 
 #. calendar:tasks-crashed primary
-#: calendar/calendar-errors.xml.h:108
+#: ../calendar/calendar-errors.xml.h:108
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-oppgaver har avsluttet uventet."
 
 #. calendar:tasks-crashed secondary
-#: calendar/calendar-errors.xml.h:110
+#: ../calendar/calendar-errors.xml.h:110
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Dine oppgaver vil ikke være tilgjengelige før Evolution startes på nytt."
 
 #. calendar:calendar-crashed primary
-#: calendar/calendar-errors.xml.h:112
+#: ../calendar/calendar-errors.xml.h:112
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
 #. calendar:calendar-crashed secondary
-#: calendar/calendar-errors.xml.h:114
+#: ../calendar/calendar-errors.xml.h:114
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Dine kalendere vil ikke være tilgjengelige før Evolution startes på nytt."
 
 #. calendar:prompt-delete-calendar primary
-#: calendar/calendar-errors.xml.h:116
+#: ../calendar/calendar-errors.xml.h:116
 msgid "Delete calendar '{0}'?"
 msgstr "Slett kalender «{0}»?"
 
 #. calendar:prompt-delete-calendar secondary
-#: calendar/calendar-errors.xml.h:118
+#: ../calendar/calendar-errors.xml.h:118
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil bli fjernet for godt."
 
 #. calendar:prompt-delete-task-list primary
-#: calendar/calendar-errors.xml.h:120
+#: ../calendar/calendar-errors.xml.h:120
 msgid "Delete task list '{0}'?"
 msgstr "Slett oppgaveliste «{0}»?"
 
 #. calendar:prompt-delete-task-list secondary
-#: calendar/calendar-errors.xml.h:122
+#: ../calendar/calendar-errors.xml.h:122
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgavelisten vil bli fjernet for godt."
 
 #. calendar:prompt-send-no-subject-calendar primary
-#: calendar/calendar-errors.xml.h:124
+#: ../calendar/calendar-errors.xml.h:124
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Er du sikker på at du vil sende en avtelen uten emne?"
 
 #. calendar:prompt-send-no-subject-calendar secondary
-#: calendar/calendar-errors.xml.h:126
+#: ../calendar/calendar-errors.xml.h:126
 msgid ""
 "Adding a meaningful Summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
-msgstr "Hvis du gir dine avtaler en meningsfylt emnelinje vil mottakerene lettere forstå hva avtalen gjelder."
+msgstr ""
+"Hvis du gir dine avtaler en meningsfylt emnelinje vil mottakerene lettere "
+"forstå hva avtalen gjelder."
 
-#: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#: ../calendar/calendar-errors.xml.h:127 ../calendar/calendar-errors.xml.h:132
+#: ../mail/mail-errors.xml.h:15 ../mail/mail-errors.xml.h:20
+#: ../mail/mail-errors.xml.h:27 ../mail/mail-errors.xml.h:32
 msgid "_Send"
 msgstr "_Send"
 
 #. calendar:prompt-send-no-subject-task primary
-#: calendar/calendar-errors.xml.h:129
+#: ../calendar/calendar-errors.xml.h:129
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Er du sikker på at du vil sende oppgaven uten sammendrag?"
 
 #. calendar:prompt-send-no-subject-task secondary
-#: calendar/calendar-errors.xml.h:131
+#: ../calendar/calendar-errors.xml.h:131
 msgid ""
 "Adding a meaningful Summary to your task will give your recipients an idea "
-"of what your appointment is about."
-msgstr "Hvis du gir dine oppgaver et meningsfylt sammendrag vil mottakerene lettere forstå hva oppgaven dreier seg om."
+"of what your task is about."
+msgstr ""
+"Hvis du gir dine oppgaver et meningsfylt sammendrag vil mottakerene lettere "
+"forstå hva oppgaven dreier seg om."
 
-#: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
-#: smime/gui/component.c:48
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
+#: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Oppgi passord"
 
-#: calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:246
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendelser som går over flere dager:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1359
-#: calendar/conduits/calendar/calendar-conduit.c:1360
-#: calendar/conduits/todo/todo-conduit.c:879
-#: calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1359
+#: ../calendar/conduits/calendar/calendar-conduit.c:1360
+#: ../calendar/conduits/todo/todo-conduit.c:879
+#: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Kunne ikke starte evolution-data-server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1468
-#: calendar/conduits/calendar/calendar-conduit.c:1471
+#: ../calendar/conduits/calendar/calendar-conduit.c:1468
+#: ../calendar/conduits/calendar/calendar-conduit.c:1471
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
-#: calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Forvalgt prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:959
-#: calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:959
+#: ../calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:79
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: calendar/gui/dialogs/event-editor.c:138 calendar/gui/print.c:2298
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../calendar/gui/dialogs/event-editor.c:138 ../calendar/gui/print.c:2298
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Appointment Title"
 msgstr "Tittel på avtale"
 
 #. End time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: plugins/itip-formatter/itip-view.c:830
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "End time:"
 msgstr "Slutt-tid:"
 
 #. Location
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: calendar/gui/e-itip-control.c:1118 plugins/itip-formatter/itip-view.c:813
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/e-itip-control.c:1118
+#: ../plugins/itip-formatter/itip-view.c:815
 msgid "Location:"
 msgstr "Plassering:"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "Snooze _time:"
 msgstr "Utsett-_tid:"
 
 #. Start time
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: plugins/itip-formatter/itip-view.c:821
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "Start time:"
 msgstr "Start-tid:"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11
-#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22 ui/evolution.xml.h:38
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:153
+#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-signature-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:22
+#: ../ui/evolution.xml.h:38
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 msgid "_Snooze"
 msgstr "Ut_sett"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
 msgid "description of appointment"
 msgstr "beskrivelse av avtale"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
 msgid "end-time"
 msgstr "slutt-tid"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:11
 msgid "location"
 msgstr "lokasjon"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:13
 msgid "start-time"
 msgstr "start-tid"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:864
+#: ../calendar/gui/alarm-notify/alarm-queue.c:864
 msgid "Dismiss"
 msgstr "Se bort fra"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:865
+#: ../calendar/gui/alarm-notify/alarm-queue.c:865
 msgid "Dismiss All"
 msgstr "Se bort fra alle"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:947
+#: ../calendar/gui/alarm-notify/alarm-queue.c:947
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:956
-#: calendar/gui/alarm-notify/alarm-queue.c:958
+#: ../calendar/gui/alarm-notify/alarm-queue.c:956
+#: ../calendar/gui/alarm-notify/alarm-queue.c:958
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:966
+#: ../calendar/gui/alarm-notify/alarm-queue.c:966
 msgid "No location information available."
 msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:982
+#: ../calendar/gui/alarm-notify/alarm-queue.c:982
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4149,12 +4184,12 @@ msgstr ""
 "Starter %s\n"
 "Slutter %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
-#: calendar/gui/alarm-notify/alarm-queue.c:1108
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1108
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1088
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1088
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4166,7 +4201,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1114
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1114
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4183,166 +4218,168 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1128
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1128
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
 
-#: calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:150
+#: ../calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke opprette factory for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
 msgstr "ugyldig tid"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Allocate less space to weekend appointments"
 msgstr "Tildel mindre plass til avtaler i helgen"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
 msgid "Calendars to run alarms for"
 msgstr "Kalendere det skal kjøres alarmer for"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Color of tasks that are due today"
 msgstr "Farge for oppgaver som går ut i dag"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Color of tasks that are overdue"
 msgstr "Farge for oppgaver som har gått ut"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Days that are work days"
 msgstr "Dager som er arbeidsdager"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 msgid "Default timezone for meetings"
 msgstr "Forvalgt tidssone for møter"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Hour the workday ends on"
 msgstr "Time for arbeidsdagens slutt"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Hour the workday starts on"
 msgstr "Time for arbeidsdagens start"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Intervals shown in Day and Work Week views"
 msgstr "Intervaller vises i dag- og arbeidsukevisningene"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "List of urls for free/busy publishing"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Minute the workday ends on"
 msgstr "Minutt arbeidsdagen slutter på"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Minute the workday starts on"
 msgstr "Minutt arbeidsdagen starter på"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 msgid "Number of units for default reminder"
 msgstr "Antall enheter for forvalgt påminnelse"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 msgid "Number of units for determining when to hide tasks"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Position of the horizontal pane"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Position of the horizontal pane in the month view"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Position of the vertical pane"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Position of the vertical pane in the month view"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Position of the vertical pane in the task view"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Programs that can run as part of alarms"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Show where events end in week and month views"
 msgstr "Vis hvor hendelser slutter i ukes- og månedsvisning"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "The url template to use as a free/busy data fallback"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Time last alarm ran"
 msgstr "Tid for kjøring av forrige alarm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Units for determining when to hide tasks"
 msgstr "Enheter for å bestemme når oppgaver skal skjules"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Units of default reminder"
 msgstr "Enheter for forvalgt påminnelse"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Weekday the week starts on"
 msgstr "Dag uken starter på"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether or not to use the notification tray for display alarms"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Om det skal spørres etter bekreftelse ved sletting av avtaler"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Om det skal spørres etter bekreftelse når mapper tømmes"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to hide completed tasks"
 msgstr "Om fullførte oppgaver skal skjules"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to set a default reminder for events"
 msgstr "Im en forvalgt påminnelse skal settes for hendelser"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Whether to show week numbers in date navigator"
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:568
-#: calendar/gui/dialogs/calendar-setup.c:362 calendar/gui/gnome-cal.c:1925
-#: plugins/groupwise-account-setup/camel-gw-listener.c:382
-#: plugins/groupwise-account-setup/camel-gw-listener.c:412
+#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-component.c:568
+#: ../calendar/gui/dialogs/calendar-setup.c:362
+#: ../calendar/gui/gnome-cal.c:1925
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:382
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:355
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4351,1008 +4388,1108 @@ msgstr ""
 "Denne operasjonen vil fjerne alle hendelser innen valgt tidsrom permanent. "
 "Hvis du fortsetter vil du ikke kunne gjenopprette disse hendelsene."
 
-#: calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
-#: calendar/gui/calendar-commands.c:366
-#: calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
-#: plugins/calendar-http/calendar-http.c:265
+#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../plugins/calendar-weather/calendar-weather.c:566
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dager"
 
-#: calendar/gui/calendar-component.c:384
-#: calendar/gui/dialogs/calendar-setup.c:442
+#: ../calendar/gui/calendar-component.c:384
+#: ../calendar/gui/dialogs/calendar-setup.c:442
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:701
+#: ../calendar/gui/calendar-component.c:701
 msgid "Failed upgrading calendars."
 msgstr "Feil under oppgradering av kalendere."
 
-#: calendar/gui/calendar-component.c:997
+#: ../calendar/gui/calendar-component.c:997
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan ikke åpne kalender «%s» for oppretting av hendelser og møter"
 
-#: calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:1013
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ingen kalender er tilgjengelig for oppretting av hendelser og møter"
 
-#: calendar/gui/calendar-component.c:1123
+#: ../calendar/gui/calendar-component.c:1123
 msgid "Calendar Source Selector"
 msgstr "Valg av kalenderkilde"
 
-#: calendar/gui/calendar-component.c:1148
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1148
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "Calendars"
 msgstr "Kalendere"
 
-#: calendar/gui/calendar-component.c:1314
+#: ../calendar/gui/calendar-component.c:1314
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:1315
+#: ../calendar/gui/calendar-component.c:1315
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: calendar/gui/calendar-component.c:1316
+#: ../calendar/gui/calendar-component.c:1316
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: calendar/gui/calendar-component.c:1322
+#: ../calendar/gui/calendar-component.c:1322
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/calendar-component.c:1323
+#: ../calendar/gui/calendar-component.c:1323
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: calendar/gui/calendar-component.c:1324
+#: ../calendar/gui/calendar-component.c:1324
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: calendar/gui/calendar-component.c:1330
+#: ../calendar/gui/calendar-component.c:1330
 msgid "New all day appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:1331
+#: ../calendar/gui/calendar-component.c:1331
 msgid "All Day A_ppointment"
 msgstr "Avtale for hele _dagen"
 
-#: calendar/gui/calendar-component.c:1332
+#: ../calendar/gui/calendar-component.c:1332
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:1338
+#: ../calendar/gui/calendar-component.c:1338
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:1339
+#: ../calendar/gui/calendar-component.c:1339
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: calendar/gui/calendar-component.c:1340
+#: ../calendar/gui/calendar-component.c:1340
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "Dagvisning"
 
-#: calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "Arbeidsukevisning"
 
-#: calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "Ukevisning"
 
-#: calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "Lokasjon inneholder"
 
-#: calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:350
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: calendar/gui/comp-editor-factory.c:413
+#: ../calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "Feil under åpning av kalenderen"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: ../calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr "Metoden er ikke støttet under åpning av kalender"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: ../calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "Tilgang nektet ved åpning av kalender"
 
-#: calendar/gui/comp-editor-factory.c:437 shell/e-shell.c:1259
+#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1259
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Alarm</b>"
 msgstr "<b>Varsel</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Options</b>"
 msgstr "<b>Alternativer</b>"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "<b>Repeat</b>"
 msgstr "<b>Gjenta</b> "
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Add Alarm"
 msgstr "Legg til _varsel"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom _message"
 msgstr "Tilpasset _beskjed"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Custom alarm sound"
 msgstr "Egendefinert lyd for varsel"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
 msgid "Mes_sage:"
 msgstr "Be_skjed:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Vis varsling"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:11
-#: calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Kjør et program"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "Send til:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Send en melding"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
 msgstr "_Argumenter:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
 msgstr "_Program:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
 msgstr "_Gjenta alarmen"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
 msgstr "_Lyd:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "etter"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "før"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dag(er)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "slutten på avtalen"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "ekstra ganger hver"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
-#: plugins/calendar-http/calendar-http.c:264
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:565
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minutt(er)"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:28
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "option menu to choose alarm action"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:29
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:29
 msgid "option menu to choose alarm relative"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:30
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:30
 msgid "option menu to choose alarm time"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:31
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:31
 msgid "option menu to choose alarm value units"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:32
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:32
 msgid "start of appointment"
 msgstr "start på avtale"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "Handling/utløser"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
 msgstr "Le_gg til"
 
-#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 msgid "Alarms"
 msgstr "Varsel"
 
-#: calendar/gui/dialogs/calendar-setup.c:284
+#: ../calendar/gui/dialogs/calendar-setup.c:284
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Kopier kalenderinnhold lokalt for frakoblet operasjon"
 
-#: calendar/gui/dialogs/calendar-setup.c:336
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:336
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "F_arge:"
 
-#: calendar/gui/dialogs/calendar-setup.c:373
+#: ../calendar/gui/dialogs/calendar-setup.c:373
 msgid "Tasks List"
 msgstr "Oppgaveliste"
 
-#: calendar/gui/dialogs/calendar-setup.c:440
+#: ../calendar/gui/dialogs/calendar-setup.c:440
 msgid "Calendar Properties"
 msgstr "Kalenderegenskaper"
 
-#: calendar/gui/dialogs/calendar-setup.c:506
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "Task List Properties"
 msgstr "Egenskaper for oppgaveliste"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Legg til kalender"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "Add Task List"
 msgstr "Legg til oppgaveliste"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:103
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:103
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Legg til kalender"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Task List"
 msgstr "_Legg til oppgaveliste"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#: plugins/calendar-http/calendar-http.c:248
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../plugins/calendar-http/calendar-http.c:248
+#: ../plugins/calendar-weather/calendar-weather.c:549
 msgid "_Refresh:"
 msgstr "_Oppdater:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#: plugins/calendar-http/calendar-http.c:120
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../plugins/calendar-http/calendar-http.c:120
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
-#: plugins/calendar-http/calendar-http.c:266
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../plugins/calendar-weather/calendar-weather.c:567
 msgid "weeks"
 msgstr "uker"
 
-#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
-#. has "activatable" set.
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:108
+#: ../composer/e-msg-composer-attachment-bar.c:101
+#, c-format
+msgid "%.0fK"
+msgstr "%.0fK"
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:111
+#: ../composer/e-msg-composer-attachment-bar.c:104
+#, c-format
+msgid "%.0fM"
+msgstr "%.0fM"
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:114
+#: ../composer/e-msg-composer-attachment-bar.c:107
+#, c-format
+msgid "%.0fG"
+msgstr "%.0fG"
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:298
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:910
+#: ../composer/e-msg-composer-attachment-bar.c:293 ../mail/em-utils.c:436
+msgid "attachment"
+msgstr "vedlegg"
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:439
+#: ../calendar/gui/dialogs/meeting-page.c:781
+#: ../composer/e-msg-composer-attachment-bar.c:440
+#: ../plugins/shared-folder/properties.glade.h:14
+msgid "_Remove"
+msgstr "Fje_rn"
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:440
+#: ../composer/e-msg-composer-attachment-bar.c:441
+#: ../mail/em-folder-tree.c:2770 ../ui/evolution-mail-list.xml.h:27
+msgid "_Properties"
+msgstr "Egenska_per..."
+
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:442
+#: ../composer/e-msg-composer-attachment-bar.c:443
+msgid "_Add attachment..."
+msgstr "_Legg til vedlegg..."
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:6
+#: ../composer/e-msg-composer-select-file.c:93
+#: ../composer/e-msg-composer-select-file.c:112
+msgid "Suggest automatic display of attachment"
+msgstr "Foreslå automatisk visning av vedlegg"
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+#: ../composer/e-msg-composer-select-file.c:187
+msgid "Attach file(s)"
+msgstr "Legg ved fil(er)"
+
+#: ../calendar/gui/dialogs/cal-attachment.c:197
+#: ../calendar/gui/dialogs/cal-attachment.c:213
+#: ../composer/e-msg-composer-attachment.c:174
+#: ../composer/e-msg-composer-attachment.c:190
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Kan ikke legge ved fil: %s: %s"
+
+#: ../calendar/gui/dialogs/cal-attachment.c:205
+#: ../composer/e-msg-composer-attachment.c:182
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment Properties"
+msgstr "Egenskaper for vedlegg"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:267
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "Filnavn:"
+
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
+#: ../composer/e-msg-composer-attachment.glade.h:5
+msgid "MIME type:"
+msgstr "MIME-type:"
+
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:470
-#: mail/em-composer-prefs.c:678 mail/em-composer-prefs.c:945
-#: plugins/plugin-manager/plugin-manager.c:213
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
+#: ../mail/em-account-prefs.c:470 ../mail/em-composer-prefs.c:884
+#: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "Er du sikker på at du vil fjerne denne URLen?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
 msgid "Remove"
 msgstr "Fjern"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "Ikke fjern"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:853 mail/em-account-prefs.c:317
-#: mail/em-account-prefs.c:345 mail/em-account-prefs.c:376
-#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
-#: mail/em-composer-prefs.c:685
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
+#: ../mail/em-account-prefs.c:317 ../mail/em-account-prefs.c:345
+#: ../mail/em-account-prefs.c:376
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: calendar/gui/dialogs/cal-prefs-dialog.c:855 mail/em-account-prefs.c:317
-#: mail/em-account-prefs.c:345 mail/em-account-prefs.c:378
-#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
-#: mail/em-composer-prefs.c:685
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
+#: ../mail/em-account-prefs.c:317 ../mail/em-account-prefs.c:345
+#: ../mail/em-account-prefs.c:378
 msgid "Enable"
 msgstr "Aktiver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "05 minutes"
 msgstr "5 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "10 minutes"
 msgstr "10 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "30 minutes"
 msgstr "30 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "<b>Alerts</b>"
 msgstr "<b>Varsel</b> "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>Default Free/Busy Server</b>"
 msgstr "<b>Forvalgt tjener for ledig/opptatt-tid</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<b>General</b>"
 msgstr "<b>Generell</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Publishing</b>"
 msgstr "<b>Publisering</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Task List</b>"
 msgstr "<b>Oppgaveliste</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Time</b>"
 msgstr "<b>Tid</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<b>Work Week</b>"
 msgstr "<b>Arbeidsuke</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen.</i>"
+msgstr ""
+"<i>%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen.</i>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar and Tasks Settings"
 msgstr "Innstillinger for kalender og oppgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Color for overdue tasks"
 msgstr "Farge for utgåtte oppgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Color for tasks due today"
 msgstr "Farge for oppgaver som går ut i dag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "Dag_en slutter:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Days"
 msgstr "Dager"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Display"
 msgstr "Vis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: mail/mail-config.glade.h:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1031
-#: calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Hours"
 msgstr "Timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Minutes"
 msgstr "Minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/recurrence-page.c:1027
-#: calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Mandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "S_un"
 msgstr "S_ø."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/recurrence-page.c:1032
-#: calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Sh_ow a reminder"
 msgstr "_Vis en påminnelse"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:1033
-#: calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Søndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "T_asks due today:"
 msgstr "Oppg_aver som går ut i dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "T_hu"
 msgstr "T_o."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Template:"
 msgstr "Mal:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1030
-#: calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:1028
-#: calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "W_eek starts:"
 msgstr "Uk_en starter:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/recurrence-page.c:1029
-#: calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1042
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Add URL"
 msgstr "_Legg til URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i månedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Fri"
 msgstr "_Fr."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utførte oppgaver etter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Mon"
 msgstr "_Ma."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Overdue tasks:"
 msgstr "Utgåtte _oppgaver:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Sat"
 msgstr "L_ø."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Show appointment end times in week and month views"
 msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Time divisions:"
 msgstr "Oppdeling av _tid:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Tue"
 msgstr "_Ti."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Wed"
 msgstr "_On."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "before every appointment"
 msgstr "før hver avtale"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "option menu to choose reminder units"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "option menu to choose time units"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Denne hendelsen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Denne oppgaven er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Denne journaloppføringen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort endringer. Forkast disse endringene og lukk redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har ikke gjort endringer. Lukk redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Denne hendelsen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Denne oppgaven er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Denne journaloppføringen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har gjort endringer. Forkast disse endringene og oppdater redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:279
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:417 composer/e-msg-composer.c:2315
+#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:2315
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/dialogs/comp-editor.c:470 composer/e-msg-composer.c:2344
+#: ../calendar/gui/dialogs/comp-editor.c:470 ../composer/e-msg-composer.c:2344
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Skjul _vedleggsfeltet (slipp vedlegg her)"
 
-#: calendar/gui/dialogs/comp-editor.c:473
-#: calendar/gui/dialogs/comp-editor.c:517 composer/e-msg-composer.c:2347
-#: composer/e-msg-composer.c:3466
+#: ../calendar/gui/dialogs/comp-editor.c:473
+#: ../calendar/gui/dialogs/comp-editor.c:517 ../composer/e-msg-composer.c:2347
+#: ../composer/e-msg-composer.c:3466
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
 
-#: calendar/gui/dialogs/comp-editor.c:1046
-#: calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/comp-editor.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:1052
-#: calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1052
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1054
-#: calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1054
+#: ../calendar/gui/dialogs/comp-editor.c:1097
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1058
-#: calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1058
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1060
-#: calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1063
-#: calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1106
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1116
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1548
-#: calendar/gui/dialogs/comp-editor.c:1581
-#: calendar/gui/dialogs/comp-editor.c:1605
+#: ../calendar/gui/dialogs/comp-editor.c:1548
+#: ../calendar/gui/dialogs/comp-editor.c:1581
+#: ../calendar/gui/dialogs/comp-editor.c:1605
 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:1629
+#: ../calendar/gui/dialogs/comp-editor.c:1629
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:464
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "Kunne ikke åpne kilde"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:69
 msgid "Could not open destination"
 msgstr "Kunne ikke åpne destinasjon"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:78
 msgid "Destination is read only"
 msgstr "Destinasjonen er skrivebeskyttet"
 
-#: calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Hendelsen kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Oppgaven kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Journaloppføringen kunne ikke slette pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Oppføringen kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Hendelsen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Oppgaven kunne ikke slettes fordi tilgang nektes"
 
-#: calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Journaloppføringen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Oppføringen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Hendelsen kunne ikke slettes pga en feil"
 
-#: calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Oppgaven kunne ikke slettes pga en feil"
 
-#: calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Journaloppføringen kunne ikke slette pga en feil"
 
-#: calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Oppføringen kunne ikke slettes pga en feil"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "Kontakter..."
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
 msgstr "Deleger til:"
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:147
+#: ../calendar/gui/dialogs/event-editor.c:147
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: calendar/gui/dialogs/event-editor.c:159
-#: calendar/gui/dialogs/event-editor.c:231
-#: calendar/gui/dialogs/event-editor.c:376
+#: ../calendar/gui/dialogs/event-editor.c:159
+#: ../calendar/gui/dialogs/event-editor.c:231
+#: ../calendar/gui/dialogs/event-editor.c:376
 msgid "Scheduling"
 msgstr "Møteplanlegging"
 
-#: calendar/gui/dialogs/event-editor.c:166
-#: calendar/gui/dialogs/event-editor.c:234
-#: calendar/gui/dialogs/event-editor.c:379
+#: ../calendar/gui/dialogs/event-editor.c:166
+#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:379
 msgid "Invitations"
 msgstr "Invitasjoner"
 
-#: calendar/gui/dialogs/event-page.c:716
+#: ../calendar/gui/dialogs/event-page.c:716
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: calendar/gui/dialogs/event-page.c:719
+#: ../calendar/gui/dialogs/event-page.c:719
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: calendar/gui/dialogs/event-page.c:885 calendar/gui/dialogs/task-page.c:551
+#: ../calendar/gui/dialogs/event-page.c:885
+#: ../calendar/gui/dialogs/task-page.c:551
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:895
+#: ../calendar/gui/dialogs/event-page.c:895
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:918
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: calendar/gui/dialogs/event-page.c:925
+#: ../calendar/gui/dialogs/event-page.c:925
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: calendar/gui/dialogs/event-page.c:1666
+#: ../calendar/gui/dialogs/event-page.c:1666
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
 
-#: calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/event-page.c:1872
 #, 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:1880
+#: ../calendar/gui/dialogs/event-page.c:1880
 #, 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:1888
+#: ../calendar/gui/dialogs/event-page.c:1888
 #, 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.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 day before appointment"
 msgstr "en dag før avtalen"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "1 hour before appointment"
 msgstr "en time før avtalen"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "15 minutes before appointment"
 msgstr "femten minutter før avtalen"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "<b>Basics</b>"
 msgstr "<b>Grunnleggende</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:6
 msgid "<b>Date and Time</b>"
 msgstr "<b>Dato og klokkeslett</b> "
 
-#: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "<b>Send Options</b>"
 msgstr "<b>Alternativer for sending</b>"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
 msgstr "Varer hele _dagen"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Ad_vanced  send options"
 msgstr "A_vanserte alternativer for sending"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "C_ustomize..."
 msgstr "Tilpass..."
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Ca_tegories..."
 msgstr "Kate_gorier..."
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "Kale_nder:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:8
 msgid "Classi_fication:"
 msgstr "Klassi_fisering"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:361 calendar/gui/e-cal-list-view.c:255
-#: calendar/gui/e-cal-model.c:305
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:305
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Event Description"
 msgstr "Beskrivelse av hendelse"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "Plasser_ing:"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:360 calendar/gui/e-cal-list-view.c:254
-#: calendar/gui/e-cal-model.c:303
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/task-page.glade.h:11
+#: ../calendar/gui/e-calendar-table.c:361
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:303
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
-#: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:359 calendar/gui/e-cal-list-view.c:253
-#: calendar/gui/e-cal-model.c:294 calendar/gui/e-cal-model.c:301
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:294
+#: ../calendar/gui/e-cal-model.c:301
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/event-page.glade.h:19
 msgid "Show time as _busy"
 msgstr "Vis tid som _opptatt"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
-#: calendar/gui/dialogs/task-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/task-page.glade.h:14
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "Denne avtalen har egendefinerte alarmer"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:22
 msgid "_Alarm"
 msgstr "_Varsel"
 
-#: calendar/gui/dialogs/event-page.glade.h:23
+#: ../calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
-#: calendar/gui/dialogs/event-page.glade.h:24
-#: calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#: calendar/gui/dialogs/event-page.glade.h:25
-#: calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/dialogs/event-page.glade.h:25
+#: ../calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
@@ -5361,876 +5498,891 @@ msgstr "_Start-tid:"
 #. 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/meeting-page.c:296
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:652 calendar/gui/e-itip-control.c:1104
-#: composer/e-msg-composer.c:2122 filter/filter-rule.c:878
-#: mail/em-account-editor.c:675 mail/em-account-editor.c:1268
-#: mail/em-account-prefs.c:431 mail/em-folder-view.c:961
-#: plugins/itip-formatter/itip-formatter.c:1365
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458
-#: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651
+#: ../calendar/gui/dialogs/meeting-page.c:296
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/e-cal-model-tasks.c:652
+#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2122
+#: ../filter/filter-rule.c:878 ../mail/em-account-editor.c:675
+#: ../mail/em-account-editor.c:1269 ../mail/em-account-prefs.c:431
+#: ../mail/em-folder-view.c:965
+#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:425
+#: ../plugins/itip-formatter/itip-formatter.c:1366
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:458
+#: ../widgets/misc/e-dateedit.c:1497 ../widgets/misc/e-dateedit.c:1651
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:432
+#: ../calendar/gui/dialogs/meeting-page.c:432
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: ../calendar/gui/dialogs/meeting-page.c:438
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:453
+#: ../calendar/gui/dialogs/meeting-page.c:453
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:778
+#: ../calendar/gui/dialogs/meeting-page.c:778
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
-#: calendar/gui/dialogs/meeting-page.c:781
-#: composer/e-msg-composer-attachment-bar.c:440
-#: plugins/shared-folder/properties.glade.h:19
-msgid "_Remove"
-msgstr "Fje_rn"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:235
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-list-view.c:235
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Deltaker"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Klikk her for å legge til en deltaker"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Vanlig navn"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Delegert fra"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Delegert til"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Språk"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Medlem"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-list-view.c:258
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:258
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:145
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:265
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63
-#: mail/message-list.etspec.h:12
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
+#: ../calendar/gui/dialogs/task-editor.c:145
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:265
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "<b>Att_endees</b>"
 msgstr "<b>D_eltakere</b> "
 
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "C_hange Organizer"
 msgstr "Endre or_ganisator"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-meeting-time-sel.c:428
 msgid "Con_tacts..."
 msgstr "Kon_takter..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
 msgid "Organizer"
 msgstr "Organisator"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/dialogs/meeting-page.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalenderalternativer</b>"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Add New Calendar"
 msgstr "Legg til ny kalender"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Group"
 msgstr "Kalendergruppe"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Location"
 msgstr "Kalenderlokasjon"
 
-#: calendar/gui/dialogs/new-calendar.glade.h:6
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
 msgid "Calendar Name"
 msgstr "Kalendernavn"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Alternativer for oppgaveliste</b>"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Add New Task List"
 msgstr "Legg til ny oppgaveliste"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
 msgstr "Oppgavelistegruppe"
 
-#: calendar/gui/dialogs/new-task-list.glade.h:5
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
 msgid "Task List Name"
 msgstr "Navn på oppgaveliste"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: ../calendar/gui/dialogs/recur-comp.c:51
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Du endrer en gjeninntreffende hendelse. Hva ønsker du å endre?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:55
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Du endrer en repeterende oppgave. Hva vil du endre?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:59
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "Du endrer en repeterende journaloppføring. Hva vil du endre?"
 
-#: calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "Kun denne instansen"
 
-#: calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "Denne og tidligere instanser"
 
-#: calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "Denne og fremtidige instanser"
 
-#: calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Alle instanser"
 
-#: calendar/gui/dialogs/recurrence-page.c:493
+#: ../calendar/gui/dialogs/recurrence-page.c:493
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:799
+#: ../calendar/gui/dialogs/recurrence-page.c:812
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
-#: calendar/gui/dialogs/recurrence-page.c:910
+#: ../calendar/gui/dialogs/recurrence-page.c:923
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: ../calendar/gui/dialogs/recurrence-page.c:984
 msgid "first"
 msgstr "første"
 
-#: calendar/gui/dialogs/recurrence-page.c:972
+#: ../calendar/gui/dialogs/recurrence-page.c:985
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:973
+#: ../calendar/gui/dialogs/recurrence-page.c:986
 msgid "third"
 msgstr "tredje"
 
-#: calendar/gui/dialogs/recurrence-page.c:974
+#: ../calendar/gui/dialogs/recurrence-page.c:987
 msgid "fourth"
 msgstr "fjerde"
 
-#: calendar/gui/dialogs/recurrence-page.c:975
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "last"
 msgstr "siste"
 
-#: calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1011
 msgid "Other Date"
 msgstr "Annen dato"
 
-#: calendar/gui/dialogs/recurrence-page.c:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1163
+#: ../calendar/gui/dialogs/recurrence-page.c:1176
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1349
+#: ../calendar/gui/dialogs/recurrence-page.c:1362
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2315
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
 msgstr "<b>Unntak</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Forhåndsvis</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "<b>Recurrence</b>"
 msgstr "<b>Gjeninntreffelse</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Hver"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "This appointment rec_urs"
 msgstr "Denne avtalen _gjeninntreffer"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "for"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "for alltid"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "måned(er)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "til"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "uke(r)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/task-details-page.c:410
-#: calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:410
+#: ../calendar/gui/dialogs/task-details-page.c:429
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">Forskjellig\t</span>"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Status</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:229
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-tasks.c:345
-#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-itip-control.c:896
-#: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
-#: calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/task-details-page.glade.h:4
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-calendar-table.c:457
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-itip-control.c:896 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/e-meeting-store.c:219 ../calendar/gui/print.c:2349
 msgid "Completed"
 msgstr "Fullført"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:248
-#: calendar/gui/e-calendar-table.c:381 mail/message-list.c:1011
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1011
 msgid "High"
 msgstr "Høy"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:226
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-tasks.c:343
-#: calendar/gui/e-cal-model-tasks.c:656 calendar/gui/e-cal-model-tasks.c:731
-#: calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:226
+#: ../calendar/gui/e-calendar-table.c:456
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-cal-model-tasks.c:731 ../calendar/gui/print.c:2346
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:252
-#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1009
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1009
 msgid "Low"
 msgstr "Lav"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:250
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:899
-#: mail/message-list.c:1010
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:383 ../calendar/gui/e-cal-model.c:899
+#: ../mail/message-list.c:1010
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:236
-#: calendar/gui/e-calendar-table.c:454 calendar/gui/e-cal-model-tasks.c:341
-#: calendar/gui/e-cal-model-tasks.c:654 calendar/gui/print.c:2343
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-calendar-table.c:455
+#: ../calendar/gui/e-cal-model-tasks.c:341
+#: ../calendar/gui/e-cal-model-tasks.c:654 ../calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "P_ercent complete:"
 msgstr "Pros_ent fullført:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/e-calendar-table.c:385
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "_Date completed:"
 msgstr "Fullført _dato:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Nettside:"
 
-#: calendar/gui/dialogs/task-editor.c:136 calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:136 ../calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:156
-#: calendar/gui/dialogs/task-editor.c:218
-#: calendar/gui/dialogs/task-editor.c:357
+#: ../calendar/gui/dialogs/task-editor.c:156
+#: ../calendar/gui/dialogs/task-editor.c:218
+#: ../calendar/gui/dialogs/task-editor.c:357
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:524
+#: ../calendar/gui/dialogs/task-page.c:524
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/task-page.c:868
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
 
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "<span weight=\"bold\">Basics</span>"
 msgstr "<span weight=\"bold\">Grunnleggende</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr "<span weight=\"bold\">Dato og klokkeslett</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Ad_vanced send options"
 msgstr "A_vanserte alternativer for sending"
 
-#: calendar/gui/dialogs/task-page.glade.h:10
+#: ../calendar/gui/dialogs/task-page.glade.h:10
 msgid "D_escription:"
 msgstr "B_eskrivelse:"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/task-page.glade.h:13
 msgid "Sta_rt date:"
 msgstr "Sta_rtdato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:15
 msgid "Task Description"
 msgstr "Beskrivelse av oppgave"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
+#: ../calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Due date:"
 msgstr "Fer_dig-dato:"
 
-#: calendar/gui/dialogs/task-page.glade.h:17
+#: ../calendar/gui/dialogs/task-page.glade.h:17
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Ledig/opptatt-k_alendere</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing Frequency</b>"
 msgstr "<b>Publiseringsfrekvens</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>_Lokasjon for publisering</b>"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
 msgstr "Innstillinger for publisering av ledig/opptatt-tid"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Daily"
 msgstr "_Daglig"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "_Manual"
 msgstr "_Manuell"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
 msgid "_Remember password"
 msgstr "Hu_sk passord"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 msgid "_Username:"
 msgstr "Br_ukernavn:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "_Weekly"
 msgstr "_Ukentlig"
 
-#: calendar/gui/e-alarm-list.c:395
+#: ../calendar/gui/e-alarm-list.c:395
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dager"
 
-#: calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d uke"
 msgstr[1] "%d uker"
 
-#: calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
-#: calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/e-alarm-list.c:410
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutt"
 msgstr[1] "%d minutter"
 
-#: calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:415
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utføres"
 
-#: calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s før avtalen starter"
 
-#: calendar/gui/e-alarm-list.c:477
+#: ../calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s etter avtalen har startet"
 
-#: calendar/gui/e-alarm-list.c:482
+#: ../calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved avtalens start"
 
-#: calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s før avtalen slutter"
 
-#: calendar/gui/e-alarm-list.c:494
+#: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s etter avtalens slutt"
 
-#: calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved avtalens slutt"
 
-#: calendar/gui/e-alarm-list.c:521
+#: ../calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: calendar/gui/e-alarm-list.c:527
+#: ../calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2467
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2470
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: calendar/gui/e-cal-component-preview.c:155 filter/filter-rule.c:795
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:795
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: calendar/gui/e-cal-component-preview.c:186
-#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.glade.h:11
+#: ../calendar/gui/e-cal-component-preview.c:186
+#: ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: calendar/gui/e-cal-component-preview.c:193
-#: calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-cal-component-preview.c:204
 msgid "Start Date:"
 msgstr "Startdato:"
 
-#: calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
 #. write status
 #. Status
-#: calendar/gui/e-cal-component-preview.c:222
-#: calendar/gui/e-itip-control.c:1132 plugins/itip-formatter/itip-view.c:838
+#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../plugins/itip-formatter/itip-view.c:840
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: calendar/gui/e-cal-component-preview.c:267
-#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-preview.c:299
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:433 calendar/gui/e-cal-model-calendar.c:179
+#: ../calendar/gui/e-calendar-table.c:434
+#: ../calendar/gui/e-cal-model-calendar.c:179
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/e-calendar-table.c:434 calendar/gui/e-cal-model-calendar.c:182
-#: calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-calendar-table.c:435
+#: ../calendar/gui/e-cal-model-calendar.c:182
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Opptatt"
 
-#: calendar/gui/e-calendar-table.c:689 calendar/gui/e-calendar-view.c:652
+#: ../calendar/gui/e-calendar-table.c:516
+msgid "Task Table"
+msgstr "Oppgavetabell"
+
+#: ../calendar/gui/e-calendar-table.c:694
+#: ../calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:868 calendar/gui/e-calendar-view.c:756
+#: ../calendar/gui/e-calendar-table.c:873
+#: ../calendar/gui/e-calendar-view.c:756
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-view.c:1064
-#: composer/e-msg-composer.c:1201
+#: ../calendar/gui/e-calendar-table.c:1014
+#: ../calendar/gui/e-calendar-view.c:1064 ../composer/e-msg-composer.c:1201
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: calendar/gui/e-calendar-table.c:1151 calendar/gui/e-calendar-view.c:1389
-#: mail/em-folder-view.c:927 ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1389 ../mail/em-folder-view.c:931
+#: ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Åpne"
 
-#: calendar/gui/e-calendar-table.c:1152
+#: ../calendar/gui/e-calendar-table.c:1157
 msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
-#: calendar/gui/e-calendar-table.c:1153 calendar/gui/e-calendar-view.c:1390
-#: mail/em-folder-view.c:929 mail/em-popup.c:498
-#: ui/evolution-mail-message.xml.h:128
+#: ../calendar/gui/e-calendar-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:1390 ../mail/em-folder-view.c:933
+#: ../mail/em-popup.c:493 ../ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: calendar/gui/e-calendar-table.c:1154 calendar/gui/e-calendar-view.c:1370
-#: calendar/gui/e-calendar-view.c:1391 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-mail-message.xml.h:125
-#: ui/evolution-tasks.xml.h:25
+#: ../calendar/gui/e-calendar-table.c:1159
+#: ../calendar/gui/e-calendar-view.c:1370
+#: ../calendar/gui/e-calendar-view.c:1391 ../ui/evolution-addressbook.xml.h:40
+#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1395
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1395 ../ui/evolution-addressbook.xml.h:1
+#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
-#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1396
-#: composer/e-msg-composer.c:2901 mail/em-folder-tree.c:1036
-#: mail/message-list.c:1712 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1164
+#: ../calendar/gui/e-calendar-view.c:1396 ../composer/e-msg-composer.c:2901
+#: ../mail/em-folder-tree.c:1036 ../mail/message-list.c:1712
+#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:109 ../ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:1160 calendar/gui/e-calendar-view.c:1373
-#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1165
+#: ../calendar/gui/e-calendar-view.c:1373
+#: ../calendar/gui/e-calendar-view.c:1397 ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:1164
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: calendar/gui/e-calendar-table.c:1165
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1166
+#: ../calendar/gui/e-calendar-table.c:1171
 msgid "_Mark as Complete"
 msgstr "_Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:1167
+#: ../calendar/gui/e-calendar-table.c:1172
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valgte oppgaver som fullført"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1171 calendar/gui/e-calendar-view.c:1408
-#: mail/em-folder-tree.c:2758 mail/em-folder-view.c:952
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1408 ../mail/em-folder-tree.c:2766
+#: ../mail/em-folder-view.c:956 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Slett"
 
-#: calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-table.c:1177
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: calendar/gui/e-calendar-table.c:1323
-#: calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-calendar-table.c:1328
+#: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klikk for å legge til en oppgave"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% ferdig"
 
-#: calendar/gui/e-calendar-table.etspec.h:5 mail/mail-send-recv.c:611
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:611
 msgid "Complete"
 msgstr "Fullført"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Ferdigstillingsdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Ferdigdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-dialogs.glade.h:21
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/mail-dialogs.glade.h:21
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Oppgavesortering"
 
-#: calendar/gui/e-calendar-view.c:1179
+#: ../calendar/gui/e-calendar-view.c:1179
 msgid "Moving items"
 msgstr "Flytter oppføringer"
 
-#: calendar/gui/e-calendar-view.c:1181
+#: ../calendar/gui/e-calendar-view.c:1181
 msgid "Copying items"
 msgstr "Kopierer oppføringer"
 
-#: calendar/gui/e-calendar-view.c:1364
+#: ../calendar/gui/e-calendar-view.c:1364
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/e-calendar-view.c:1365
+#: ../calendar/gui/e-calendar-view.c:1365
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1367
 msgid "New Task"
 msgstr "Ny oppgave"
 
 #. FIXME: hook in this somehow
-#: calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1377
 msgid "Current View"
 msgstr "Aktiv visning"
 
-#: calendar/gui/e-calendar-view.c:1379 ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1379 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
-#: calendar/gui/e-calendar-view.c:1380
+#: ../calendar/gui/e-calendar-view.c:1380
 msgid "_Select Date..."
 msgstr "_Velg dato..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: calendar/gui/e-calendar-view.c:1385 ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1385 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-calendar-view.c:1401
+#: ../calendar/gui/e-calendar-view.c:1401
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: calendar/gui/e-calendar-view.c:1402
+#: ../calendar/gui/e-calendar-view.c:1402
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: calendar/gui/e-calendar-view.c:1403
+#: ../calendar/gui/e-calendar-view.c:1403
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: calendar/gui/e-calendar-view.c:1404
+#: ../calendar/gui/e-calendar-view.c:1404
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1409
+#: ../calendar/gui/e-calendar-view.c:1409
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: calendar/gui/e-calendar-view.c:1410
+#: ../calendar/gui/e-calendar-view.c:1410
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-calendar-view.c:1411
+#: ../calendar/gui/e-calendar-view.c:1411
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "Start Date"
 msgstr "Startdato"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
-#: calendar/gui/e-meeting-list-view.c:139
-#: calendar/gui/e-meeting-list-view.c:153 calendar/gui/e-meeting-store.c:124
-#: calendar/gui/e-meeting-store.c:159 calendar/gui/e-meeting-store.c:224
-#: mail/em-utils.c:1157 plugins/itip-formatter/itip-formatter.c:249
-#: plugins/itip-formatter/itip-formatter.c:1387
-#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:202
-#: shell/e-component-registry.c:206 widgets/misc/e-charset-picker.c:62
+#: ../calendar/gui/e-cal-model.c:307 ../calendar/gui/e-cal-model.c:310
+#: ../calendar/gui/e-itip-control.c:1149 ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-meeting-list-view.c:139
+#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1157
+#: ../plugins/itip-formatter/itip-formatter.c:249
+#: ../plugins/itip-formatter/itip-formatter.c:1388
+#: ../plugins/plugin-manager/plugin-manager.c:72
+#: ../shell/e-component-registry.c:202 ../shell/e-component-registry.c:206
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/e-cal-model.c:901
+#: ../calendar/gui/e-cal-model.c:901
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: calendar/gui/e-cal-model.c:903
+#: ../calendar/gui/e-cal-model.c:903
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
-#: calendar/gui/e-meeting-list-view.c:163 calendar/gui/e-meeting-store.c:168
-#: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model.c:905 ../calendar/gui/e-cal-model-tasks.c:1017
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:808
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
-#: calendar/gui/e-meeting-list-view.c:164 calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model.c:905 ../calendar/gui/e-cal-model-tasks.c:1017
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:180
 msgid "No"
 msgstr "Nei"
 
-#: calendar/gui/e-cal-model-tasks.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:297
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/e-cal-model-tasks.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:297
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:299 ../smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Ø"
 
-#: calendar/gui/e-cal-model-tasks.c:299
+#: ../calendar/gui/e-cal-model-tasks.c:299
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/e-cal-model-tasks.c:606
+#: ../calendar/gui/e-cal-model-tasks.c:606
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6245,8 +6397,8 @@ msgstr ""
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:115 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
+#: ../e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
@@ -6255,12 +6407,12 @@ msgstr "%a %d.%m.%Y %H.%M.%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
+#: ../e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
-#: calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6272,14 +6424,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:748 calendar/gui/e-week-view.c:512
-#: calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:751 calendar/gui/e-week-view.c:515
-#: calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
@@ -6289,112 +6441,112 @@ msgstr "pm"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view.c:1494 calendar/gui/e-day-view-top-item.c:715
-#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view.c:1494 ../calendar/gui/e-day-view-top-item.c:715
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#: calendar/gui/e-day-view-time-item.c:527
+#: ../calendar/gui/e-day-view-time-item.c:527
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
-#: calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (enkel gjeninntreffelse)"
 
-#: calendar/gui/e-itip-control.c:772
+#: ../calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Hver dag"
 msgstr[1] "Hver %d dag"
 
-#: calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Hver uke"
 msgstr[1] "Hver %d uker"
 
-#: calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Hver uke på "
 msgstr[1] "Hver %d uker på "
 
-#: calendar/gui/e-itip-control.c:787
+#: ../calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:794
+#: ../calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: calendar/gui/e-itip-control.c:807
+#: ../calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: calendar/gui/e-itip-control.c:814
+#: ../calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hver måned"
 msgstr[1] "hver %d måneder"
 
-#: calendar/gui/e-itip-control.c:818
+#: ../calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Hvert år"
 msgstr[1] "Hvert %d år"
 
-#: calendar/gui/e-itip-control.c:829
+#: ../calendar/gui/e-itip-control.c:829
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " totalt %d gang"
 msgstr[1] " totalt %d ganger"
 
-#: calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", slutter på "
 
-#: calendar/gui/e-itip-control.c:862
+#: ../calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "Starter"
 
-#: calendar/gui/e-itip-control.c:875
+#: ../calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "Slutter"
 
-#: calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:909
 msgid "Due"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-itip-control.c:1006
+#: ../calendar/gui/e-itip-control.c:949 ../calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:966
+#: ../calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "iCalender-feil"
 
-#: calendar/gui/e-itip-control.c:1038 calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-itip-control.c:1082
-#: plugins/itip-formatter/itip-view.c:285
-#: plugins/itip-formatter/itip-view.c:286
-#: plugins/itip-formatter/itip-view.c:353
-#: plugins/itip-formatter/itip-view.c:354
+#: ../calendar/gui/e-itip-control.c:1038 ../calendar/gui/e-itip-control.c:1054
+#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1082
+#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:288
+#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:356
 msgid "An unknown person"
 msgstr "En ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1089
+#: ../calendar/gui/e-itip-control.c:1089
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6402,461 +6554,468 @@ msgstr ""
 "<br>Vennligst sjekk følgende informasjon og velg så en handling fra menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:175
-#: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
-#: calendar/gui/itip-utils.c:422 plugins/itip-formatter/itip-formatter.c:1378
+#: ../calendar/gui/e-itip-control.c:1137
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/itip-utils.c:422
+#: ../plugins/itip-formatter/itip-formatter.c:1379
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:425
-#: plugins/itip-formatter/itip-formatter.c:1381
+#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:425
+#: ../plugins/itip-formatter/itip-formatter.c:1382
 msgid "Tentatively Accepted"
 msgstr "Akteptert tentativt"
 
-#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:176
-#: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
-#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
-#: plugins/itip-formatter/itip-formatter.c:1384
+#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/itip-utils.c:428 ../calendar/gui/itip-utils.c:454
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-itip-control.c:1229
+#: ../calendar/gui/e-itip-control.c:1229
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr "Møtet er avlyst, men det ble ikke funnet i dine kalendere."
 
-#: calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr "Oppgaven er avlyst men den ble ikke funnet i dine oppgavelister"
 
-#: calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publisert møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1317
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> forespør at %s er tilstede i et møte."
 
-#: calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
 
-#: calendar/gui/e-itip-control.c:1320
+#: ../calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "Møteforslag"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte."
 
-#: calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ønsker å motta seneste møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1332
+#: ../calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "Forespørsel om møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1339
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart på en møteforespørsel."
 
-#: calendar/gui/e-itip-control.c:1340
+#: ../calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avlyst et møte."
 
-#: calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "Møteavlysing"
 
-#: calendar/gui/e-itip-control.c:1358 calendar/gui/e-itip-control.c:1435
-#: calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1358 ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforståelig melding."
 
-#: calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "Ugyldig møtemelding"
 
-#: calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om en oppgave."
 
-#: calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> forespør at %s utfører en oppgave."
 
-#: calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> forespør at du utfører en oppgave."
 
-#: calendar/gui/e-itip-control.c:1397
+#: ../calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "Forslag til oppgave"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave."
 
-#: calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1408
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
 
-#: calendar/gui/e-itip-control.c:1409
+#: ../calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "Forespørsel om oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1416
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart på en oppgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1417
+#: ../calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "Svar på oppgave"
 
-#: calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avlyst en oppgave."
 
-#: calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "Avlysning av oppgave"
 
-#: calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> forespør din ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt forespørsel"
 
-#: calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svart på en forespørsel etter ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: calendar/gui/e-itip-control.c:1551
+#: ../calendar/gui/e-itip-control.c:1551
 msgid "The message does not appear to be properly formed"
 msgstr "Meldingen ser ikke ut til å være riktig utformet"
 
-#: calendar/gui/e-itip-control.c:1610
+#: ../calendar/gui/e-itip-control.c:1610
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder forespørsler som ikke er støttet."
 
-#: calendar/gui/e-itip-control.c:1643
+#: ../calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1675
+#: ../calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1909
+#: ../calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "Oppdatering fullført\n"
 
-#: calendar/gui/e-itip-control.c:1937
+#: ../calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikke oppdateres\n"
 
-#: calendar/gui/e-itip-control.c:1947
+#: ../calendar/gui/e-itip-control.c:1947
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
 
-#: calendar/gui/e-itip-control.c:1959
+#: ../calendar/gui/e-itip-control.c:1959
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1976
+#: ../calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1979
-#: plugins/itip-formatter/itip-formatter.c:844
+#: ../calendar/gui/e-itip-control.c:1979
+#: ../plugins/itip-formatter/itip-formatter.c:845
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
 
-#: calendar/gui/e-itip-control.c:2006
+#: ../calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr "Fjerning fullført"
 
-#: calendar/gui/e-itip-control.c:2029 calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2029 ../calendar/gui/e-itip-control.c:2077
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2081
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:2161
+#: ../calendar/gui/e-itip-control.c:2161
 msgid "Choose an action:"
 msgstr "Velg en handling:"
 
-#: calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2232
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2261
 msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
-#: calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2262
 msgid "Decline"
 msgstr "Avslå"
 
-#: calendar/gui/e-itip-control.c:2291
+#: ../calendar/gui/e-itip-control.c:2291
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-itip-control.c:2319
 msgid "Update respondent status"
 msgstr "Oppdater status for respondent"
 
-#: calendar/gui/e-itip-control.c:2347
+#: ../calendar/gui/e-itip-control.c:2347
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: calendar/gui/e-itip-control.c:2375 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:408 mail/mail-send-recv.c:460
-#: ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:442
+#: ../mail/mail-send-recv.c:408 ../mail/mail-send-recv.c:460
+#: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
 msgstr "%P %%"
 
-#: calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--til--"
 
-#: calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Kalendermelding"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Dato:"
 
-#: calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Laster kalender"
 
-#: calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Laster kalender..."
 
-#: calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Tjenermelding:"
 
-#: calendar/gui/e-itip-control.glade.h:12
+#: ../calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "slutt-dato"
 
-#: calendar/gui/e-itip-control.glade.h:13
+#: ../calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-list-view.c:59
+#: ../calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:124
+#: ../calendar/gui/e-meeting-list-view.c:60
+#: ../calendar/gui/e-meeting-list-view.c:124
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
-#: calendar/gui/e-meeting-list-view.c:61
+#: ../calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: ../calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Ressurser"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:99
-#: calendar/gui/e-meeting-store.c:116 calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-list-view.c:135
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:101
-#: calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-list-view.c:136
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:103
-#: calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-list-view.c:137
+#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "Ressurs"
 
-#: calendar/gui/e-meeting-list-view.c:138 calendar/gui/e-meeting-store.c:105
-#: calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-list-view.c:138
+#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "Rom"
 
-#: calendar/gui/e-meeting-list-view.c:149 calendar/gui/e-meeting-store.c:134
-#: calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-list-view.c:149
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "Styremedlem"
 
-#: calendar/gui/e-meeting-list-view.c:150 calendar/gui/e-meeting-store.c:136
-#: calendar/gui/e-meeting-store.c:153 calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-list-view.c:150
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
-#: calendar/gui/e-meeting-list-view.c:151 calendar/gui/e-meeting-store.c:138
-#: calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: calendar/gui/e-meeting-list-view.c:152 calendar/gui/e-meeting-store.c:140
-#: calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-list-view.c:152
+#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: calendar/gui/e-meeting-list-view.c:174 calendar/gui/e-meeting-store.c:186
-#: calendar/gui/e-meeting-store.c:209 calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "Trenger handling"
 
-#: calendar/gui/e-meeting-list-view.c:177 calendar/gui/e-meeting-store.c:192
-#: calendar/gui/e-meeting-store.c:215 calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: calendar/gui/e-meeting-list-view.c:178 calendar/gui/e-meeting-store.c:194
-#: calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 msgid "Delegated"
 msgstr "Delegert"
 
-#: calendar/gui/e-meeting-store.c:198 calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: calendar/gui/e-meeting-time-sel.c:413 designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ute"
 
-#: calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2104
-#: calendar/gui/e-meeting-time-sel-item.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:2104
+#: ../calendar/gui/e-meeting-time-sel-item.c:444
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -6866,9 +7025,9 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2137
-#: calendar/gui/e-meeting-time-sel-item.c:448 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:448 ../e-util/e-time-utils.c:203
+#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -6878,17 +7037,17 @@ msgstr "%a %d.%m.%Y"
 #. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
+#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1660
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-pub-utils.c:300
+#: ../calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Oppgi passord for %s"
 
-#: calendar/gui/e-tasks.c:734 calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/e-tasks.c:734 ../calendar/gui/gnome-cal.c:2429
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6897,236 +7056,236 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:782
+#: ../calendar/gui/e-tasks.c:782
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: calendar/gui/e-tasks.c:864
+#: ../calendar/gui/e-tasks.c:864
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1061
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:1084
+#: ../calendar/gui/e-tasks.c:1084
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:1111
+#: ../calendar/gui/e-tasks.c:1111
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/e-tasks.c:1189
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/print.c:1822 calendar/gui/tasks-component.c:408
-#: calendar/gui/tasks-component.c:881 calendar/gui/tasks-control.c:410
-#: calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:709
-#: plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../calendar/gui/e-tasks.c:1189
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: ../calendar/gui/print.c:1822 ../calendar/gui/tasks-component.c:408
+#: ../calendar/gui/tasks-component.c:881 ../calendar/gui/tasks-control.c:408
+#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:701
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: calendar/gui/e-timezone-entry.c:133
+#: ../calendar/gui/e-timezone-entry.c:133
 msgid "Timezone Button"
 msgstr "Tidssone-knapp"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:329 calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:718
+#: ../calendar/gui/gnome-cal.c:718
 msgid "Updating query"
 msgstr "Oppdaterer spørring"
 
 #. bonobo displays this string so it must be in locale
-#: calendar/gui/gnome-cal.c:2040 widgets/menus/gal-view-menus.c:351
+#: ../calendar/gui/gnome-cal.c:2040 ../widgets/menus/gal-view-menus.c:351
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: calendar/gui/gnome-cal.c:2041
+#: ../calendar/gui/gnome-cal.c:2041
 msgid "Save Custom View"
 msgstr "Lagre egendefinert visning"
 
-#: calendar/gui/gnome-cal.c:2046 widgets/menus/gal-view-menus.c:373
+#: ../calendar/gui/gnome-cal.c:2046 ../widgets/menus/gal-view-menus.c:373
 msgid "Define Views..."
 msgstr "Definer visninger..."
 
-#: calendar/gui/gnome-cal.c:2206
+#: ../calendar/gui/gnome-cal.c:2206
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Laster avtaler på %s"
 
-#: calendar/gui/gnome-cal.c:2225
+#: ../calendar/gui/gnome-cal.c:2225
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Laster oppgaver på %s"
 
-#: calendar/gui/gnome-cal.c:2318
+#: ../calendar/gui/gnome-cal.c:2318
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: calendar/gui/gnome-cal.c:3286
+#: ../calendar/gui/gnome-cal.c:3286
 msgid "Purging"
 msgstr "Sletter"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolution kalender og oppgaver"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Konfigurasjonskontroll for Evolution kalender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visning for møteplanlegging i Evolution kalender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Redigering av kalender/oppgaver for Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Evolution kalenderkomponent"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Tasks component"
 msgstr "Oppgavekomponent for Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Kalendere"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: views/tasks/galview.xml.h:3
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
 
-#: calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "August"
 
-#: calendar/gui/goto-dialog.glade.h:3
+#: ../calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "Desember"
 
-#: calendar/gui/goto-dialog.glade.h:4
+#: ../calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Februar"
 
-#: calendar/gui/goto-dialog.glade.h:5
+#: ../calendar/gui/goto-dialog.glade.h:5
 msgid "January"
 msgstr "Januar"
 
-#: calendar/gui/goto-dialog.glade.h:6
+#: ../calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:7
+#: ../calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: ../calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Mars"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: ../calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: ../calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: ../calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Oktober"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
 msgstr "Velg dato"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Velg i dag"
 
-#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
-#: calendar/gui/itip-utils.c:351
+#: ../calendar/gui/itip-utils.c:271 ../calendar/gui/itip-utils.c:319
+#: ../calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: calendar/gui/itip-utils.c:306
+#: ../calendar/gui/itip-utils.c:306
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: ../calendar/gui/itip-utils.c:394 ../calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
+#: ../calendar/gui/itip-utils.c:396 ../calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
+#: ../calendar/gui/itip-utils.c:398 ../calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
+#: ../calendar/gui/itip-utils.c:400 ../calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:402
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: calendar/gui/itip-utils.c:438
+#: ../calendar/gui/itip-utils.c:438
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: calendar/gui/itip-utils.c:446
+#: ../calendar/gui/itip-utils.c:446
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:450
+#: ../calendar/gui/itip-utils.c:450
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: calendar/gui/itip-utils.c:521
+#: ../calendar/gui/itip-utils.c:521
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: calendar/gui/itip-utils.c:531
+#: ../calendar/gui/itip-utils.c:531
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: calendar/gui/itip-utils.c:673
+#: ../calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: calendar/gui/migration.c:151
+#: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -7138,7 +7297,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:155
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -7150,331 +7309,327 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: calendar/gui/migration.c:381
+#: ../calendar/gui/migration.c:381
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdager og jubileum"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:479 calendar/gui/migration.c:572
+#: ../calendar/gui/migration.c:479 ../calendar/gui/migration.c:572
 msgid "On The Web"
 msgstr "På nettet"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:738 calendar/gui/migration.c:905
+#: ../calendar/gui/migration.c:738 ../calendar/gui/migration.c:905
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Kan ikke migrere gamle innstillinger fra evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:767
+#: ../calendar/gui/migration.c:767
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kan ikke migrere kalender «%s»"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:934
+#: ../calendar/gui/migration.c:934
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan ikke migrere oppgaver «%s»"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:492
+#: ../calendar/gui/print.c:492
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:493
+#: ../calendar/gui/print.c:493
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:494
+#: ../calendar/gui/print.c:494
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:495
+#: ../calendar/gui/print.c:495
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:496
+#: ../calendar/gui/print.c:496
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:497
+#: ../calendar/gui/print.c:497
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:498
+#: ../calendar/gui/print.c:498
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Su"
 msgstr "Sø."
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Mo"
 msgstr "Ma."
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "Tu"
 msgstr "Ti."
 
-#: calendar/gui/print.c:573
+#: ../calendar/gui/print.c:573
 msgid "We"
 msgstr "On."
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Th"
 msgstr "To."
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Fr"
 msgstr "Fr."
 
-#: calendar/gui/print.c:574
+#: ../calendar/gui/print.c:574
 msgid "Sa"
 msgstr "Lø."
 
 #. Day
-#: calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1942 calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1947 calendar/gui/print.c:1949
-#: calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Valgt måned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2359
+#: ../calendar/gui/print.c:2359
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2376
+#: ../calendar/gui/print.c:2376
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2414
+#: ../calendar/gui/print.c:2414
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2425
+#: ../calendar/gui/print.c:2425
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2562 calendar/gui/print.c:2648
-#: calendar/gui/print.c:2740 mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2565 ../calendar/gui/print.c:2653
+#: ../calendar/gui/print.c:2779 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: calendar/gui/print.c:2596
+#: ../calendar/gui/print.c:2600
 msgid "Print Item"
 msgstr "Skriv ut oppføring"
 
-#: calendar/gui/print.c:2762
-msgid "Print Setup"
-msgstr "Skriveroppsett"
-
-#: calendar/gui/tasks-component.c:328
+#: ../calendar/gui/tasks-component.c:328
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: calendar/gui/tasks-component.c:404
+#: ../calendar/gui/tasks-component.c:404
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: calendar/gui/tasks-component.c:406 mail/mail-component.c:523
+#: ../calendar/gui/tasks-component.c:406 ../mail/mail-component.c:523
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valgt"
 msgstr[1] ", %d valgt"
 
-#: calendar/gui/tasks-component.c:453
+#: ../calendar/gui/tasks-component.c:453
 msgid "Failed upgrading tasks."
 msgstr "Feil under oppgradering av oppgaver."
 
-#: calendar/gui/tasks-component.c:747
+#: ../calendar/gui/tasks-component.c:747
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne oppgaveliste «%s» for oppretting av hendelser og møter"
 
-#: calendar/gui/tasks-component.c:762
+#: ../calendar/gui/tasks-component.c:762
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
-#: calendar/gui/tasks-component.c:856
+#: ../calendar/gui/tasks-component.c:856
 msgid "Task Source Selector"
 msgstr "Valgt av oppgavekilde"
 
-#: calendar/gui/tasks-component.c:1039
+#: ../calendar/gui/tasks-component.c:1039
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/tasks-component.c:1040
+#: ../calendar/gui/tasks-component.c:1040
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: calendar/gui/tasks-component.c:1041
+#: ../calendar/gui/tasks-component.c:1041
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: calendar/gui/tasks-component.c:1047
+#: ../calendar/gui/tasks-component.c:1047
 msgid "New assigned task"
 msgstr "Ny tildelt oppgave"
 
-#: calendar/gui/tasks-component.c:1048
+#: ../calendar/gui/tasks-component.c:1048
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
-#: calendar/gui/tasks-component.c:1049
+#: ../calendar/gui/tasks-component.c:1049
 msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
-#: calendar/gui/tasks-component.c:1055
+#: ../calendar/gui/tasks-component.c:1055
 msgid "New task list"
 msgstr "Ny oppgaveliste"
 
-#: calendar/gui/tasks-component.c:1056
+#: ../calendar/gui/tasks-component.c:1056
 msgid "Task l_ist"
 msgstr "Oppgave_liste"
 
-#: calendar/gui/tasks-component.c:1057
+#: ../calendar/gui/tasks-component.c:1057
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
-#: calendar/gui/tasks-control.c:372
+#: ../calendar/gui/tasks-control.c:370
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7486,52 +7641,52 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: calendar/gui/tasks-control.c:375
+#: ../calendar/gui/tasks-control.c:373
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
-#: calendar/gui/tasks-control.c:433
+#: ../calendar/gui/tasks-control.c:408
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
 #. The first letter of each day of the week starting with Sunday
-#: calendar/gui/weekday-picker.c:319
+#: ../calendar/gui/weekday-picker.c:319
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligent import for Evolution kalender"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar-import"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar-import"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-filer (.ics)"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:82
+#: ../calendar/importers/icalendar-importer.c:82
 msgid "Appointments and Meetings"
 msgstr "Avtaler og møter"
 
-#: calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:486
 msgid "Reminder!!"
 msgstr "Påminnelse!!"
 
-#: calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:694
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
 
-#: calendar/importers/icalendar-importer.c:727
+#: ../calendar/importers/icalendar-importer.c:719
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -7544,1595 +7699,1539 @@ msgstr ""
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: calendar/zones.h:7
+#: ../calendar/zones.h:7
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidjan"
 
-#: calendar/zones.h:8
+#: ../calendar/zones.h:8
 msgid "Africa/Accra"
 msgstr "Afrika/Akkra"
 
-#: calendar/zones.h:9
+#: ../calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Addis_Abeba"
 
-#: calendar/zones.h:10
+#: ../calendar/zones.h:10
 msgid "Africa/Algiers"
 msgstr "Afrika/Algier"
 
-#: calendar/zones.h:11
+#: ../calendar/zones.h:11
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: calendar/zones.h:12
+#: ../calendar/zones.h:12
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: calendar/zones.h:13
+#: ../calendar/zones.h:13
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: calendar/zones.h:14
+#: ../calendar/zones.h:14
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: calendar/zones.h:15
+#: ../calendar/zones.h:15
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: calendar/zones.h:16
+#: ../calendar/zones.h:16
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: calendar/zones.h:17
+#: ../calendar/zones.h:17
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: calendar/zones.h:18
+#: ../calendar/zones.h:18
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: calendar/zones.h:19
+#: ../calendar/zones.h:19
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: calendar/zones.h:20
+#: ../calendar/zones.h:20
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: calendar/zones.h:21
+#: ../calendar/zones.h:21
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: calendar/zones.h:22
+#: ../calendar/zones.h:22
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: calendar/zones.h:23
+#: ../calendar/zones.h:23
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: calendar/zones.h:24
+#: ../calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_salaam"
 
-#: calendar/zones.h:25
+#: ../calendar/zones.h:25
 msgid "Africa/Djibouti"
 msgstr "Afrika/Djibouti"
 
-#: calendar/zones.h:26
+#: ../calendar/zones.h:26
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: calendar/zones.h:27
+#: ../calendar/zones.h:27
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: calendar/zones.h:28
+#: ../calendar/zones.h:28
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: calendar/zones.h:29
+#: ../calendar/zones.h:29
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: calendar/zones.h:30
+#: ../calendar/zones.h:30
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: calendar/zones.h:31
+#: ../calendar/zones.h:31
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: calendar/zones.h:32
+#: ../calendar/zones.h:32
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: calendar/zones.h:33
+#: ../calendar/zones.h:33
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: calendar/zones.h:34
+#: ../calendar/zones.h:34
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: calendar/zones.h:35
+#: ../calendar/zones.h:35
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: calendar/zones.h:36
+#: ../calendar/zones.h:36
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: calendar/zones.h:37
+#: ../calendar/zones.h:37
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: calendar/zones.h:38
+#: ../calendar/zones.h:38
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: calendar/zones.h:39
+#: ../calendar/zones.h:39
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: calendar/zones.h:40
+#: ../calendar/zones.h:40
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: calendar/zones.h:41
+#: ../calendar/zones.h:41
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: calendar/zones.h:42
+#: ../calendar/zones.h:42
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: calendar/zones.h:43
+#: ../calendar/zones.h:43
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: calendar/zones.h:44
+#: ../calendar/zones.h:44
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: calendar/zones.h:45
+#: ../calendar/zones.h:45
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: calendar/zones.h:46
+#: ../calendar/zones.h:46
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: calendar/zones.h:47
+#: ../calendar/zones.h:47
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: calendar/zones.h:48
+#: ../calendar/zones.h:48
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: calendar/zones.h:49
+#: ../calendar/zones.h:49
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: calendar/zones.h:50
+#: ../calendar/zones.h:50
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: calendar/zones.h:51
+#: ../calendar/zones.h:51
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: calendar/zones.h:52
+#: ../calendar/zones.h:52
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: calendar/zones.h:53
+#: ../calendar/zones.h:53
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: calendar/zones.h:54
+#: ../calendar/zones.h:54
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: calendar/zones.h:55
+#: ../calendar/zones.h:55
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: calendar/zones.h:56
+#: ../calendar/zones.h:56
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: calendar/zones.h:57
+#: ../calendar/zones.h:57
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: calendar/zones.h:58
+#: ../calendar/zones.h:58
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: calendar/zones.h:59
+#: ../calendar/zones.h:59
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: calendar/zones.h:60
+#: ../calendar/zones.h:60
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: calendar/zones.h:61
+#: ../calendar/zones.h:61
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: calendar/zones.h:62
+#: ../calendar/zones.h:62
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: calendar/zones.h:63
+#: ../calendar/zones.h:63
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: calendar/zones.h:64
+#: ../calendar/zones.h:64
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: calendar/zones.h:65
+#: ../calendar/zones.h:65
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: calendar/zones.h:66
+#: ../calendar/zones.h:66
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: calendar/zones.h:67
+#: ../calendar/zones.h:67
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: calendar/zones.h:68
+#: ../calendar/zones.h:68
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: calendar/zones.h:69
+#: ../calendar/zones.h:69
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: calendar/zones.h:70
+#: ../calendar/zones.h:70
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: calendar/zones.h:71
+#: ../calendar/zones.h:71
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: calendar/zones.h:72
+#: ../calendar/zones.h:72
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: calendar/zones.h:73
+#: ../calendar/zones.h:73
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: calendar/zones.h:74
+#: ../calendar/zones.h:74
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: calendar/zones.h:75
+#: ../calendar/zones.h:75
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: calendar/zones.h:76
+#: ../calendar/zones.h:76
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: calendar/zones.h:77
+#: ../calendar/zones.h:77
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: calendar/zones.h:78
+#: ../calendar/zones.h:78
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: calendar/zones.h:79
+#: ../calendar/zones.h:79
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: calendar/zones.h:80
+#: ../calendar/zones.h:80
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: calendar/zones.h:81
+#: ../calendar/zones.h:81
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: calendar/zones.h:82
+#: ../calendar/zones.h:82
 msgid "America/Costa_Rica"
 msgstr "Amerika/Costa_Rica"
 
-#: calendar/zones.h:83
+#: ../calendar/zones.h:83
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: calendar/zones.h:84
+#: ../calendar/zones.h:84
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: calendar/zones.h:85
+#: ../calendar/zones.h:85
 msgid "America/Danmarkshavn"
 msgstr "Amerika/Danmarkshavn"
 
-#: calendar/zones.h:86
+#: ../calendar/zones.h:86
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: calendar/zones.h:87
+#: ../calendar/zones.h:87
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: calendar/zones.h:88
+#: ../calendar/zones.h:88
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: calendar/zones.h:89
+#: ../calendar/zones.h:89
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: calendar/zones.h:90
+#: ../calendar/zones.h:90
 msgid "America/Dominica"
 msgstr "Amerika/Dominika"
 
-#: calendar/zones.h:91
+#: ../calendar/zones.h:91
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: calendar/zones.h:92
+#: ../calendar/zones.h:92
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: calendar/zones.h:93
+#: ../calendar/zones.h:93
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: calendar/zones.h:94
+#: ../calendar/zones.h:94
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: calendar/zones.h:95
+#: ../calendar/zones.h:95
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: calendar/zones.h:96
+#: ../calendar/zones.h:96
 msgid "America/Godthab"
 msgstr "Amerika/Kapp_det_gode_håp"
 
-#: calendar/zones.h:97
+#: ../calendar/zones.h:97
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: calendar/zones.h:98
+#: ../calendar/zones.h:98
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: calendar/zones.h:99
+#: ../calendar/zones.h:99
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: calendar/zones.h:100
+#: ../calendar/zones.h:100
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: calendar/zones.h:101
+#: ../calendar/zones.h:101
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: calendar/zones.h:102
+#: ../calendar/zones.h:102
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: calendar/zones.h:103
+#: ../calendar/zones.h:103
 msgid "America/Guyana"
 msgstr "Amerika/Guyana"
 
-#: calendar/zones.h:104
+#: ../calendar/zones.h:104
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: calendar/zones.h:105
+#: ../calendar/zones.h:105
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: calendar/zones.h:106
+#: ../calendar/zones.h:106
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: calendar/zones.h:107
+#: ../calendar/zones.h:107
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: calendar/zones.h:108
+#: ../calendar/zones.h:108
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: calendar/zones.h:109
+#: ../calendar/zones.h:109
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: calendar/zones.h:110
+#: ../calendar/zones.h:110
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: calendar/zones.h:111
+#: ../calendar/zones.h:111
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: calendar/zones.h:112
+#: ../calendar/zones.h:112
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: calendar/zones.h:113
+#: ../calendar/zones.h:113
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: calendar/zones.h:114
+#: ../calendar/zones.h:114
 msgid "America/Jamaica"
 msgstr "Amerika/Jamaica"
 
-#: calendar/zones.h:115
+#: ../calendar/zones.h:115
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: calendar/zones.h:116
+#: ../calendar/zones.h:116
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: calendar/zones.h:117
+#: ../calendar/zones.h:117
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: calendar/zones.h:118
+#: ../calendar/zones.h:118
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: calendar/zones.h:119
+#: ../calendar/zones.h:119
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: calendar/zones.h:120
+#: ../calendar/zones.h:120
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: calendar/zones.h:121
+#: ../calendar/zones.h:121
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: calendar/zones.h:122
+#: ../calendar/zones.h:122
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: calendar/zones.h:123
+#: ../calendar/zones.h:123
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: calendar/zones.h:124
+#: ../calendar/zones.h:124
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: calendar/zones.h:125
+#: ../calendar/zones.h:125
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: calendar/zones.h:126
+#: ../calendar/zones.h:126
 msgid "America/Martinique"
 msgstr "Amerika/Martinique"
 
-#: calendar/zones.h:127
+#: ../calendar/zones.h:127
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: calendar/zones.h:128
+#: ../calendar/zones.h:128
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: calendar/zones.h:129
+#: ../calendar/zones.h:129
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: calendar/zones.h:130
+#: ../calendar/zones.h:130
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: calendar/zones.h:131
+#: ../calendar/zones.h:131
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: calendar/zones.h:132
+#: ../calendar/zones.h:132
 msgid "America/Miquelon"
 msgstr "America/Miquelon"
 
-#: calendar/zones.h:133
+#: ../calendar/zones.h:133
 msgid "America/Monterrey"
 msgstr "Amerika/Menterrey"
 
-#: calendar/zones.h:134
+#: ../calendar/zones.h:134
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: calendar/zones.h:135
+#: ../calendar/zones.h:135
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: calendar/zones.h:136
+#: ../calendar/zones.h:136
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: calendar/zones.h:137
+#: ../calendar/zones.h:137
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: calendar/zones.h:138 widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../calendar/zones.h:138
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: calendar/zones.h:139
+#: ../calendar/zones.h:139
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: calendar/zones.h:140
+#: ../calendar/zones.h:140
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: calendar/zones.h:141
+#: ../calendar/zones.h:141
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: calendar/zones.h:142
+#: ../calendar/zones.h:142
 msgid "America/North_Dakota/Center"
 msgstr "Amerika/North_Dakota/Center"
 
-#: calendar/zones.h:143
+#: ../calendar/zones.h:143
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: calendar/zones.h:144
+#: ../calendar/zones.h:144
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: calendar/zones.h:145
+#: ../calendar/zones.h:145
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: calendar/zones.h:146
+#: ../calendar/zones.h:146
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: calendar/zones.h:147
+#: ../calendar/zones.h:147
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: calendar/zones.h:148
+#: ../calendar/zones.h:148
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: calendar/zones.h:149
+#: ../calendar/zones.h:149
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: calendar/zones.h:150
+#: ../calendar/zones.h:150
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Puerto_Rico"
 
-#: calendar/zones.h:151
+#: ../calendar/zones.h:151
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: calendar/zones.h:152
+#: ../calendar/zones.h:152
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: calendar/zones.h:153
+#: ../calendar/zones.h:153
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: calendar/zones.h:154
+#: ../calendar/zones.h:154
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: calendar/zones.h:155
+#: ../calendar/zones.h:155
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: calendar/zones.h:156
+#: ../calendar/zones.h:156
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: calendar/zones.h:157
+#: ../calendar/zones.h:157
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: calendar/zones.h:158
+#: ../calendar/zones.h:158
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: calendar/zones.h:159
+#: ../calendar/zones.h:159
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: calendar/zones.h:160
+#: ../calendar/zones.h:160
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: calendar/zones.h:161
+#: ../calendar/zones.h:161
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: calendar/zones.h:162
+#: ../calendar/zones.h:162
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: calendar/zones.h:163
+#: ../calendar/zones.h:163
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: calendar/zones.h:164
+#: ../calendar/zones.h:164
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: calendar/zones.h:165
+#: ../calendar/zones.h:165
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: calendar/zones.h:166
+#: ../calendar/zones.h:166
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: calendar/zones.h:167
+#: ../calendar/zones.h:167
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: calendar/zones.h:168
+#: ../calendar/zones.h:168
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: calendar/zones.h:169
+#: ../calendar/zones.h:169
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: calendar/zones.h:170
+#: ../calendar/zones.h:170
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: calendar/zones.h:171
+#: ../calendar/zones.h:171
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: calendar/zones.h:172
+#: ../calendar/zones.h:172
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: calendar/zones.h:173
+#: ../calendar/zones.h:173
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: calendar/zones.h:174
+#: ../calendar/zones.h:174
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: calendar/zones.h:175
+#: ../calendar/zones.h:175
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: calendar/zones.h:176
+#: ../calendar/zones.h:176
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: calendar/zones.h:177
+#: ../calendar/zones.h:177
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: calendar/zones.h:178
+#: ../calendar/zones.h:178
 msgid "Antarctica/Casey"
 msgstr "Antarktis/Casey"
 
-#: calendar/zones.h:179
+#: ../calendar/zones.h:179
 msgid "Antarctica/Davis"
 msgstr "Antarktis/Davis"
 
-#: calendar/zones.h:180
+#: ../calendar/zones.h:180
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktis/DumontDUrville"
 
-#: calendar/zones.h:181
+#: ../calendar/zones.h:181
 msgid "Antarctica/Mawson"
 msgstr "Antarktis/Mawson"
 
-#: calendar/zones.h:182
+#: ../calendar/zones.h:182
 msgid "Antarctica/McMurdo"
 msgstr "Antarktis/McMurdo"
 
-#: calendar/zones.h:183
+#: ../calendar/zones.h:183
 msgid "Antarctica/Palmer"
 msgstr "Antarktis/Palmer"
 
-#: calendar/zones.h:184
+#: ../calendar/zones.h:184
 msgid "Antarctica/South_Pole"
 msgstr "Antarktis/Sydpolen"
 
-#: calendar/zones.h:185
+#: ../calendar/zones.h:185
 msgid "Antarctica/Syowa"
 msgstr "Antarktis/Syowa"
 
-#: calendar/zones.h:186
+#: ../calendar/zones.h:186
 msgid "Antarctica/Vostok"
 msgstr "Antarktis/Vostok"
 
-#: calendar/zones.h:187
+#: ../calendar/zones.h:187
 msgid "Arctic/Longyearbyen"
 msgstr "Arktis/Longyearbyen"
 
-#: calendar/zones.h:188
+#: ../calendar/zones.h:188
 msgid "Asia/Aden"
 msgstr "Asia/Aden"
 
-#: calendar/zones.h:189
+#: ../calendar/zones.h:189
 msgid "Asia/Almaty"
 msgstr "Asia/Almaty"
 
-#: calendar/zones.h:190
+#: ../calendar/zones.h:190
 msgid "Asia/Amman"
 msgstr "Asia/Amman"
 
-#: calendar/zones.h:191
+#: ../calendar/zones.h:191
 msgid "Asia/Anadyr"
 msgstr "Asia/Anadyr"
 
-#: calendar/zones.h:192
+#: ../calendar/zones.h:192
 msgid "Asia/Aqtau"
 msgstr "Asia/Aqtau"
 
-#: calendar/zones.h:193
+#: ../calendar/zones.h:193
 msgid "Asia/Aqtobe"
 msgstr "Asia/Aqtobe"
 
-#: calendar/zones.h:194
+#: ../calendar/zones.h:194
 msgid "Asia/Ashgabat"
 msgstr "Asia/Ashgabat"
 
-#: calendar/zones.h:195
+#: ../calendar/zones.h:195
 msgid "Asia/Baghdad"
 msgstr "Asia/Bagdad"
 
-#: calendar/zones.h:196
+#: ../calendar/zones.h:196
 msgid "Asia/Bahrain"
 msgstr "Asia/Bahrain"
 
-#: calendar/zones.h:197
+#: ../calendar/zones.h:197
 msgid "Asia/Baku"
 msgstr "Asia/Bakuc"
 
-#: calendar/zones.h:198
+#: ../calendar/zones.h:198
 msgid "Asia/Bangkok"
 msgstr "Asia/Bangkok"
 
-#: calendar/zones.h:199
+#: ../calendar/zones.h:199
 msgid "Asia/Beirut"
 msgstr "Asia/Beirut"
 
-#: calendar/zones.h:200
+#: ../calendar/zones.h:200
 msgid "Asia/Bishkek"
 msgstr "Asia/Bishkek"
 
-#: calendar/zones.h:201
+#: ../calendar/zones.h:201
 msgid "Asia/Brunei"
 msgstr "Asia/Brunei"
 
-#: calendar/zones.h:202
+#: ../calendar/zones.h:202
 msgid "Asia/Calcutta"
 msgstr "Asia/Calcutta"
 
-#: calendar/zones.h:203
+#: ../calendar/zones.h:203
 msgid "Asia/Choibalsan"
 msgstr "Asia/Choibalsan"
 
-#: calendar/zones.h:204
+#: ../calendar/zones.h:204
 msgid "Asia/Chongqing"
 msgstr "Asia Chongqing"
 
-#: calendar/zones.h:205
+#: ../calendar/zones.h:205
 msgid "Asia/Colombo"
 msgstr "Asia/Colombo"
 
-#: calendar/zones.h:206
+#: ../calendar/zones.h:206
 msgid "Asia/Damascus"
 msgstr "Asia/Damaskus"
 
-#: calendar/zones.h:207
+#: ../calendar/zones.h:207
 msgid "Asia/Dhaka"
 msgstr "Asia/Dhaka"
 
-#: calendar/zones.h:208
+#: ../calendar/zones.h:208
 msgid "Asia/Dili"
 msgstr "Asia/Dili"
 
-#: calendar/zones.h:209
+#: ../calendar/zones.h:209
 msgid "Asia/Dubai"
 msgstr "Asia/Dubai"
 
-#: calendar/zones.h:210
+#: ../calendar/zones.h:210
 msgid "Asia/Dushanbe"
 msgstr "Asia/Dushanbe"
 
-#: calendar/zones.h:211
+#: ../calendar/zones.h:211
 msgid "Asia/Gaza"
 msgstr "Asia/Gaza"
 
-#: calendar/zones.h:212
+#: ../calendar/zones.h:212
 msgid "Asia/Harbin"
 msgstr "Asia/Harbin"
 
-#: calendar/zones.h:213
+#: ../calendar/zones.h:213
 msgid "Asia/Hong_Kong"
 msgstr "Asia/Hong_Kong"
 
-#: calendar/zones.h:214
+#: ../calendar/zones.h:214
 msgid "Asia/Hovd"
 msgstr "Asia/Hovd"
 
-#: calendar/zones.h:215
+#: ../calendar/zones.h:215
 msgid "Asia/Irkutsk"
 msgstr "Asia/Irkutsk"
 
-#: calendar/zones.h:216
+#: ../calendar/zones.h:216
 msgid "Asia/Istanbul"
 msgstr "Asia/Istanbul"
 
-#: calendar/zones.h:217
+#: ../calendar/zones.h:217
 msgid "Asia/Jakarta"
 msgstr "Asia/Jakarta"
 
-#: calendar/zones.h:218
+#: ../calendar/zones.h:218
 msgid "Asia/Jayapura"
 msgstr "Asia/Jayapura"
 
-#: calendar/zones.h:219
+#: ../calendar/zones.h:219
 msgid "Asia/Jerusalem"
 msgstr "Asia/Jerusalem"
 
-#: calendar/zones.h:220
+#: ../calendar/zones.h:220
 msgid "Asia/Kabul"
 msgstr "Asia/Kabul"
 
-#: calendar/zones.h:221
+#: ../calendar/zones.h:221
 msgid "Asia/Kamchatka"
 msgstr "Asia/Kamchatka"
 
-#: calendar/zones.h:222
+#: ../calendar/zones.h:222
 msgid "Asia/Karachi"
 msgstr "Asia/Karachi"
 
-#: calendar/zones.h:223
+#: ../calendar/zones.h:223
 msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
-#: calendar/zones.h:224
+#: ../calendar/zones.h:224
 msgid "Asia/Katmandu"
 msgstr "Asia/Katmandu"
 
-#: calendar/zones.h:225
+#: ../calendar/zones.h:225
 msgid "Asia/Krasnoyarsk"
 msgstr "Asia/Krasnoyarsk"
 
-#: calendar/zones.h:226
+#: ../calendar/zones.h:226
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asia/Kuala_Lumpur"
 
-#: calendar/zones.h:227
+#: ../calendar/zones.h:227
 msgid "Asia/Kuching"
 msgstr "Asia/Kuching"
 
-#: calendar/zones.h:228
+#: ../calendar/zones.h:228
 msgid "Asia/Kuwait"
 msgstr "Asia/Kuwait"
 
-#: calendar/zones.h:229
+#: ../calendar/zones.h:229
 msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
-#: calendar/zones.h:230
+#: ../calendar/zones.h:230
 msgid "Asia/Macau"
 msgstr "Asia/Mucau"
 
-#: calendar/zones.h:231
+#: ../calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: calendar/zones.h:232
+#: ../calendar/zones.h:232
 msgid "Asia/Makassar"
 msgstr "Asia/Makassar"
 
-#: calendar/zones.h:233
+#: ../calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: calendar/zones.h:234
+#: ../calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: calendar/zones.h:235
+#: ../calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: calendar/zones.h:236
+#: ../calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: calendar/zones.h:237
+#: ../calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: calendar/zones.h:238
+#: ../calendar/zones.h:238
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
-#: calendar/zones.h:239
+#: ../calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: calendar/zones.h:240
+#: ../calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: calendar/zones.h:241
+#: ../calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: calendar/zones.h:242
+#: ../calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: calendar/zones.h:243
+#: ../calendar/zones.h:243
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
-#: calendar/zones.h:244
+#: ../calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: calendar/zones.h:245
+#: ../calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: calendar/zones.h:246
+#: ../calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: calendar/zones.h:247
+#: ../calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: calendar/zones.h:248
+#: ../calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: calendar/zones.h:249
+#: ../calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: calendar/zones.h:250
+#: ../calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: calendar/zones.h:251
+#: ../calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: calendar/zones.h:252
+#: ../calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: calendar/zones.h:253
+#: ../calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: calendar/zones.h:254
+#: ../calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: calendar/zones.h:255
+#: ../calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asia/Teheran"
 
-#: calendar/zones.h:256
+#: ../calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: calendar/zones.h:257
+#: ../calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: calendar/zones.h:258
+#: ../calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: calendar/zones.h:259
+#: ../calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: calendar/zones.h:260
+#: ../calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: calendar/zones.h:261
+#: ../calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: calendar/zones.h:262
+#: ../calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: calendar/zones.h:263
+#: ../calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: calendar/zones.h:264
+#: ../calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: calendar/zones.h:265
+#: ../calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: calendar/zones.h:266
+#: ../calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlanteren/Azorene"
 
-#: calendar/zones.h:267
+#: ../calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantisk/Bermuda"
 
-#: calendar/zones.h:268
+#: ../calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlanteren/Kanariøyene"
 
-#: calendar/zones.h:269
+#: ../calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantisk/Kapp_Verde"
 
-#: calendar/zones.h:270
+#: ../calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlanteren/Færøyene"
 
-#: calendar/zones.h:271
+#: ../calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlanteren/Jan_Mayen"
 
-#: calendar/zones.h:272
+#: ../calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlanteren/Madeira"
 
-#: calendar/zones.h:273
+#: ../calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlanteren/Reykjavik"
 
-#: calendar/zones.h:274
+#: ../calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlanteren/Syd-Georgia"
 
-#: calendar/zones.h:275
+#: ../calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlanteren/St_Helena"
 
-#: calendar/zones.h:276
+#: ../calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlanteren/Stanley"
 
-#: calendar/zones.h:277
+#: ../calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: calendar/zones.h:278
+#: ../calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: calendar/zones.h:279
+#: ../calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: calendar/zones.h:280
+#: ../calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: calendar/zones.h:281
+#: ../calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: calendar/zones.h:282
+#: ../calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: calendar/zones.h:283
+#: ../calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: calendar/zones.h:284
+#: ../calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: calendar/zones.h:285
+#: ../calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: calendar/zones.h:286
+#: ../calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: calendar/zones.h:287
+#: ../calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: calendar/zones.h:288
+#: ../calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:289
+#: ../calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Aten"
 
-#: calendar/zones.h:290
+#: ../calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:291
+#: ../calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Beograd"
 
-#: calendar/zones.h:292
+#: ../calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: calendar/zones.h:293
+#: ../calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:294
+#: ../calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Brussel"
 
-#: calendar/zones.h:295
+#: ../calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukuresti"
 
-#: calendar/zones.h:296
+#: ../calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: calendar/zones.h:297
+#: ../calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: calendar/zones.h:298
+#: ../calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/København"
 
-#: calendar/zones.h:299
+#: ../calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: calendar/zones.h:300
+#: ../calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: calendar/zones.h:301
+#: ../calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: calendar/zones.h:302
+#: ../calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: calendar/zones.h:303
+#: ../calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: calendar/zones.h:304
+#: ../calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: calendar/zones.h:305
+#: ../calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: calendar/zones.h:306
+#: ../calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: calendar/zones.h:307
+#: ../calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: calendar/zones.h:308
+#: ../calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxembourg"
 
-#: calendar/zones.h:309
+#: ../calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: calendar/zones.h:310
+#: ../calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:311
+#: ../calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:312
+#: ../calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: calendar/zones.h:313
+#: ../calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Moskva"
 
-#: calendar/zones.h:314
+#: ../calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: calendar/zones.h:315
+#: ../calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:316
+#: ../calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: calendar/zones.h:317
+#: ../calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Praha"
 
-#: calendar/zones.h:318
+#: ../calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:319
+#: ../calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: calendar/zones.h:320
+#: ../calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:321
+#: ../calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: calendar/zones.h:322
+#: ../calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:323
+#: ../calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: calendar/zones.h:324
+#: ../calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:325
+#: ../calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: calendar/zones.h:326
+#: ../calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: calendar/zones.h:327
+#: ../calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:328
+#: ../calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tirane"
 
-#: calendar/zones.h:329
+#: ../calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: calendar/zones.h:330
+#: ../calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:331
+#: ../calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikanet"
 
-#: calendar/zones.h:332
+#: ../calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Wien"
 
-#: calendar/zones.h:333
+#: ../calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:334
+#: ../calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Warshava"
 
-#: calendar/zones.h:335
+#: ../calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: calendar/zones.h:336
+#: ../calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: calendar/zones.h:337
+#: ../calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Zürich"
 
-#: calendar/zones.h:338
+#: ../calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indiske hav/Antananarivo"
 
-#: calendar/zones.h:339
+#: ../calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indiske hav/Chagos"
 
-#: calendar/zones.h:340
+#: ../calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indiske hav/Juleøya"
 
-#: calendar/zones.h:341
+#: ../calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indiske hav/Cocos"
 
-#: calendar/zones.h:342
+#: ../calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indiske hav/Komorene"
 
-#: calendar/zones.h:343
+#: ../calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indiske hav/Kerguelen"
 
-#: calendar/zones.h:344
+#: ../calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indiske hav/Mahe"
 
-#: calendar/zones.h:345
+#: ../calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indiske hav/Maldivene"
 
-#: calendar/zones.h:346
+#: ../calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indiske hav/Mauritius"
 
-#: calendar/zones.h:347
+#: ../calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indiske hav/Mayotte"
 
-#: calendar/zones.h:348
+#: ../calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indiske hav/Reunion"
 
-#: calendar/zones.h:349
+#: ../calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Stillehavet/Apia"
 
-#: calendar/zones.h:350
+#: ../calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Stillehavet/Auckland"
 
-#: calendar/zones.h:351
+#: ../calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Stillehavet/Chatham"
 
-#: calendar/zones.h:352
+#: ../calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Stillehavet/Påskeøya"
 
-#: calendar/zones.h:353
+#: ../calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Stillehavet/Efate"
 
-#: calendar/zones.h:354
+#: ../calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Stillehavet/Enderbury"
 
-#: calendar/zones.h:355
+#: ../calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Stillehavet/Fakaofo"
 
-#: calendar/zones.h:356
+#: ../calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Stillehavet/Fijiøyene"
 
-#: calendar/zones.h:357
+#: ../calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Stillehavet/Funafuti"
 
-#: calendar/zones.h:358
+#: ../calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Stillehavet/Galapagos"
 
-#: calendar/zones.h:359
+#: ../calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Stillehavet/Gambier"
 
-#: calendar/zones.h:360
+#: ../calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Stillehavet/Guadalcanal"
 
-#: calendar/zones.h:361
+#: ../calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Stillehavet/Guam"
 
-#: calendar/zones.h:362
+#: ../calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Stillehavet/Honolulu"
 
-#: calendar/zones.h:363
+#: ../calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Stillehavet/Johnston"
 
-#: calendar/zones.h:364
+#: ../calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Stillehavet/Kiritimati"
 
-#: calendar/zones.h:365
+#: ../calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Stillehavet/Kosrae"
 
-#: calendar/zones.h:366
+#: ../calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Stillehavet/Kwajalein"
 
-#: calendar/zones.h:367
+#: ../calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Stillehavet/Majuro"
 
-#: calendar/zones.h:368
+#: ../calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Stillehavet/Marquesas"
 
-#: calendar/zones.h:369
+#: ../calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Stillehavet/Midway"
 
-#: calendar/zones.h:370
+#: ../calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Stillehavet/Nauru"
 
-#: calendar/zones.h:371
+#: ../calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Stillehavet/Niue"
 
-#: calendar/zones.h:372
+#: ../calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Stillehavet/Norfolk"
 
-#: calendar/zones.h:373
+#: ../calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Stillehavet/Noumea"
 
-#: calendar/zones.h:374
+#: ../calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Stillehavet/Pago_Pago"
 
-#: calendar/zones.h:375
+#: ../calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Stillehavet/Palau"
 
-#: calendar/zones.h:376
+#: ../calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Stillehavet/Pitcairn"
 
-#: calendar/zones.h:377
+#: ../calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Stillehavet/Ponape"
 
-#: calendar/zones.h:378
+#: ../calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Stillehavet/Port_Moresby"
 
-#: calendar/zones.h:379
+#: ../calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Stillehavet/Rarotonga"
 
-#: calendar/zones.h:380
+#: ../calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Stillehavet/Saipan"
 
-#: calendar/zones.h:381
+#: ../calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Stillehavet/Tahiti"
 
-#: calendar/zones.h:382
+#: ../calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Stillehavet/Tarawa"
 
-#: calendar/zones.h:383
+#: ../calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Stillehavet/Tongatapu"
 
-#: calendar/zones.h:384
+#: ../calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Stillehavet/Truk"
 
-#: calendar/zones.h:385
+#: ../calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Stillehavet/Wake"
 
-#: calendar/zones.h:386
+#: ../calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Stillehavet/Wallis"
 
-#: calendar/zones.h:387
+#: ../calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: composer/e-msg-composer-attachment-bar.c:101
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: composer/e-msg-composer-attachment-bar.c:107
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: composer/e-msg-composer-attachment-bar.c:293 mail/em-utils.c:436
-msgid "attachment"
-msgstr "vedlegg"
-
-#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2762
-#: ui/evolution-mail-list.xml.h:27
-msgid "_Properties"
-msgstr "Egenska_per..."
-
-#: composer/e-msg-composer-attachment-bar.c:443
-msgid "_Add attachment..."
-msgstr "_Legg til vedlegg..."
-
-#: composer/e-msg-composer-attachment.c:174
-#: composer/e-msg-composer-attachment.c:190
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Kan ikke legge ved fil: %s: %s"
-
-#: composer/e-msg-composer-attachment.c:182
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
-
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "Egenskaper for vedlegg"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "File name:"
-msgstr "Filnavn:"
-
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "MIME-type:"
-
-#: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:93
-#: composer/e-msg-composer-select-file.c:112
-msgid "Suggest automatic display of attachment"
-msgstr "Foreslå automatisk visning av vedlegg"
-
-#: composer/e-msg-composer.c:727
+#: ../composer/e-msg-composer.c:727
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: composer/e-msg-composer.c:734
+#: ../composer/e-msg-composer.c:734
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9140,65 +9239,65 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: composer/e-msg-composer.c:1233 composer/e-msg-composer.c:1254
+#: ../composer/e-msg-composer.c:1233 ../composer/e-msg-composer.c:1254
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
-#: composer/e-msg-composer.c:1291
+#: ../composer/e-msg-composer.c:1291
 msgid "Could not open file"
 msgstr "Kunne ikke åpne fil"
 
-#: composer/e-msg-composer.c:1299
+#: ../composer/e-msg-composer.c:1299
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1569
+#: ../composer/e-msg-composer.c:1569
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
-#: composer/e-msg-composer.c:1599
+#: ../composer/e-msg-composer.c:1599
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:2006 mail/em-account-editor.c:578
-#: mail/em-account-editor.c:623 mail/em-account-editor.c:690
+#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:578
+#: ../mail/em-account-editor.c:623 ../mail/em-account-editor.c:690
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: composer/e-msg-composer.c:2105
+#: ../composer/e-msg-composer.c:2105
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: composer/e-msg-composer.c:2364 composer/e-msg-composer.c:3355
-#: composer/e-msg-composer.c:3356
+#: ../composer/e-msg-composer.c:2364 ../composer/e-msg-composer.c:3355
+#: ../composer/e-msg-composer.c:3356
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2671
+#: ../composer/e-msg-composer.c:2671
 #, c-format
 msgid "Attached message - %s"
 msgstr "Vedlagt melding - %s"
 
 #. translators, this count will always be >1
-#: composer/e-msg-composer.c:2676 composer/e-msg-composer.c:2839
+#: ../composer/e-msg-composer.c:2676 ../composer/e-msg-composer.c:2839
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt melding"
 msgstr[1] "%d vedlagte meldinger"
 
-#: composer/e-msg-composer.c:2902 mail/em-folder-tree.c:1037
-#: mail/em-folder-tree.c:2255 mail/em-folder-view.c:823
-#: mail/message-list.c:1713
+#: ../composer/e-msg-composer.c:2902 ../mail/em-folder-tree.c:1037
+#: ../mail/em-folder-tree.c:2263 ../mail/em-folder-view.c:827
+#: ../mail/message-list.c:1713
 msgid "_Move"
 msgstr "_Flytt"
 
-#: composer/e-msg-composer.c:2904 mail/em-folder-tree.c:1039
-#: mail/message-list.c:1715
+#: ../composer/e-msg-composer.c:2904 ../mail/em-folder-tree.c:1039
+#: ../mail/message-list.c:1715
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
-#: composer/e-msg-composer.c:4536
+#: ../composer/e-msg-composer.c:4536
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9206,15 +9305,15 @@ msgstr ""
 "<b>(Redigering inneholder en meldingskropp som ikke er tekst, og derfor ikke "
 "kan redigeres.)<b>"
 
-#: composer/e-msg-composer-hdrs.c:512
+#: ../composer/e-msg-composer-hdrs.c:519
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: composer/e-msg-composer-hdrs.c:513
+#: ../composer/e-msg-composer-hdrs.c:520
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
-#: composer/e-msg-composer-hdrs.c:547
+#: ../composer/e-msg-composer-hdrs.c:554
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
@@ -9225,45 +9324,45 @@ msgstr "Klikk her for å få opp adresseboken"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:577
+#: ../composer/e-msg-composer-hdrs.c:584
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: ../composer/e-msg-composer-hdrs.c:591
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:591
+#: ../composer/e-msg-composer-hdrs.c:598
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: composer/e-msg-composer-hdrs.c:601
+#: ../composer/e-msg-composer-hdrs.c:608
 msgid "_To:"
 msgstr "_Til:"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: ../composer/e-msg-composer-hdrs.c:609
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:605
+#: ../composer/e-msg-composer-hdrs.c:612
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: composer/e-msg-composer-hdrs.c:606
+#: ../composer/e-msg-composer-hdrs.c:613
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:609
+#: ../composer/e-msg-composer-hdrs.c:616
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:610
+#: ../composer/e-msg-composer-hdrs.c:617
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9274,39 +9373,35 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:617
+#: ../composer/e-msg-composer-hdrs.c:624
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: composer/e-msg-composer-hdrs.c:622
+#: ../composer/e-msg-composer-hdrs.c:629
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: composer/e-msg-composer-hdrs.c:628
+#: ../composer/e-msg-composer-hdrs.c:635
 msgid "Post To:"
 msgstr "Post til:"
 
-#: composer/e-msg-composer-select-file.c:187
-msgid "Attach file(s)"
-msgstr "Legg ved fil(er)"
-
 #. mail-composer:no-attach primary
-#: composer/mail-composer-errors.xml.h:2
+#: ../composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Du kan ikke legge ved filen «{0}» i denne meldingen."
 
 #. mail-composer:attach-notfile primary
-#: composer/mail-composer-errors.xml.h:6
+#: ../composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Filen «{0}» er ikke en vanlig fil og kan ikke sendes i en melding."
 
 #. mail-composer:attach-directory primary
-#: composer/mail-composer-errors.xml.h:8
+#: ../composer/mail-composer-errors.xml.h:8
 msgid "Directories can not be attached to Messages."
 msgstr "Kataloger kan ikke legges ved meldinger."
 
 #. mail-composer:attach-directory secondary
-#: composer/mail-composer-errors.xml.h:10
+#: ../composer/mail-composer-errors.xml.h:10
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
@@ -9315,7 +9410,7 @@ msgstr ""
 "hver for seg eller opprette et arkiv av katalogen og legge ved dette."
 
 #. mail-composer:attach-nomessages primary
-#: composer/mail-composer-errors.xml.h:12
+#: ../composer/mail-composer-errors.xml.h:12
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Kunne ikke hente meldinger som skal legges ved fra {0}."
 
@@ -9325,25 +9420,25 @@ msgstr "Kunne ikke hente meldinger som skal legges ved fra {0}."
 #. mail:no-delete-folder secondary
 #. system:no-save-file secondary
 #. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:14
-#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
+#: ../composer/mail-composer-errors.xml.h:14
+#: ../composer/mail-composer-errors.xml.h:42 ../mail/mail-errors.xml.h:105
+#: ../mail/mail-errors.xml.h:117 ../widgets/misc/e-system-errors.xml.h:11
+#: ../widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
 msgstr "pga «{1}»."
 
 #. mail-composer:recover-autosave title
-#: composer/mail-composer-errors.xml.h:16
+#: ../composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Uferdige meldinger funnet"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:18
+#: ../composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Vil du gjenopprette uferdige meldinger?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:20
+#: ../composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -9351,31 +9446,31 @@ msgstr ""
 "Evolution avsluttet uventet mens du skrev en ny melding. Gjenoppretting av "
 "meldingen vil la deg fortsette der du slapp."
 
-#: composer/mail-composer-errors.xml.h:21
+#: ../composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Ikke gjenopprett"
 
-#: composer/mail-composer-errors.xml.h:22
+#: ../composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Gjenopprett"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:24
+#: ../composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Kunne ikke lagre til fil for autolagring: «{0}»."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:26
+#: ../composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Feil under automatisk lagring pga «{1}»."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:28
+#: ../composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:30
+#: ../composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -9383,7 +9478,7 @@ msgstr ""
 "Er du sikker på at du vil forkaste meldingen du skriver med tittel «{0}?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:32
+#: ../composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -9393,53 +9488,53 @@ msgstr ""
 "velger å lagre meldingen i mappen Skisser. Dette vil la deg fortsette å "
 "skrive på meldingen på et senere tidspunkt."
 
-#: composer/mail-composer-errors.xml.h:33
+#: ../composer/mail-composer-errors.xml.h:33
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
-#: composer/mail-composer-errors.xml.h:34
+#: ../composer/mail-composer-errors.xml.h:34
 msgid "_Save Message"
 msgstr "_Lagre melding"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:36
+#: ../composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Kunne ikke opprette melding."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:38
+#: ../composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Pga «{0}» vil du kanskje måtte velge andre alternativer for e-post."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:40
+#: ../composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Kunne ikke lagre signaturfil «{0}»."
 
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:44
+#: ../composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Alle kontoer er fjernet."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:46
+#: ../composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Du må konfigurere en konto før du kan skrive meldinger."
 
 #. mail-composer:no-address-control primary
 #. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:48
-#: composer/mail-composer-errors.xml.h:52
+#: ../composer/mail-composer-errors.xml.h:48
+#: ../composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "Kunne ikke opprette vindu for å skrive melding."
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: ../composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "Klarte ikke å aktivere kontroll for adressevelger."
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:54
+#: ../composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9450,23 +9545,23 @@ msgstr ""
 "Vennligst sjekk at du har installert korrekt versjon av gtkhtml og "
 "libgtkhtml."
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:520
+#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:520
 msgid "Evolution"
 msgstr "Evolution"
 
-#: data/evolution.desktop.in.in.h:2
+#: ../data/evolution.desktop.in.in.h:2
 msgid "The Evolution Groupware Suite"
 msgstr "Gruppevaresuiten Evolution"
 
-#: data/evolution.keys.in.in.h:1
+#: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "adressekort"
 
-#: data/evolution.keys.in.in.h:2
+#: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
-#: designs/OOA/ooa.glade.h:1
+#: ../designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
@@ -9476,15 +9571,16 @@ msgstr ""
 "\n"
 "Ønsker du å endre status til «Inne»?"
 
-#: designs/OOA/ooa.glade.h:4
+#: ../designs/OOA/ooa.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Melding ved fravær:</b>"
 
-#: designs/OOA/ooa.glade.h:5
+#: ../designs/OOA/ooa.glade.h:5
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:106
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b> "
 
-#: designs/OOA/ooa.glade.h:6
+#: ../designs/OOA/ooa.glade.h:6
 msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
@@ -9494,39 +9590,39 @@ msgstr ""
 "deg\n"
 "e-post mens du er borte fra kontoret.</small>"
 
-#: designs/OOA/ooa.glade.h:8
+#: ../designs/OOA/ooa.glade.h:8
 msgid "I am currently in the office"
 msgstr "Jeg er inne"
 
-#: designs/OOA/ooa.glade.h:9
+#: ../designs/OOA/ooa.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Jeg er borte"
 
-#: designs/OOA/ooa.glade.h:10
+#: ../designs/OOA/ooa.glade.h:10
 msgid "No, Don't Change Status"
 msgstr "Nei, ikke endre status"
 
-#: designs/OOA/ooa.glade.h:12
+#: ../designs/OOA/ooa.glade.h:12
 msgid "Out of Office Assistant"
 msgstr "Fraværsassistent"
 
-#: designs/OOA/ooa.glade.h:13
+#: ../designs/OOA/ooa.glade.h:13
 msgid "Yes, Change Status"
 msgstr "Ja, endre status"
 
-#: designs/read_receipts/read.glade.h:1
+#: ../designs/read_receipts/read.glade.h:1
 msgid "      "
 msgstr "      "
 
-#: designs/read_receipts/read.glade.h:2
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>Innkommende e-post</b>"
 
-#: designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
 msgstr "<b>Utgående e-post:</b>"
 
-#: designs/read_receipts/read.glade.h:4
+#: ../designs/read_receipts/read.glade.h:4
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -9538,32 +9634,32 @@ msgstr ""
 "har sendt blir lest, og oppgi hva Evolution skal gjøre når noen ber om en "
 "kvittering ra deg.</small>"
 
-#: designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read reciept"
 msgstr "Alltid send en kvittering tilbake"
 
-#: designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
 msgstr "Spør meg om jeg vil sende en kvittering tilbake"
 
-#: designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
 msgstr "Aldri send en kvittering tilbake"
 
-#: designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
 msgstr "Lesekvittering"
 
-#: designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
 msgstr "Spør etter lesekvittering for alle meldinger jeg sender"
 
-#: designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 "Med mindre meldingen sendes til en e-postliste, og ikke til meg personlig"
 
-#: designs/read_receipts/read.glade.h:12
+#: ../designs/read_receipts/read.glade.h:12
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -9571,7 +9667,7 @@ msgstr ""
 "Hva skal Evolution gjøre når du mottar en e-post med en forespørsel om "
 "lesekvittering?"
 
-#: e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -9580,19 +9676,19 @@ msgstr ""
 "Overskriv den?"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:269 widgets/misc/e-system-errors.xml.h:2
+#: ../e-util/e-dialog-utils.c:269 ../widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:119
 msgid "The orientation of the tray."
 msgstr "Orientering for trauet."
 
-#: e-util/e-passwords.c:468
+#: ../e-util/e-passwords.c:468
 msgid "_Remember this password"
 msgstr "Husk dette passo_rdet"
 
-#: e-util/e-passwords.c:469
+#: ../e-util/e-passwords.c:469
 msgid "_Remember this password for the remainder of this session"
 msgstr "Husk dette passo_rdet for resten av denne sesjonen"
 
@@ -9600,7 +9696,7 @@ msgstr "Husk dette passo_rdet for resten av denne sesjonen"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %H.%M"
 
@@ -9608,65 +9704,65 @@ msgstr "%a %d.%m.%Y %H.%M"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: ../e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d.%m.%Y %H"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: ../e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: ../e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %H.%M.%S"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: ../e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H.%M.%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: ../e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y %H.%M"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: ../e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H.%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: ../e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: ../e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%H.%M.%S"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
@@ -9675,8 +9771,8 @@ msgstr "%H.%M.%S"
 #. strftime format of a time in 12-hour format,
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1431 widgets/misc/e-dateedit.c:1697
+#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
+#: ../widgets/misc/e-dateedit.c:1431 ../widgets/misc/e-dateedit.c:1697
 msgid "%I:%M %p"
 msgstr "%H.%M"
 
@@ -9684,160 +9780,160 @@ msgstr "%H.%M"
 #. strftime format of a time in 24-hour format,
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1694
+#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
+#: ../widgets/misc/e-dateedit.c:1428 ../widgets/misc/e-dateedit.c:1694
 msgid "%H:%M"
 msgstr "%H.%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: ../e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%H"
 
-#: filter/filter-datespec.c:73
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: filter/filter-datespec.c:74
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: filter/filter-datespec.c:75
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 time siden"
 msgstr[1] "%d timer siden"
 
-#: filter/filter-datespec.c:76
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag siden"
 msgstr[1] "%d dager siden"
 
-#: filter/filter-datespec.c:77
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 uke siden"
 msgstr[1] "%d uker siden"
 
-#: filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 måned siden"
 msgstr[1] "%d måneder siden"
 
-#: filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år siden"
 msgstr[1] "%d år siden"
 
-#: filter/filter-datespec.c:280
+#: ../filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
+#: ../filter/filter-datespec.c:283 ../filter/filter-datespec.c:294
 msgid "now"
 msgstr "nå"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: filter/filter-datespec.c:406
+#: ../filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
 #. filter:no-date primary
-#: filter/filter-errors.xml.h:2
+#: ../filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Mangler dato."
 
 #. filter:no-date secondary
-#: filter/filter-errors.xml.h:4
+#: ../filter/filter-errors.xml.h:4
 msgid "You must choose a date."
 msgstr "Du må velge en dato."
 
 #. filter:no-file primary
-#: filter/filter-errors.xml.h:6
+#: ../filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Mangler filnavn."
 
 #. filter:no-file secondary
 #. filter:bad-file secondary
-#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+#: ../filter/filter-errors.xml.h:8 ../filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Du må oppgi et filnavn."
 
 #. filter:bad-file primary
-#: filter/filter-errors.xml.h:10
+#: ../filter/filter-errors.xml.h:10
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Filen «{0}» eksisterer ikke eller er ikke en vanlig fil."
 
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:14
+#: ../filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Ugyldig regulært uttrykk «{0}»."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:16
+#: ../filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "Kunne ikke sette sammen regulært uttrykk «{1}»."
 
 #. filter:no-name primary
 #. mail:no-name-vfolder primary
-#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
+#: ../filter/filter-errors.xml.h:18 ../mail/mail-errors.xml.h:219
 msgid "Missing name."
 msgstr "Mangler navn."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:20
+#: ../filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Du må gi navn til dette filteret."
 
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:22
+#: ../filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "Navn «{0}» er allerede brukt."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:24
+#: ../filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Vennligst velg et annet navn."
 
-#: filter/filter-file.c:288
+#: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Velg en fil"
 
-#: filter/filter.glade.h:1
+#: ../filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filterregler</b>"
 
-#: filter/filter.glade.h:2
+#: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Sammenligne med"
 
-#: filter/filter.glade.h:3 filter/filter-rule.c:975
+#: ../filter/filter.glade.h:3 ../filter/filter-rule.c:975
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: filter/filter.glade.h:4
+#: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
-msgstr ""
+msgstr "Vis filtre for e-post:"
 
-#: filter/filter.glade.h:5
+#: ../filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -9845,7 +9941,7 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "12:00 på spesifiserert dato."
 
-#: filter/filter.glade.h:7
+#: ../filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -9853,7 +9949,7 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "en tid relativ til tiden da filtreringen skjer."
 
-#: filter/filter.glade.h:9
+#: ../filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -9861,113 +9957,114 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "tiden da filtreringen skjer."
 
-#: filter/filter.glade.h:12
+#: ../filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "en tid relativ til tiden nå"
 
-#: filter/filter.glade.h:13
+#: ../filter/filter.glade.h:13
 msgid "ago"
 msgstr "siden"
 
-#: filter/filter.glade.h:17
+#: ../filter/filter.glade.h:17
 msgid "months"
 msgstr "måneder"
 
-#: filter/filter.glade.h:18 mail/mail-config.glade.h:173
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:172
 msgid "seconds"
 msgstr " sekunder"
 
-#: filter/filter.glade.h:19
+#: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "tiden nå"
 
-#: filter/filter.glade.h:20
+#: ../filter/filter.glade.h:20
 msgid "the time you specify"
 msgstr "tiden du spesifiserer"
 
-#: filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22
 msgid "years"
 msgstr "år"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:75 mail/mail-config.glade.h:91
+#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1011 ../mail/mail-config.c:75
+#: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:78
-#: mail/mail-config.glade.h:139
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1014
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:139
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:79
-#: mail/mail-config.glade.h:94
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1015
+#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Senere"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:790
+#: ../filter/filter-rule.c:790
 msgid "_Rule name:"
 msgstr "_Regelnavn:"
 
-#: filter/filter-rule.c:818
+#: ../filter/filter-rule.c:818
 msgid "<b>If</b>"
 msgstr "<b>Hvis</b> "
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:855
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: filter/filter-rule.c:855
+#: ../filter/filter-rule.c:855
 msgid "if any criteria are met"
 msgstr "hvis ethvert kriterie er møtt"
 
-#: filter/filter-rule.c:857
+#: ../filter/filter-rule.c:857
 msgid "Execute actions"
 msgstr "Utfør handlinger"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "Replies"
 msgstr "Svar"
 
-#: filter/filter-rule.c:878
+#: ../filter/filter-rule.c:878
 msgid "Replies and parents"
 msgstr "Svar med opphav"
 
-#: filter/filter-rule.c:880
+#: ../filter/filter-rule.c:880
 msgid "Include threads"
 msgstr "Ta med tråder"
 
-#: filter/filter-rule.c:975
+#: ../filter/filter-rule.c:975
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: filter/rule-editor.c:285
+#: ../filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:361
+#: ../filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: filter/rule-editor.c:685
+#: ../filter/rule-editor.c:685
 msgid "Rule name"
 msgstr "Regelnavn"
 
-#: mail/em-account-editor.c:377
+#: ../mail/em-account-editor.c:377
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisensavtale for %s"
 
-#: mail/em-account-editor.c:384
+#: ../mail/em-account-editor.c:384
 #, c-format
 msgid ""
 "\n"
@@ -9980,74 +10077,74 @@ msgstr ""
 "under nøye\n"
 "og kryss av i ruten for å akseptere den\n"
 
-#: mail/em-account-editor.c:454 mail/em-filter-folder-element.c:237
-#: mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:454 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: mail/em-account-editor.c:1812
+#: ../mail/em-account-editor.c:1813
 msgid "Automatically check for _new mail every"
 msgstr "Se etter _nye meldinger automatisk"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: mail/em-account-editor.c:2081 mail/em-account-editor.c:2159
+#: ../mail/em-account-editor.c:2082 ../mail/em-account-editor.c:2160
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: mail/em-account-editor.c:2082 mail/em-account-editor.c:2160
+#: ../mail/em-account-editor.c:2083 ../mail/em-account-editor.c:2161
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: mail/em-account-editor.c:2504 mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2505 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: mail/em-account-editor.c:2504 mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2505 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:422
+#: ../mail/em-account-prefs.c:422
 msgid "[Default]"
 msgstr "[Forvalg]"
 
-#: mail/em-account-prefs.c:476
+#: ../mail/em-account-prefs.c:476
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: mail/em-account-prefs.c:478
+#: ../mail/em-account-prefs.c:478
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:425
-#: mail/mail-config.c:934
+#: ../mail/em-composer-prefs.c:306 ../mail/em-composer-prefs.c:425
+#: ../mail/mail-config.c:934
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: mail/em-composer-prefs.c:949
+#: ../mail/em-composer-prefs.c:890
 msgid "Language(s)"
 msgstr "Språk"
 
-#: mail/em-composer-prefs.c:995
+#: ../mail/em-composer-prefs.c:933
 msgid "Add signature script"
 msgstr "Legg til signaturskript"
 
-#: mail/em-composer-prefs.c:1015
+#: ../mail/em-composer-prefs.c:953
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: mail/em-composer-utils.c:897
+#: ../mail/em-composer-utils.c:910
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: mail/em-composer-utils.c:1513
+#: ../mail/em-composer-utils.c:1526
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1560
+#: ../mail/em-composer-utils.c:1573
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10055,739 +10152,754 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day},.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:147
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
 #. Automatically generated. Do not edit.
-#: mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Juster poeng"
 
-#: mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Tilegn farge"
 
-#: mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: mail/em-filter-i18n.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr "Pip"
 
-#: mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:7
 msgid "contains"
 msgstr "inneholder"
 
-#: mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:9
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Slettet"
 
-#: mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:13
 msgid "does not contain"
 msgstr "inneholder ikke"
 
-#: mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:14
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:15
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:16
 msgid "does not return"
 msgstr "returnerer ikke"
 
-#: mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:17
 msgid "does not sound like"
 msgstr "ligner ikke"
 
-#: mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:18
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
-#: mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:20
 msgid "Draft"
 msgstr "Skisse"
 
-#: mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:21
 msgid "ends with"
 msgstr "slutter med"
 
-#: mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:22
 msgid "Exist"
 msgstr "Eksisterer"
 
-#: mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:23
 msgid "exists"
 msgstr "eksisterer"
 
-#: mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:24
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:25
 msgid "Follow Up"
 msgstr "Følg opp"
 
-#: mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:27
 msgid "is"
 msgstr "er"
 
-#: mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:28
 msgid "is after"
 msgstr "er etter"
 
-#: mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:29
 msgid "is before"
 msgstr "er før"
 
-#: mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:30
 msgid "is Flagged"
 msgstr "er merket"
 
-#: mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:31
 msgid "is greater than"
 msgstr "er større enn"
 
-#: mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:32
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:33
 msgid "is not"
 msgstr "er ikke"
 
-#: mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:34
 msgid "is not Flagged"
 msgstr "er ikke merket"
 
-#: mail/em-filter-i18n.h:35 mail/mail-config.glade.h:93
-#: ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Søppel"
 
-#: mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr "Søppeltest"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:960
-#: widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:964
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
 
-#: mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:38
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:39
 msgid "Match All"
 msgstr "Treff på alle"
 
-#: mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:41
 msgid "Message Header"
 msgstr "Meldingshode"
 
-#: mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
 msgstr "Meldingen er søppel"
 
-#: mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
 msgstr "Meldingen er ikke søppel"
 
-#: mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "Send til program"
 
-#: mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "Spill lyd"
 
-#: mail/em-filter-i18n.h:47 mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Les"
 
-#: mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Mottakere"
 
-#: mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr "Treff på vanlig uttrykk"
 
-#: mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:50
 msgid "Replied to"
 msgstr "Svart til"
 
-#: mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "returnerer"
 
-#: mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:52
 msgid "returns greater than"
 msgstr "returnerer større enn"
 
-#: mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:53
 msgid "returns less than"
 msgstr "returnerer mindre enn"
 
-#: mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:54
 msgid "Run Program"
 msgstr "Kjør program"
 
-#: mail/em-filter-i18n.h:55 mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Gi poeng"
 
-#: mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Avsender"
 
-#: mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:57
 msgid "Set Status"
 msgstr "Sett status"
 
-#: mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "Størrelse (kB)"
 
-#: mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:59
 msgid "sounds like"
 msgstr "lyder som"
 
-#: mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:60
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:61
 msgid "Specific header"
 msgstr "Spesifikk header"
 
-#: mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:62
 msgid "starts with"
 msgstr "starter med"
 
-#: mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:64
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: mail/em-filter-i18n.h:65 mail/em-format.c:853 mail/em-format-html.c:1533
-#: mail/em-format-quote.c:306 mail/em-mailer-prefs.c:88
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
-#: plugins/shared-folder/properties.glade.h:14 smime/lib/e-cert.c:1131
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format.c:853
+#: ../mail/em-format-html.c:1533 ../mail/em-format-quote.c:306
+#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:330
+#: ../plugins/shared-folder/properties.glade.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Emne"
 
-#: mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:66
 msgid "Unset Status"
 msgstr "Nullstill status"
 
 #. and now for the action area
-#: mail/em-filter-rule.c:488
+#: ../mail/em-filter-rule.c:488
 msgid "<b>Then</b>"
 msgstr "<b>Så</b> "
 
-#: mail/em-folder-browser.c:133
+#: ../mail/em-folder-browser.c:133
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe fra søk..."
 
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:143
+#: ../mail/em-folder-properties.c:143
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Totalt antall melding:"
 msgstr[1] "Totalt antall meldinger:"
 
-#: mail/em-folder-properties.c:155
+#: ../mail/em-folder-properties.c:155
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ulest melding:"
 msgstr[1] "Uleste meldinger:"
 
-#: mail/em-folder-properties.c:269 plugins/shared-folder/properties.glade.h:9
+#: ../mail/em-folder-properties.c:270
+#: ../plugins/shared-folder/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
-#: mail/em-folder-selection-button.c:121
+#: ../mail/em-folder-selection-button.c:121
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: mail/em-folder-selector.c:166
+#: ../mail/em-folder-selector.c:166
 msgid "Create New Folder"
 msgstr "Opprett ny mappe"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2471
-#: mail/mail-component.c:732 plugins/shared-folder/share-folder-common.c:346
+#: ../mail/em-folder-selector.c:166 ../mail/em-folder-tree.c:2479
+#: ../mail/mail-component.c:732 ../plugins/shared-folder/install-shared.c:144
+#: ../plugins/shared-folder/share-folder-common.c:345
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: mail/em-folder-selector.c:304
+#: ../mail/em-folder-selector.c:304
 msgid "Create"
 msgstr "Opprett"
 
-#: mail/em-folder-selector.c:308
+#: ../mail/em-folder-selector.c:308
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree.c:678
+#: ../mail/em-folder-tree.c:678
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: mail/em-folder-tree.c:911
+#: ../mail/em-folder-tree.c:911
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: mail/em-folder-tree.c:913
+#: ../mail/em-folder-tree.c:913
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: mail/em-folder-tree.c:920 mail/message-list.c:1617
+#: ../mail/em-folder-tree.c:920 ../mail/message-list.c:1617
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:922 mail/message-list.c:1619
+#: ../mail/em-folder-tree.c:922 ../mail/message-list.c:1619
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:938
+#: ../mail/em-folder-tree.c:938
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: mail/em-folder-tree.c:1034 ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-tree.c:1034 ../ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: mail/em-folder-tree.c:1035 ui/evolution-mail-message.xml.h:119
+#: ../mail/em-folder-tree.c:1035 ../ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: mail/em-folder-tree.c:1734 mail/mail-ops.c:1017
+#: ../mail/em-folder-tree.c:1734 ../mail/mail-ops.c:1017
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: mail/em-folder-tree.c:2241 mail/em-folder-tree.c:2255
-#: mail/em-folder-view.c:823 mail/em-folder-view.c:838
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-tree.c:2007
+#, c-format
+msgid "Copying `%s' to `%s'"
+msgstr "Kopierer «%s» til «%s»"
+
+#: ../mail/em-folder-tree.c:2249 ../mail/em-folder-tree.c:2263
+#: ../mail/em-folder-view.c:827 ../mail/em-folder-view.c:842
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: mail/em-folder-tree.c:2241 mail/em-folder-view.c:838
+#: ../mail/em-folder-tree.c:2249 ../mail/em-folder-view.c:842
 msgid "C_opy"
 msgstr "K_opier"
 
-#: mail/em-folder-tree.c:2282 plugins/shared-folder/share-folder-common.c:138
+#: ../mail/em-folder-tree.c:2290
+#: ../plugins/shared-folder/share-folder-common.c:138
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: mail/em-folder-tree.c:2471 mail/mail-component.c:732
-#: plugins/shared-folder/share-folder-common.c:346
+#: ../mail/em-folder-tree.c:2479 ../mail/mail-component.c:732
+#: ../plugins/shared-folder/install-shared.c:144
+#: ../plugins/shared-folder/share-folder-common.c:345
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: mail/em-folder-tree.c:2664
+#: ../mail/em-folder-tree.c:2672
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappe «%s» til:"
 
-#: mail/em-folder-tree.c:2666
+#: ../mail/em-folder-tree.c:2674
 msgid "Rename Folder"
 msgstr "Endre navn på mappe"
 
-#: mail/em-folder-tree.c:2669
+#: ../mail/em-folder-tree.c:2680
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet «/»"
 
-#: mail/em-folder-tree.c:2746 ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:49
+#: ../mail/em-folder-tree.c:2754 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:53 ../ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2747
+#: ../mail/em-folder-tree.c:2755
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
-#: mail/em-folder-tree.c:2751
+#: ../mail/em-folder-tree.c:2759
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: mail/em-folder-tree.c:2752
+#: ../mail/em-folder-tree.c:2760
 msgid "_Move..."
 msgstr "_Flytt..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2756
+#: ../mail/em-folder-tree.c:2764
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2759
+#: ../mail/em-folder-tree.c:2767
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
-#: mail/mail-vfolder.c:891
+#: ../mail/em-folder-tree-model.c:200 ../mail/em-folder-tree-model.c:202
+#: ../mail/mail-vfolder.c:891
 msgid "VFolders"
 msgstr "VFoldere"
 
 #. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+#: ../mail/em-folder-tree-model.c:206 ../mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
 #. Inbox is always first
 #. translators: standard local mailbox names
-#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
-#: mail/mail-component.c:138
+#: ../mail/em-folder-tree-model.c:212 ../mail/em-folder-tree-model.c:214
+#: ../mail/mail-component.c:138
 msgid "Inbox"
 msgstr "Innboks"
 
-#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
+#: ../mail/em-folder-tree-model.c:491 ../mail/em-folder-tree-model.c:795
 msgid "Loading..."
 msgstr "Laster..."
 
-#: mail/em-folder-view.c:426 mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:531
-#: mail/mail-component.c:582
+#: ../mail/em-folder-view.c:438 ../mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: ../mail/importers/elm-importer.c:418
+#: ../mail/importers/netscape-importer.c:1902
+#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:531
+#: ../mail/mail-component.c:582
 msgid "Mail"
 msgstr "E-post"
 
-#: mail/em-folder-view.c:928 ui/evolution-mail-message.xml.h:113
+#: ../mail/em-folder-view.c:932 ../ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/em-folder-view.c:930
+#: ../mail/em-folder-view.c:934
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:933 ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:937 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-folder-view.c:934 mail/em-popup.c:502
-#: ui/evolution-mail-message.xml.h:88
+#: ../mail/em-folder-view.c:938 ../mail/em-popup.c:497
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:935 mail/em-popup.c:503
-#: ui/evolution-mail-message.xml.h:87
+#: ../mail/em-folder-view.c:939 ../mail/em-popup.c:498
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:936 mail/em-popup.c:505
-#: ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-view.c:940 ../mail/em-popup.c:500
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:939
+#: ../mail/em-folder-view.c:943
 msgid "Follo_w Up..."
 msgstr "Føl_g opp..."
 
-#: mail/em-folder-view.c:940
+#: ../mail/em-folder-view.c:944
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: mail/em-folder-view.c:941
+#: ../mail/em-folder-view.c:945
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: mail/em-folder-view.c:944 ui/evolution-mail-message.xml.h:50
+#: ../mail/em-folder-view.c:948 ../ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/em-folder-view.c:945
+#: ../mail/em-folder-view.c:949
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/em-folder-view.c:946
+#: ../mail/em-folder-view.c:950
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/em-folder-view.c:947
+#: ../mail/em-folder-view.c:951
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: mail/em-folder-view.c:948 ui/evolution-mail-message.xml.h:54
+#: ../mail/em-folder-view.c:952 ../ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Merk som _søppel"
 
-#: mail/em-folder-view.c:949 ui/evolution-mail-message.xml.h:55
+#: ../mail/em-folder-view.c:953 ../ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: mail/em-folder-view.c:953
+#: ../mail/em-folder-view.c:957
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/em-folder-view.c:956
+#: ../mail/em-folder-view.c:960
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/em-folder-view.c:957 ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:961 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/em-folder-view.c:965
+#: ../mail/em-folder-view.c:969
 msgid "Add Sender to Address_book"
 msgstr "Legg til avsender i adresse_bok"
 
-#: mail/em-folder-view.c:968
+#: ../mail/em-folder-view.c:972
 msgid "Appl_y Filters"
 msgstr "_Påfør filtre"
 
-#: mail/em-folder-view.c:969
+#: ../mail/em-folder-view.c:973
 msgid "F_ilter Junk"
 msgstr "F_iltrer søppel"
 
-#: mail/em-folder-view.c:972
+#: ../mail/em-folder-view.c:976
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:977
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/em-folder-view.c:974
+#: ../mail/em-folder-view.c:978
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/em-folder-view.c:975
+#: ../mail/em-folder-view.c:979
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/em-folder-view.c:976
+#: ../mail/em-folder-view.c:980
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/em-folder-view.c:980
+#: ../mail/em-folder-view.c:984
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/em-folder-view.c:981
+#: ../mail/em-folder-view.c:985
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/em-folder-view.c:982
+#: ../mail/em-folder-view.c:986
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/em-folder-view.c:983
+#: ../mail/em-folder-view.c:987
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1760 mail/em-folder-view.c:1803
+#: ../mail/em-folder-view.c:1764 ../mail/em-folder-view.c:1807
 msgid "Default"
 msgstr "Forvalgt"
 
-#: mail/em-folder-view.c:1900
+#: ../mail/em-folder-view.c:1903
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:2179
+#: ../mail/em-folder-view.c:2182
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
-#: mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2465
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: mail/em-format.c:848 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:326
+#: ../mail/em-format.c:848 ../mail/em-format-html.c:1424
+#: ../mail/em-format-quote.c:193 ../mail/em-mailer-prefs.c:83
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Fra"
 
-#: mail/em-format.c:849 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:84
+#: ../mail/em-format.c:849 ../mail/em-format-html.c:1424
+#: ../mail/em-format-quote.c:193 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/em-format.c:850 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
+#: ../mail/em-format.c:850 ../mail/em-format-html.c:1424
+#: ../mail/em-format-quote.c:193 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/em-format.c:851 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:86
+#: ../mail/em-format.c:851 ../mail/em-format-html.c:1424
+#: ../mail/em-format-quote.c:193 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format.c:852 mail/em-format-html.c:1424 mail/em-format-quote.c:193
-#: mail/em-mailer-prefs.c:87
+#: ../mail/em-format.c:852 ../mail/em-format-html.c:1424
+#: ../mail/em-format-quote.c:193 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format.c:854 mail/em-format-html.c:1577 mail/em-format-quote.c:322
-#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
+#: ../mail/em-format.c:854 ../mail/em-format-html.c:1577
+#: ../mail/em-format-quote.c:322 ../mail/em-mailer-prefs.c:89
+#: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/em-format.c:855 mail/em-format-html.c:1600 mail/em-mailer-prefs.c:90
+#: ../mail/em-format.c:855 ../mail/em-format-html.c:1600
+#: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: mail/em-format.c:1104
+#: ../mail/em-format.c:1104
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/em-format.c:1143 mail/em-format.c:1276
+#: ../mail/em-format.c:1143 ../mail/em-format.c:1276
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: mail/em-format.c:1266
+#: ../mail/em-format.c:1266
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
-#: mail/em-format.c:1414
+#: ../mail/em-format.c:1414
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/em-format.c:1433
+#: ../mail/em-format.c:1433
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1441
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: mail/em-format.c:1441
+#: ../mail/em-format.c:1441
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: mail/em-format-html.c:472 mail/em-format-html.c:474
+#: ../mail/em-format-html.c:472 ../mail/em-format-html.c:474
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter «%s»"
 
-#: mail/em-format-html.c:579 mail/em-format-html-display.c:638
+#: ../mail/em-format-html.c:579 ../mail/em-format-html-display.c:645
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: mail/em-format-html.c:580 mail/em-format-html-display.c:639
+#: ../mail/em-format-html.c:580 ../mail/em-format-html-display.c:646
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: mail/em-format-html.c:581 mail/em-format-html-display.c:640
+#: ../mail/em-format-html.c:581 ../mail/em-format-html-display.c:647
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: mail/em-format-html.c:582
+#: ../mail/em-format-html.c:582
 msgid "Valid signature but cannot verify sender"
 msgstr "Gyldig signatur, men ikke verifisere avsender"
 
-#: mail/em-format-html.c:588 mail/em-format-html-display.c:647
+#: ../mail/em-format-html.c:588 ../mail/em-format-html-display.c:654
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: mail/em-format-html.c:589 mail/em-format-html-display.c:648
+#: ../mail/em-format-html.c:589 ../mail/em-format-html-display.c:655
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: mail/em-format-html.c:590 mail/em-format-html-display.c:649
+#: ../mail/em-format-html.c:590 ../mail/em-format-html-display.c:656
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: mail/em-format-html.c:591 mail/em-format-html-display.c:650
+#: ../mail/em-format-html.c:591 ../mail/em-format-html-display.c:657
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: mail/em-format-html.c:840
+#: ../mail/em-format-html.c:840
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: mail/em-format-html.c:870
+#: ../mail/em-format-html.c:870
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/em-format-html.c:881
+#: ../mail/em-format-html.c:881
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: mail/em-format-html.c:883
+#: ../mail/em-format-html.c:883
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/em-format-html.c:904
+#: ../mail/em-format-html.c:904
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/em-format-html.c:915
+#: ../mail/em-format-html.c:915
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
-#: mail/em-format-html.c:1137
+#: ../mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
 #. pseudo-header
-#: mail/em-format-html.c:1537 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:984
+#: ../mail/em-format-html.c:1537 ../mail/em-format-quote.c:315
+#: ../mail/em-mailer-prefs.c:986
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1564
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1567
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:405
+#: ../mail/em-format-html-display.c:412
 #, c-format
 msgid "Matches: %d"
 msgstr "Treff: %d"
 
-#: mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:645
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10795,7 +10907,7 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: mail/em-format-html-display.c:639
+#: ../mail/em-format-html-display.c:646
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10803,7 +10915,7 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: mail/em-format-html-display.c:640
+#: ../mail/em-format-html-display.c:647
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10811,11 +10923,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: mail/em-format-html-display.c:641
+#: ../mail/em-format-html-display.c:648
 msgid "Valid signature, cannot verify sender"
 msgstr "Gyldig signatur. Kan ikke verifisere avsender"
 
-#: mail/em-format-html-display.c:641
+#: ../mail/em-format-html-display.c:648
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10823,7 +10935,7 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: mail/em-format-html-display.c:647
+#: ../mail/em-format-html-display.c:654
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -10831,7 +10943,7 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -10841,7 +10953,7 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: mail/em-format-html-display.c:649
+#: ../mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10849,7 +10961,7 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
-#: mail/em-format-html-display.c:650
+#: ../mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -10858,64 +10970,64 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil være meget "
 "vanskelig for en utenforstående å se innholdet i denne meldingen på kort tid."
 
-#: mail/em-format-html-display.c:751 smime/gui/smime-ui.glade.h:47
+#: ../mail/em-format-html-display.c:758 ../smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: mail/em-format-html-display.c:766
+#: ../mail/em-format-html-display.c:773
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: mail/em-format-html-display.c:995
+#: ../mail/em-format-html-display.c:1002
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ferdigstilt på %d %B, %Y, %H.%M"
 
-#: mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:1010
 msgid "Overdue:"
 msgstr "Utgått:"
 
-#: mail/em-format-html-display.c:1006
+#: ../mail/em-format-html-display.c:1013
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "til %d %B %Y %H.%M"
 
-#: mail/em-format-html-display.c:1053
+#: ../mail/em-format-html-display.c:1060
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: mail/em-format-html-display.c:1054
+#: ../mail/em-format-html-display.c:1061
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: mail/em-format-html-display.c:1298
+#: ../mail/em-format-html-display.c:1305
 msgid "Attachment Button"
 msgstr "Vedleggsknapp"
 
-#: mail/em-format-html-print.c:130
+#: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/em-junk-filter.c:110
+#: ../mail/em-junk-filter.c:110
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrert)"
 
-#: mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:101
 msgid "Every time"
 msgstr "Hver gang"
 
-#: mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:102
 msgid "Once per day"
 msgstr "En gang om dagen"
 
-#: mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:103
 msgid "Once per week"
 msgstr "En gang i uken"
 
-#: mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per month"
 msgstr "En gang i måneden"
 
-#: mail/em-migrate.c:1168
+#: ../mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -10927,49 +11039,49 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: mail/em-migrate.c:1602
+#: ../mail/em-migrate.c:1602
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kan ikke opprette ny mappe «%s»: %s"
 
-#: mail/em-migrate.c:1628
+#: ../mail/em-migrate.c:1628
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
 
-#: mail/em-migrate.c:1813
+#: ../mail/em-migrate.c:1813
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan ikke søke etter eksisterende postbokser på «%s»: %s"
 
-#: mail/em-migrate.c:2017
+#: ../mail/em-migrate.c:2017
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 "Kunne ikke åpne gamle data om meldinger som er beholdt på tjeneren for POP-"
 "tjener «%s»: %s"
 
-#: mail/em-migrate.c:2031
+#: ../mail/em-migrate.c:2031
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Klarte ikke å opprette katalog «%s»: %s"
 
-#: mail/em-migrate.c:2060
+#: ../mail/em-migrate.c:2060
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2494 mail/em-migrate.c:2506
+#: ../mail/em-migrate.c:2494 ../mail/em-migrate.c:2506
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
 
-#: mail/em-migrate.c:2657
+#: ../mail/em-migrate.c:2657
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
 
-#: mail/em-migrate.c:2675
+#: ../mail/em-migrate.c:2675
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -10977,340 +11089,350 @@ msgstr ""
 "Kan ikke lese innstillinger fra tidligere Evolution-installasjon. «evolution/"
 "config.xmldb» er korrupt eller ser ikke ut til å eksistere."
 
-#: mail/em-popup.c:386
+#: ../mail/em-popup.c:381
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/em-popup.c:405
+#: ../mail/em-popup.c:400
 #, c-format
 msgid "untitled_image.%s"
 msgstr "bilde_uten_navn.%s"
 
-#: mail/em-popup.c:499
+#: ../mail/em-popup.c:494
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: mail/em-popup.c:501
+#: ../mail/em-popup.c:496
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-popup.c:553
+#: ../mail/em-popup.c:548
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: mail/em-popup.c:554
+#: ../mail/em-popup.c:549
 msgid "Se_nd message to..."
 msgstr "Se_nd melding til..."
 
-#: mail/em-popup.c:555
+#: ../mail/em-popup.c:550
 msgid "_Add to Addressbook"
 msgstr "Legg til i _adressebok"
 
-#: mail/em-popup.c:686
+#: ../mail/em-popup.c:681
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/em-subscribe-editor.c:613
+#: ../mail/em-subscribe-editor.c:613
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Dette lageret støtter ikke abonnering, eller så er dette ikke aktivert."
 
-#: mail/em-subscribe-editor.c:642
+#: ../mail/em-subscribe-editor.c:642
 msgid "Subscribed"
 msgstr "Abonnert"
 
-#: mail/em-subscribe-editor.c:646
+#: ../mail/em-subscribe-editor.c:646
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:861
+#: ../mail/em-subscribe-editor.c:861
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
-#: mail/em-subscribe-editor.c:882
+#: ../mail/em-subscribe-editor.c:882
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: mail/em-utils.c:105
+#: ../mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Ikke vis denne meldingen igjen."
 
-#: mail/em-utils.c:294
+#: ../mail/em-utils.c:294
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/em-utils.c:434
+#: ../mail/em-utils.c:434
 msgid "message"
 msgstr "melding"
 
-#: mail/em-utils.c:543
+#: ../mail/em-utils.c:543
 msgid "Save Message..."
 msgstr "Lagre melding..."
 
-#: mail/em-utils.c:592
+#: ../mail/em-utils.c:592
 msgid "Add address"
 msgstr "Legg til adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1055
+#: ../mail/em-utils.c:1055
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
 
-#: mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:104
 msgid "Virtual _Folders"
 msgstr "Virtuelle _mapper"
 
-#: mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "VFolder-kilde"
 
-#: mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automatisk gjenkjenning av lenker"
 
-#: mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
 msgstr "Automatisk gjenkjenning av smilefjes"
 
-#: mail/evolution-mail.schemas.in.in.h:3
+#: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
 msgstr "Sjekk om innkommende meldinger er søppel"
 
-#: mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
 msgstr "Farge for utheving av sitattekst"
 
-#: mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight color."
 msgstr "Farge for utheving av sitattekst."
 
-#: mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
 msgstr "Forvalgt høyde for skrivevindu"
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
 msgstr "Forvalgt bredde for skrivevindu"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "Forvalgt tegnsett for nye meldinger"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Forvalgt tegnsett for nye meldinger."
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Forvalgt tegnsett for visning av meldinger"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Forvalgt tegnsett for visning av meldinger."
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Forvalgt videresendingsstil"
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Forvalgt høyde for meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Forvalgt høyde for meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Forvalgt høyde for dialog for abonnering"
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Forvalgt svarstil"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Forvalgt bredde for meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Forvalgt bredde for meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Forvalgt bredde for abonneringsdialogen"
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vis indikatorer for stavefeil mens du skriver."
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkurven når programmet avsluttes"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm alle papirkurver når programmet avsluttes."
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:27
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Sist gang søppelkurven ble tømt"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Liste med godtatte lisenser"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Liste med kontoer"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Last bilder for HTML-meldinger og http"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlinger"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Logg filterhandlinger til oppgitt loggfil."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Forvalgt høyde på meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Forvalgt bredde på meldingsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Lydfil for varsel om ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Type varsel for ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:60
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr "Spør når bruker prøver å åpne 10 eller flere meldinger samtidig"
+
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11318,88 +11440,88 @@ msgstr ""
 "Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
 "å motta HTML-meldinger."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Spør når bruker prøver å sende en melding uten Til- eller Cc-mottakere."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Spør når bruker prøver å sende uønsket HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Gjenkjenn smilefjes i tekst og erstatt dem med bilder."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Kjør søppeltest på innkommende e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Send HTML e-post som forvalg."
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis slettede meldinger i meldingslisten (gjennomstreket)."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Lydfil som skal spilles av når nye meldinger ankommer."
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Forvalgt høyde på abonneringsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Forvalgt bredde på abonneringsvinduet"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Terminalskrift for meldingsvisning"
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Skrift med variabel bredde for meldingsvisning"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11407,189 +11529,192 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Bruk meldingsliste med tråder."
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Bruk meldingsliste med tråder"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:109
 msgid "port for starting user runned spamd"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:110
 msgid "spamd port"
 msgstr "port for spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "Konfigurer e-post-kontoer her"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
 msgstr "Evolution e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail accounts configuration control"
 msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
 msgstr "Evolution e-postkomponent"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail composer"
 msgstr "Evolution e-postredigering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer configuration control"
 msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail preferences control"
 msgstr "Brukervalg-kontroll for Evolution e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
 msgstr "_E-post"
 
-#: mail/importers/elm-importer.c:88
+#: ../mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
 
-#: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:225
-#: mail/importers/evolution-outlook-importer.c:259
-#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
+#: ../mail/importers/elm-importer.c:89
+#: ../mail/importers/evolution-mbox-importer.c:225
+#: ../mail/importers/evolution-outlook-importer.c:259
+#: ../mail/importers/netscape-importer.c:1251
+#: ../mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerer..."
 
-#: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:227
-#: mail/importers/evolution-outlook-importer.c:261
-#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
+#: ../mail/importers/elm-importer.c:91
+#: ../mail/importers/evolution-mbox-importer.c:227
+#: ../mail/importers/evolution-outlook-importer.c:261
+#: ../mail/importers/netscape-importer.c:1253
+#: ../mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Vennligst vent"
 
-#: mail/importers/elm-importer.c:244
+#: ../mail/importers/elm-importer.c:244
 msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
-#: mail/importers/elm-importer.c:436
+#: ../mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11597,71 +11722,71 @@ msgstr ""
 "Evolution har funnet Elm e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/elm-importer.c:444
+#: ../mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:117
-#: mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:117
+#: ../mail/importers/evolution-outlook-importer.c:131
 msgid "Destination folder:"
 msgstr "Målmappe:"
 
-#: mail/importers/evolution-mbox-importer.c:120
-#: mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
-#: mail/importers/evolution-mbox-importer.c:223
-#: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/mail-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-outlook-importer.c:257
+#: ../mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer «%s»"
 
-#: mail/importers/evolution-outlook-importer.c:305
-#: mail/importers/mail-importer.c:140
+#: ../mail/importers/evolution-outlook-importer.c:305
+#: ../mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Import fra Elm for Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "Import av Netscape e-post for Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr "Import fra Outlook Express 4 for Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "Import fra Pine for Evolutions"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 msgid "Evolution mbox importer"
 msgstr "mbox-import for Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
 msgid "MBox (mbox)"
 msgstr "MBox (.mbox)"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
 msgstr "Outlook Express 4 (.mbx)"
 
-#: mail/importers/mail-importer.c:363
+#: ../mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
 
-#: mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter: «%s»"
 
-#: mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -11676,7 +11801,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11684,7 +11809,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -11693,23 +11818,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Importerer data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "E-post filtre"
 
-#: mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11717,15 +11842,15 @@ msgstr ""
 "Evolution har funnet Netscape e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/pine-importer.c:116
+#: ../mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerer gammel e-post fra Pine"
 
-#: mail/importers/pine-importer.c:314
+#: ../mail/importers/pine-importer.c:314
 msgid "Importing Pine data"
 msgstr "Importerer data fra Pine"
 
-#: mail/importers/pine-importer.c:498
+#: ../mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11733,349 +11858,350 @@ msgstr ""
 "Evolution har funnet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: mail/importers/pine-importer.c:506
+#: ../mail/importers/pine-importer.c:506
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-autofilter.c:74
+#: ../mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: mail/mail-autofilter.c:238
+#: ../mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:254
+#: ../mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:271
+#: ../mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:326
+#: ../mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-component.c:139
+#: ../mail/mail-component.c:139
 msgid "Drafts"
 msgstr "Skisser"
 
-#: mail/mail-component.c:140
+#: ../mail/mail-component.c:140
 msgid "Outbox"
 msgstr "Utboks"
 
-#: mail/mail-component.c:141
+#: ../mail/mail-component.c:141
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-component.c:484
+#: ../mail/mail-component.c:484
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: mail/mail-component.c:486
+#: ../mail/mail-component.c:486
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d søppel"
 msgstr[1] "%d søppel"
 
-#: mail/mail-component.c:509
+#: ../mail/mail-component.c:509
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: mail/mail-component.c:511
+#: ../mail/mail-component.c:511
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: mail/mail-component.c:513
+#: ../mail/mail-component.c:513
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: mail/mail-component.c:517
+#: ../mail/mail-component.c:517
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: mail/mail-component.c:519
+#: ../mail/mail-component.c:519
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d ulest"
 msgstr[1] ", %d uleste"
 
-#: mail/mail-component.c:684
+#: ../mail/mail-component.c:684
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/mail-component.c:685
+#: ../mail/mail-component.c:685
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/mail-component.c:686
+#: ../mail/mail-component.c:686
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: mail/mail-component.c:692
+#: ../mail/mail-component.c:692
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: mail/mail-component.c:693
+#: ../mail/mail-component.c:693
 msgid "Mail _Folder"
 msgstr "_E-postmappe"
 
-#: mail/mail-component.c:694
+#: ../mail/mail-component.c:694
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: mail/mail-component.c:841
+#: ../mail/mail-component.c:841
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
-#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
 
-#: mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "Sj_ekk støttede typer "
 
-#: mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL er ikke støttet i denne versjonen av Evolution</b>"
 
-#: mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>S_ignaturer</b> "
 
-#: mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>Språk</b> "
 
-#: mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:8
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>Dette vil gjøre filteret mer pålitelig, men tregere</small>"
 
-#: mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Kontoinformasjon</span>"
 
-#: mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Varsel</span>"
 
-#: mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Autentiseringstyper</span>"
 
-#: mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentisering</span>"
 
-#: mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Skriving av meldinger</span>"
 
-#: mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfigurasjon</span>"
 
-#: mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Forvalgt oppførsel</span>"
 
-#: mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Sletting av e-post</span>"
 
-#: mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">_Meldingshoder som vises</span>"
 
-#: mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Alternativer for filtre</span>"
 
-#: mail/mail-config.glade.h:19 plugins/itip-formatter/itip-formatter.c:1641
+#: ../mail/mail-config.glade.h:19
+#: ../plugins/itip-formatter/itip-formatter.c:1657
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Generelt</span>"
 
-#: mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiketter og farger</span>"
 
-#: mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Lasting av bilder</span>"
 
-#: mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Meldingsvisning</span>"
 
-#: mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for meldinger</span>"
 
-#: mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Melding om ny e-post</span>"
 
-#: mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Tilleggsinformasjon</span>"
 
-#: mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Alternativer</span>"
 
-#: mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for utskrift</span>"
 
-#: mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Nødvendig informasjon</span>"
 
-#: mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Sikkerhet</span>"
 
-#: mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Sendte meldinger og skisser</span>"
 
-#: mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Tjenerkonfigurasjon</span>"
 
-#: mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
-#: mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur..."
 
-#: mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Legg til _skript"
 
-#: mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "All_tid signer utgående meldinger når denne kontoen brukes"
 
-#: mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 "Send krypterte me_ldinger til meg selv også ved sending av kryptert e-post"
 
-#: mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
 
-#: mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Alltid krypter til _meg selv ved sending av kryptert e-post"
 
-#: mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Legg ved opprinnelig melding"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically _insert smiley images"
 msgstr "Sett _inn smilefjes automatisk"
 
-#: mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "_Pip når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "Sj_ekk støttede typer "
 
-#: mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:52
 msgid "Check _incoming mail for junk"
 msgstr "Sjekk om innkommende meldinger er søppel"
 
-#: mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sjekker om innkommende meldinger er søppel"
 
-#: mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Tøm"
 
-#: mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "Tø_m"
 
-#: mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Farger"
 
-#: mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tømming av en mappe"
 
-#: mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12091,126 +12217,126 @@ msgstr ""
 "\n"
 "Klikk «Fullfør» for å lagre dine innstillinger."
 
-#: mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Signer utgående meldinger digitalt (som forvalg)"
 
-#: mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Ikke siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:72 shell/evolution-startup-wizard.glade.h:1
+#: ../mail/mail-config.glade.h:72 ../shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-post kontoer"
 
-#: mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm søppelkurven når programmet avsluttes"
 
-#: mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter ut_gående meldinger (som forvalg)"
 
-#: mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "Kjør kommando..."
 
-#: mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
-#: mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML-e-post"
 
-#: mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:89
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
-#: mail/mail-config.glade.h:90
+#: ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:99
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
 
-#: mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:100
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:101
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:104
 msgid "Play sound file when new mail arri_ves"
 msgstr "Spill en l_ydfil når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:105
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12218,7 +12344,7 @@ msgstr ""
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:106
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12228,119 +12354,125 @@ msgstr ""
 "under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:107
 msgid "Please select among the following options"
 msgstr "Vennligst velg mellom følgende alternativer"
 
-#: mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:108
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
 
-#: mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:109
 msgid "Quote original message"
 msgstr "Siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:110
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:111
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:112
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:113
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:114
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:115
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:116
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:117
 msgid "Se_lect..."
 msgstr "Ve_lg..."
 
-#: mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:118
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:119
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:120
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:121
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:122
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:123
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:124
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:125
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:126
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:127
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:128
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:129
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:130
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:131
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:132
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:133
 msgid "T_erminal Font:"
 msgstr "T_erminalskrift:"
 
-#: mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:134
 msgid "T_ype: "
 msgstr "T_ype:"
 
-#: mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:135
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "Språklisten som vises her reflekterer kun de språkene du har installert en ordbok for."
+
+#: ../mail/mail-config.glade.h:136
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12350,16 +12482,7 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: mail/mail-config.glade.h:138
-msgid ""
-"This page allows you to configure spell checking behavior and language. The "
-"list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Denne siden lar deg konfigurere oppførsel for stavekontroll og språk. "
-"Språklisten her reflekterer kun de språkene du har installert en ordbok for."
-
-#: mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:140
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12367,15 +12490,15 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:142
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:143
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:144
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12385,7 +12508,7 @@ msgstr ""
 "\n"
 "Klikk «Neste» for å begynne. "
 
-#: mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12399,91 +12522,91 @@ msgstr ""
 "et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
 "visning på skjermen."
 
-#: mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:149
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:150
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ikke gi beskjed når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:152
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:154
-msgid "_Enable"
-msgstr "_Aktiver"
-
-#: mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:154
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
+msgid "_Full Name:"
+msgstr "_Fullt navn:"
+
+#: ../mail/mail-config.glade.h:156
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:157
 msgid "_Load images if sender is in address book"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:161
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:163
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_pør ved sending av meldinger med tomt emnefelt"
 
-#: mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:166
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:167
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre applikasjoner"
 
-#: mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:170
 msgid "color"
 msgstr "farge"
 
-#: mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:171
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.glade.h:1
 msgid ""
 "\n"
 " Please read carefully the license agreement displayed\n"
@@ -12493,60 +12616,60 @@ msgstr ""
 "Vennligst les lisensavtalen som vises under nøye\n"
 "og kryss av i ruten for å akseptere den\n"
 
-#: mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.glade.h:7
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>Kilder for virtuelle mapper</b>"
 
-#: mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:8
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Digital signatur</span>"
 
-#: mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:9
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Kryptering</span>"
 
-#: mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Case _Sensitive"
 msgstr "_Skill mellom store/små bokstaver"
 
-#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
-#: mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:13
 msgid "F_ind:"
 msgstr "F_inn:"
 
-#: mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: mail/mail-dialogs.glade.h:15 mail/message-tag-followup.c:295
-#: mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:15 ../mail/message-tag-followup.c:295
+#: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
-#: mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:16
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:17
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:18
 msgid "None Selected"
 msgstr "Ingen valgt"
 
-#: mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:19
 msgid "S_erver:"
 msgstr "Tj_ener:"
 
-#: mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:20
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12554,53 +12677,53 @@ msgstr ""
 "Meldingene du har valgt for oppfølging er listet under.\n"
 "Vennligst velg en handling for oppfølging fra menyen «Flagg»."
 
-#: mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: mail/mail-dialogs.glade.h:25 mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:26 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:27
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:29
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: mail/mail-dialogs.glade.h:30
+#: ../mail/mail-dialogs.glade.h:30
 msgid "specific folders only"
 msgstr "kun spesifikke mapper"
 
-#: mail/mail-dialogs.glade.h:31
+#: ../mail/mail-dialogs.glade.h:31
 msgid "with all active remote folders"
 msgstr "med alle aktive eksterne mapper"
 
-#: mail/mail-dialogs.glade.h:32
+#: ../mail/mail-dialogs.glade.h:32
 msgid "with all local and active remote folders"
 msgstr "med alle lokale og aktive eksterne mapper"
 
-#: mail/mail-dialogs.glade.h:33
+#: ../mail/mail-dialogs.glade.h:33
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
 #. mail:camel-service-auth-invalid primary
-#: mail/mail-errors.xml.h:2
+#: ../mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
 msgstr "Ugyldig autentisering"
 
 #. mail:camel-service-auth-invalid secondary
-#: mail/mail-errors.xml.h:4
+#: ../mail/mail-errors.xml.h:4
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -12609,12 +12732,12 @@ msgstr ""
 "støtter autentisering i det hele tatt."
 
 #. mail:camel-service-auth-failed primary
-#: mail/mail-errors.xml.h:6
+#: ../mail/mail-errors.xml.h:6
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Din pålogging på tjener «{0}» som «{0}» feilet."
 
 #. mail:camel-service-auth-failed secondary
-#: mail/mail-errors.xml.h:8
+#: ../mail/mail-errors.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -12623,12 +12746,12 @@ msgstr ""
 "mellom store og små bokstaver. Caps lock kan være på."
 
 #. mail:ask-send-html primary
-#: mail/mail-errors.xml.h:10
+#: ../mail/mail-errors.xml.h:10
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Er du sikker på at du vil sende en melding i HTML-format?"
 
 #. mail:ask-send-html secondary
-#: mail/mail-errors.xml.h:12
+#: ../mail/mail-errors.xml.h:12
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12641,12 +12764,12 @@ msgstr ""
 "Send likevel?"
 
 #. mail:ask-send-no-subject primary
-#: mail/mail-errors.xml.h:17
+#: ../mail/mail-errors.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Er du sikker på at du vil sende en melding uten emne?"
 
 #. mail:ask-send-no-subject secondary
-#: mail/mail-errors.xml.h:19
+#: ../mail/mail-errors.xml.h:19
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -12656,12 +12779,12 @@ msgstr ""
 
 #. mail:ask-send-only-bcc-contact primary
 #. mail:ask-send-only-bcc primary
-#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#: ../mail/mail-errors.xml.h:22 ../mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
 
 #. mail:ask-send-only-bcc-contact secondary
-#: mail/mail-errors.xml.h:24
+#: ../mail/mail-errors.xml.h:24
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12672,7 +12795,7 @@ msgid ""
 msgstr ""
 
 #. mail:ask-send-only-bcc secondary
-#: mail/mail-errors.xml.h:31
+#: ../mail/mail-errors.xml.h:31
 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 "
@@ -12681,25 +12804,25 @@ msgid ""
 msgstr ""
 
 #. mail:send-no-recipients primary
-#: mail/mail-errors.xml.h:34
+#: ../mail/mail-errors.xml.h:34
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
 #. mail:send-no-recipients secondary
-#: mail/mail-errors.xml.h:36
+#: ../mail/mail-errors.xml.h:36
 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."
 msgstr ""
 
 #. mail:ask-default-drafts primary
-#: mail/mail-errors.xml.h:38
+#: ../mail/mail-errors.xml.h:38
 msgid "Use default drafts folder?"
 msgstr "Bruk forvalgt mappe for skisser?"
 
 #. mail:ask-default-drafts secondary
-#: mail/mail-errors.xml.h:40
+#: ../mail/mail-errors.xml.h:40
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -12707,12 +12830,12 @@ msgstr ""
 "Kunne ikke åpne skisse-mappen for denne kontoen. Vil du bruke standard "
 "skisse-mappe?"
 
-#: mail/mail-errors.xml.h:41
+#: ../mail/mail-errors.xml.h:41
 msgid "Use _Default"
 msgstr "Bruk _forvalg"
 
 #. mail:ask-expunge primary
-#: mail/mail-errors.xml.h:43
+#: ../mail/mail-errors.xml.h:43
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
@@ -12722,16 +12845,16 @@ msgstr ""
 
 #. mail:ask-expunge secondary
 #. mail:ask-empty-trash secondary
-#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+#: ../mail/mail-errors.xml.h:45 ../mail/mail-errors.xml.h:50
 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-errors.xml.h:46
+#: ../mail/mail-errors.xml.h:46
 msgid "_Expunge"
 msgstr "T_øm"
 
 #. mail:ask-empty-trash primary
-#: mail/mail-errors.xml.h:48
+#: ../mail/mail-errors.xml.h:48
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -12739,17 +12862,31 @@ msgstr ""
 "Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper "
 "permanent?"
 
-#: mail/mail-errors.xml.h:51
+#: ../mail/mail-errors.xml.h:51
 msgid "_Empty Trash"
 msgstr "Tøm søpp_elkurven"
 
+#. mail:ask-open-many primary
+#: ../mail/mail-errors.xml.h:53
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr "Er du sikker på at du vil åpne {0} meldinger samtidig?"
+
+#. mail:ask-open-many secondary
+#: ../mail/mail-errors.xml.h:55
+msgid "Opening too many messages at once may take a long time."
+msgstr ""
+
+#: ../mail/mail-errors.xml.h:56
+msgid "_Open Messages"
+msgstr "_Åpne meldinger"
+
 #. mail:exit-unsaved primary
-#: mail/mail-errors.xml.h:53
+#: ../mail/mail-errors.xml.h:58
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
 
 #. mail:exit-unsaved secondary
-#: mail/mail-errors.xml.h:55
+#: ../mail/mail-errors.xml.h:60
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -12758,12 +12895,12 @@ msgstr ""
 "igjen."
 
 #. mail:camel-exception primary
-#: mail/mail-errors.xml.h:57
+#: ../mail/mail-errors.xml.h:62
 msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Din melding med emne «{0}» ble ikke levert."
 
 #. mail:camel-exception secondary
-#: mail/mail-errors.xml.h:59
+#: ../mail/mail-errors.xml.h:64
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
 "reports the following error: status 67: mail not sent.\n"
@@ -12772,81 +12909,81 @@ msgid ""
 msgstr ""
 
 #. mail:async-error primary
-#: mail/mail-errors.xml.h:62
+#: ../mail/mail-errors.xml.h:67
 msgid "Error while {0}."
 msgstr "Feil under {0}."
 
 #. mail:async-error secondary
-#: mail/mail-errors.xml.h:64
+#: ../mail/mail-errors.xml.h:69
 msgid "{1}."
 msgstr "{1}."
 
 #. mail:async-error-nodescribe primary
-#: mail/mail-errors.xml.h:66
+#: ../mail/mail-errors.xml.h:71
 msgid "Error while performing operation."
 msgstr "Feil under utføring av operasjon."
 
 #. mail:async-error-nodescribe secondary
-#: mail/mail-errors.xml.h:68
+#: ../mail/mail-errors.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
 #. mail:ask-session-password primary
-#: mail/mail-errors.xml.h:82
+#: ../mail/mail-errors.xml.h:87
 msgid "Enter password."
 msgstr "Oppgi passord."
 
 #. mail:filter-load-error primary
-#: mail/mail-errors.xml.h:86
+#: ../mail/mail-errors.xml.h:91
 msgid "Error loading filter definitions."
 msgstr "Feil under lasting av filterdefinisjoner."
 
 #. mail:no-save-path primary
-#: mail/mail-errors.xml.h:90
+#: ../mail/mail-errors.xml.h:95
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikke lagre til katalog «{0}»."
 
 #. mail:no-create-path primary
 #. mail:no-write-path-exists primary
 #. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
-#: mail/mail-errors.xml.h:106
+#: ../mail/mail-errors.xml.h:99 ../mail/mail-errors.xml.h:107
+#: ../mail/mail-errors.xml.h:111
 msgid "Cannot save to file \"{0}\"."
 msgstr "Kan ikke lagre til fil «{0}»."
 
 #. mail:no-create-path secondary
-#: mail/mail-errors.xml.h:96
+#: ../mail/mail-errors.xml.h:101
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Kan ikke opprette katalog for lagring pga «{1}»"
 
 #. mail:no-create-tmp-path primary
-#: mail/mail-errors.xml.h:98
+#: ../mail/mail-errors.xml.h:103
 msgid "Cannot create temporary save directory."
 msgstr "Kan ikke opprette midlertidig katalog."
 
 #. mail:no-write-path-exists secondary
-#: mail/mail-errors.xml.h:104
+#: ../mail/mail-errors.xml.h:109
 msgid "File exists but cannot overwrite it."
 msgstr "Filen eksisterer men kan ikke overskrives."
 
 #. mail:no-write-path-notfile secondary
-#: mail/mail-errors.xml.h:108
+#: ../mail/mail-errors.xml.h:113
 msgid "File exists but is not a regular file."
 msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
 #. mail:no-delete-folder primary
-#: mail/mail-errors.xml.h:110
+#: ../mail/mail-errors.xml.h:115
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kunne ikke slette mappe «{0}»."
 
 #. mail:no-delete-special-folder primary
-#: mail/mail-errors.xml.h:114
+#: ../mail/mail-errors.xml.h:119
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Kan ikke slette systemmappe «{0}»."
 
 #. mail:no-delete-special-folder secondary
 #. mail:no-rename-special-folder secondary
-#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+#: ../mail/mail-errors.xml.h:121 ../mail/mail-errors.xml.h:125
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -12855,22 +12992,22 @@ msgstr ""
 "endre navn på, flytte eller slette disse."
 
 #. mail:no-rename-special-folder primary
-#: mail/mail-errors.xml.h:118
+#: ../mail/mail-errors.xml.h:123
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Kan ikke endre navn på eller flytte systemmappe «{0}»."
 
 #. mail:ask-delete-folder title
-#: mail/mail-errors.xml.h:122
+#: ../mail/mail-errors.xml.h:127
 msgid "Delete \"{0}\"?"
 msgstr "Slett «{0}»?"
 
 #. mail:ask-delete-folder primary
-#: mail/mail-errors.xml.h:124
+#: ../mail/mail-errors.xml.h:129
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Vil du virkelig slette mappen «{0}» og alle dens undermapper?"
 
 #. mail:ask-delete-folder secondary
-#: mail/mail-errors.xml.h:126
+#: ../mail/mail-errors.xml.h:131
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -12880,154 +13017,154 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#: ../mail/mail-errors.xml.h:133 ../mail/mail-errors.xml.h:137
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Kan ikke endre navn på «{0}» til {1}."
 
 #. mail:no-rename-folder-exists secondary
 #. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+#: ../mail/mail-errors.xml.h:135 ../mail/mail-errors.xml.h:197
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "En mappe med navn «{1}» eksisterer allerede. Vennligst bruk et annet navn."
 
 #. mail:no-rename-folder secondary
-#: mail/mail-errors.xml.h:134
+#: ../mail/mail-errors.xml.h:139
 msgid "Because \"{2}\"."
 msgstr "fordi «{2}»."
 
 #. mail:no-move-folder-nostore primary
 #. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#: ../mail/mail-errors.xml.h:141 ../mail/mail-errors.xml.h:145
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kunne ikke flytte mappe «{0}» til «{1}»."
 
 #. mail:no-move-folder-nostore secondary
 #. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#: ../mail/mail-errors.xml.h:143 ../mail/mail-errors.xml.h:151
 msgid "Cannot open source \"{2}\"."
 msgstr "Kan ikke åpne kilde «{2}»."
 
 #. mail:no-move-folder-to-nostore secondary
 #. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#: ../mail/mail-errors.xml.h:147 ../mail/mail-errors.xml.h:155
 msgid "Cannot open target \"{2}\"."
 msgstr "Kan ikke åpne mål «{2}»."
 
 #. mail:no-copy-folder-nostore primary
 #. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#: ../mail/mail-errors.xml.h:149 ../mail/mail-errors.xml.h:153
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kan ikke kopiere mappe «{0}» til «{1}»."
 
 #. mail:no-create-folder-nostore primary
-#: mail/mail-errors.xml.h:152
+#: ../mail/mail-errors.xml.h:157
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kan ikke opprette mappe «{0}»."
 
 #. mail:no-create-folder-nostore secondary
-#: mail/mail-errors.xml.h:154
+#: ../mail/mail-errors.xml.h:159
 msgid "Cannot open source \"{1}\""
 msgstr "Kan ikke åpne kilde «{1}»"
 
 #. mail:account-incomplete primary
 #. mail:account-notunique primary
-#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#: ../mail/mail-errors.xml.h:161 ../mail/mail-errors.xml.h:165
 msgid "Cannot save changes to account."
 msgstr "Kan ikke lagre endringer for kontoen."
 
 #. mail:account-incomplete secondary
-#: mail/mail-errors.xml.h:158
+#: ../mail/mail-errors.xml.h:163
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
 #. mail:account-notunique secondary
-#: mail/mail-errors.xml.h:162
+#: ../mail/mail-errors.xml.h:167
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
 #. mail:ask-delete-account title
-#: mail/mail-errors.xml.h:164
+#: ../mail/mail-errors.xml.h:169
 msgid "Delete account?"
 msgstr "Slett konto?"
 
 #. mail:ask-delete-account primary
-#: mail/mail-errors.xml.h:166
+#: ../mail/mail-errors.xml.h:171
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne kontoen?"
 
 #. mail:ask-delete-account secondary
-#: mail/mail-errors.xml.h:168
+#: ../mail/mail-errors.xml.h:173
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
-#: mail/mail-errors.xml.h:169
+#: ../mail/mail-errors.xml.h:174
 msgid "Don't delete"
 msgstr "Ikke slett"
 
 #. mail:no-save-signature primary
-#: mail/mail-errors.xml.h:171
+#: ../mail/mail-errors.xml.h:176
 msgid "Could not save signature file."
 msgstr "Kunne ikke lagre signaturfil."
 
 #. mail:no-save-signature secondary
-#: mail/mail-errors.xml.h:173
+#: ../mail/mail-errors.xml.h:178
 msgid "Because \"{0}\"."
 msgstr "Fordi «{0}»."
 
 #. mail:signature-notscript primary
-#: mail/mail-errors.xml.h:175
+#: ../mail/mail-errors.xml.h:180
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Kan ikke sette signaturskript «{0}»."
 
 #. mail:signature-notscript secondary
-#: mail/mail-errors.xml.h:177
+#: ../mail/mail-errors.xml.h:182
 msgid "The script file must exist and be executable."
 msgstr "Skriptfilen må eksistere og være kjørbar."
 
 #. mail:ask-signature-changed title
-#: mail/mail-errors.xml.h:179
+#: ../mail/mail-errors.xml.h:184
 msgid "Discard changed?"
 msgstr "Forkast endringer?"
 
 #. mail:ask-signature-changed primary
-#: mail/mail-errors.xml.h:181
+#: ../mail/mail-errors.xml.h:186
 msgid "Do you wish to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
 #. mail:ask-signature-changed secondary
-#: mail/mail-errors.xml.h:183
+#: ../mail/mail-errors.xml.h:188
 msgid "This signature has been changed, but has not been saved."
 msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: mail/mail-errors.xml.h:184
+#: ../mail/mail-errors.xml.h:189
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
 #. mail:vfolder-notexist primary
-#: mail/mail-errors.xml.h:186
+#: ../mail/mail-errors.xml.h:191
 msgid "Cannot edit vFolder \"{0}\" as it does not exist."
 msgstr "Kan ikke redigere virtuell mappe «{0}» da den ikke eksisterer."
 
 #. mail:vfolder-notexist secondary
-#: mail/mail-errors.xml.h:188
+#: ../mail/mail-errors.xml.h:193
 msgid ""
 "This folder may have been added implictly, go to the virtual folder editor "
 "to add it explictly, if required."
 msgstr ""
 
 #. mail:vfolder-notunique primary
-#: mail/mail-errors.xml.h:190
+#: ../mail/mail-errors.xml.h:195
 msgid "Cannot add vFolder \"{0}\"."
 msgstr "Kan ikke legge til virtuell mappe «{0}»."
 
 #. mail:vfolder-updated primary
-#: mail/mail-errors.xml.h:194
+#: ../mail/mail-errors.xml.h:199
 msgid "vFolders automatically updated."
 msgstr "Virtuelle mapper oppdatert automatisk."
 
 #. mail:vfolder-updated secondary
-#: mail/mail-errors.xml.h:196
+#: ../mail/mail-errors.xml.h:201
 msgid ""
 "The following vFolder(s):\n"
 "{0}\n"
@@ -13042,12 +13179,12 @@ msgstr ""
 "og ble oppdatert."
 
 #. mail:filter-updated primary
-#: mail/mail-errors.xml.h:202
+#: ../mail/mail-errors.xml.h:207
 msgid "Mail filters automatically updated."
 msgstr "E-postfiltre oppdatert automatisk."
 
 #. mail:filter-updated secondary
-#: mail/mail-errors.xml.h:204
+#: ../mail/mail-errors.xml.h:209
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13062,27 +13199,27 @@ msgstr ""
 "og ble oppdatert."
 
 #. mail:no-folder primary
-#: mail/mail-errors.xml.h:210
+#: ../mail/mail-errors.xml.h:215
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
 #. mail:no-folder secondary
-#: mail/mail-errors.xml.h:212
+#: ../mail/mail-errors.xml.h:217
 msgid "You must specify a folder."
 msgstr "Du må oppgi en mappe."
 
 #. mail:no-name-vfolder secondary
-#: mail/mail-errors.xml.h:216
+#: ../mail/mail-errors.xml.h:221
 msgid "You must name this vFolder."
 msgstr "Du må gi navn til denne virtuelle mappen."
 
 #. mail:vfolder-no-source primary
-#: mail/mail-errors.xml.h:218
+#: ../mail/mail-errors.xml.h:223
 msgid "No sources selected."
 msgstr "Ingen kilder valgt."
 
 #. mail:vfolder-no-source secondary
-#: mail/mail-errors.xml.h:220
+#: ../mail/mail-errors.xml.h:225
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting\n"
@@ -13090,12 +13227,12 @@ msgid ""
 msgstr ""
 
 #. mail:ask-migrate-existing primary
-#: mail/mail-errors.xml.h:224
+#: ../mail/mail-errors.xml.h:229
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:226
+#: ../mail/mail-errors.xml.h:231
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13103,25 +13240,25 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:230
+#: ../mail/mail-errors.xml.h:235
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
+#: ../mail/mail-errors.xml.h:236 ../widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: mail/mail-errors.xml.h:232
+#: ../mail/mail-errors.xml.h:237
 msgid "_Append"
 msgstr "_Legg til"
 
 #. mail:no-load-license primary
-#: mail/mail-errors.xml.h:234
+#: ../mail/mail-errors.xml.h:239
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
 #. mail:no-load-license secondary
-#: mail/mail-errors.xml.h:236
+#: ../mail/mail-errors.xml.h:241
 msgid ""
 "Cannot read the license file \"{0}\", due to an\n"
 "      installation problem.  You will not be able to use this provider "
@@ -13130,22 +13267,22 @@ msgid ""
 msgstr ""
 
 #. mail:checking-service title
-#: mail/mail-errors.xml.h:240
+#: ../mail/mail-errors.xml.h:245
 msgid "Querying server"
 msgstr "Spør tjener"
 
 #. mail:checking-service primary
-#: mail/mail-errors.xml.h:242
+#: ../mail/mail-errors.xml.h:247
 msgid "Please wait."
 msgstr "Vennligst vent."
 
 #. mail:checking-service secondary
-#: mail/mail-errors.xml.h:244
+#: ../mail/mail-errors.xml.h:249
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
 
 #. mail:gw-accountsetup-error primary
-#: mail/mail-errors.xml.h:246
+#: ../mail/mail-errors.xml.h:251
 msgid ""
 "Unable to connect to the GroupWise\n"
 "server."
@@ -13154,31 +13291,31 @@ msgstr ""
 "tjener."
 
 #. mail:gw-accountsetup-error secondary
-#: mail/mail-errors.xml.h:249
+#: ../mail/mail-errors.xml.h:254
 msgid ""
 "\n"
 "Please check your account settings and try again.\n"
 msgstr ""
 
-#: mail/mail-folder-cache.c:813
+#: ../mail/mail-folder-cache.c:813
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: mail/mail-ops.c:101
+#: ../mail/mail-ops.c:101
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:262
+#: ../mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:556
+#: ../mail/mail-ops.c:556
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: mail/mail-ops.c:581
+#: ../mail/mail-ops.c:581
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13187,114 +13324,114 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: mail/mail-ops.c:590
+#: ../mail/mail-ops.c:590
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: mail/mail-ops.c:687
+#: ../mail/mail-ops.c:687
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:718
+#: ../mail/mail-ops.c:718
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: mail/mail-ops.c:720 mail/mail-send-recv.c:607
+#: ../mail/mail-ops.c:720 ../mail/mail-send-recv.c:607
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: mail/mail-ops.c:722
+#: ../mail/mail-ops.c:722
 msgid "Complete."
 msgstr "Fullført."
 
-#: mail/mail-ops.c:819
+#: ../mail/mail-ops.c:819
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:904
+#: ../mail/mail-ops.c:904
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:904
+#: ../mail/mail-ops.c:904
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:1130
+#: ../mail/mail-ops.c:1130
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1173
+#: ../mail/mail-ops.c:1173
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1245
+#: ../mail/mail-ops.c:1245
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1323
+#: ../mail/mail-ops.c:1323
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: mail/mail-ops.c:1482
+#: ../mail/mail-ops.c:1482
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: mail/mail-ops.c:1483
+#: ../mail/mail-ops.c:1483
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: mail/mail-ops.c:1538
+#: ../mail/mail-ops.c:1538
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: mail/mail-ops.c:1574 mail/mail-ops.c:1625
+#: ../mail/mail-ops.c:1574 ../mail/mail-ops.c:1625
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1622
+#: ../mail/mail-ops.c:1622
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: mail/mail-ops.c:1623
+#: ../mail/mail-ops.c:1623
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1778
+#: ../mail/mail-ops.c:1778
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1864
+#: ../mail/mail-ops.c:1864
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1914
+#: ../mail/mail-ops.c:1914
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13303,7 +13440,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1942
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13312,11 +13449,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:2013
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2025
+#: ../mail/mail-ops.c:2025
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13325,782 +13462,898 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: ../mail/mail-ops.c:2035
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2185
+#: ../mail/mail-ops.c:2185
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2185
+#: ../mail/mail-ops.c:2185
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: mail/mail-ops.c:2301
+#: ../mail/mail-ops.c:2301
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-send-recv.c:158
+#: ../mail/mail-send-recv.c:158
 msgid "Cancelling..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:265
+#: ../mail/mail-send-recv.c:265
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tjener: %s, Type: %s"
 
-#: mail/mail-send-recv.c:267
+#: ../mail/mail-send-recv.c:267
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sti: %s, Type: %s"
 
-#: mail/mail-send-recv.c:269
+#: ../mail/mail-send-recv.c:269
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:320
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: mail/mail-send-recv.c:323
+#: ../mail/mail-send-recv.c:323
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: mail/mail-send-recv.c:410
+#: ../mail/mail-send-recv.c:410
 msgid "Updating..."
 msgstr "Oppdaterer..."
 
-#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:462
+#: ../mail/mail-send-recv.c:410 ../mail/mail-send-recv.c:462
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:208
+#: ../mail/mail-session.c:208
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: mail/mail-session.c:210
+#: ../mail/mail-session.c:210
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: mail/mail-session.c:239
+#: ../mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Rediger signatur"
 
-#: mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Oppgi et navn for denne signaturen."
 
-#: mail/mail-signature-editor.c:415
-#: plugins/shared-folder/properties.glade.h:11
+#: ../mail/mail-signature-editor.c:415
+#: ../plugins/shared-folder/properties.glade.h:5
 msgid "Name:"
 msgstr "Navn:"
 
-#: mail/mail-tools.c:115
+#: ../mail/mail-tools.c:115
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Kan ikke opprette spool-katalog «%s»: %s"
 
-#: mail/mail-tools.c:142
+#: ../mail/mail-tools.c:142
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Prøver å bruke movemail på en kilde som ikke er i mbox-format «%s»"
 
-#: mail/mail-tools.c:277
+#: ../mail/mail-tools.c:277
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:279
+#: ../mail/mail-tools.c:279
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: mail/mail-tools.c:320
+#: ../mail/mail-tools.c:320
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Ugyldig mappe: «%s»"
 
-#: mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Setter opp virtuell mappe: %s"
 
-#: mail/mail-vfolder.c:235
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating vFolders for '%s:%s'"
 msgstr "Oppdaterer virtuelle mapper for «%s:%s»"
 
-#: mail/mail-vfolder.c:242
+#: ../mail/mail-vfolder.c:242
 #, c-format
 msgid "Updating vFolders for '%s'"
 msgstr "Oppdaterer virtuelle mapper for «%s»"
 
-#: mail/mail-vfolder.c:961
+#: ../mail/mail-vfolder.c:961
 msgid "vFolders"
 msgstr "Virtuelle mapper"
 
-#: mail/mail-vfolder.c:1000
+#: ../mail/mail-vfolder.c:1000
 msgid "Edit VFolder"
 msgstr "Rediger virtuell mappe"
 
-#: mail/mail-vfolder.c:1084
+#: ../mail/mail-vfolder.c:1084
 msgid "New VFolder"
 msgstr "Ny virtuell mappe"
 
-#: mail/message-list.c:999
+#: ../mail/message-list.c:999
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:1000
+#: ../mail/message-list.c:1000
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:1001
+#: ../mail/message-list.c:1001
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:1002
+#: ../mail/message-list.c:1002
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:1003
+#: ../mail/message-list.c:1003
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:1007
+#: ../mail/message-list.c:1007
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:1008
+#: ../mail/message-list.c:1008
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:1012
+#: ../mail/message-list.c:1012
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:1013
+#: ../mail/message-list.c:1013
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:1341
+#: ../mail/message-list.c:1341
 msgid "?"
 msgstr "?"
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: mail/message-list.c:1348 plugins/itip-formatter/itip-view.c:160
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:160
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: mail/message-list.c:1357
+#: ../mail/message-list.c:1357
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:1369
+#: ../mail/message-list.c:1369
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:1377
+#: ../mail/message-list.c:1377
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: mail/message-list.c:1379
+#: ../mail/message-list.c:1379
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2044
+#: ../mail/message-list.c:2044
 msgid "Message List"
 msgstr "Meldingsliste"
 
-#: mail/message-list.c:3381
+#: ../mail/message-list.c:3381
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: mail/message-list.etspec.h:3
+#: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Ferdig til"
 
-#: mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Status for merking"
 
-#: mail/message-list.etspec.h:5
+#: ../mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Merket"
 
-#: mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Følg opp-flagg"
 
-#: mail/message-list.etspec.h:8
+#: ../mail/message-list.etspec.h:8
 msgid "Original Location"
 msgstr "Opprinnelig lokasjon"
 
-#: mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Mottatt"
 
-#: mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:74
 msgid "Call"
 msgstr "Ring"
 
-#: mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:75
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:76
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:77
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:79
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:83
 msgid "Review"
 msgstr "Gjennomgå"
 
-#: mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
-#: mail/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Kropp inneholder ikke"
-
-#: mail/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Kropp eller emne inneholder"
-
-#: mail/searchtypes.xml.h:4
+#: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
 msgstr "Melding inneholder"
 
-#: mail/searchtypes.xml.h:5
+#: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
-#: mail/searchtypes.xml.h:6
+#: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
-#: mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
-#: mail/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Emne inneholder ikke"
+#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Sender contains"
+msgstr "Emne eller avsender inneholder"
 
-#: plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup.c:109
 msgid "Backup Evolution directory"
 msgstr "Ta sikkerhetskopi av Evolution-mapper"
 
-#: plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:111
 msgid "Restore Evolution directory"
 msgstr "Gjenopprett Evolution-mapper"
 
-#: plugins/backup-restore/backup.c:113
+#: ../plugins/backup-restore/backup.c:113
 msgid "Check Evolution archive"
 msgstr "Sjekk arkiv for Evolution"
 
-#: plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:115
 msgid "Restart Evolution"
 msgstr "Start Evolution på nytt"
 
-#: plugins/backup-restore/backup-restore.c:51
+#: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
 msgstr ""
 
-#: plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:61
 msgid "_Restart Evolution after backup"
 msgstr ""
 
-#: plugins/backup-restore/backup-restore.c:89
+#: ../plugins/backup-restore/backup-restore.c:89
 msgid "Select Evolution archive to restore"
 msgstr ""
 
-#: plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:97
 msgid "_Restart Evolution after restore"
 msgstr ""
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
 msgstr "Innstillinger for sikkerhetskopiering..."
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-#, fuzzy
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
-msgstr "Endre innstillinger for Evolution"
+msgstr "Sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution"
 
-#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
 msgstr "Gjenopprett innstillinger..."
 
-#: plugins/bbdb/bbdb.c:388
+#: ../plugins/bbdb/bbdb.c:388
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
-#: plugins/bbdb/bbdb.c:397
+#: ../plugins/bbdb/bbdb.c:397
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automatiske kontakter</span>"
 
 #. Enable BBDB checkbox
-#: plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:410
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 
-#: plugins/bbdb/bbdb.c:428
+#: ../plugins/bbdb/bbdb.c:428
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Kontakter for lynmeldinger</span>"
 
 #. Enable Gaim Checkbox
-#: plugins/bbdb/bbdb.c:441
+#: ../plugins/bbdb/bbdb.c:441
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
 msgstr ""
 
 #. Synchronize now button.
-#: plugins/bbdb/bbdb.c:448
+#: ../plugins/bbdb/bbdb.c:448
 msgid "Synchronize with _buddy list now"
 msgstr "Synkroniser med _vennelisten nå"
 
-#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
+msgid "Weather: Cloudy"
+msgstr "Vær: overskyet"
+
+#: ../plugins/calendar-weather/calendar-weather.c:61
+msgid "Weather: Fog"
+msgstr "Vær: tåke"
+
+#: ../plugins/calendar-weather/calendar-weather.c:62
+msgid "Weather: Partly Cloudy"
+msgstr "Vær: delvis skyet"
+
+#: ../plugins/calendar-weather/calendar-weather.c:63
+msgid "Weather: Rain"
+msgstr "Vær: regn"
+
+#: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Snow"
+msgstr "Vær: snø"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Sunny"
+msgstr "Vær: sol"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Thunderstorms"
+msgstr "Vær: tordenvær"
+
+#: ../plugins/calendar-weather/calendar-weather.c:100
+msgid "Weather"
+msgstr "Vær"
+
+#: ../plugins/calendar-weather/calendar-weather.c:268
+msgid "Select a location"
+msgstr "Velg en lokasjon"
+
+#: ../plugins/calendar-weather/calendar-weather.c:655
+msgid "_Units:"
+msgstr "_Enheter:"
+
+#: ../plugins/calendar-weather/calendar-weather.c:662
+msgid "Metric (Celsius, cm, etc)"
+msgstr "Metrisk (celcius, cm, osv)"
+
+#: ../plugins/calendar-weather/calendar-weather.c:663
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr "Imerisk (Fahrenheit, tommer, osv)"
+
+#: ../plugins/default-source/default-source.c:82
+msgid "Mark  as default folder"
+msgstr "Sett som forvalgt mappe"
+
+#: ../plugins/default-source/default-source.c:108
+msgid "Mark as default folder"
+msgstr "Sett som forvalgt mappe"
+
+#. Description section
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:91
+#, fuzzy
+msgid ""
+"The message specified below will be automatically sent to \n"
+"each person who sends mail to you while you are out of the office."
+msgstr ""
+"<small>Meldingen spesifisert under vil sendes automatisk til alle som sender "
+"deg\n"
+"e-post mens du er borte fra kontoret.</small>"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:115
+msgid "I am in the office"
+msgstr "Jeg er på kontoret"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:129
+msgid "I am out of the office"
+msgstr "Jeg er ute av kontoret"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:143
+msgid "Out of office Message:"
+msgstr "Melding ved fravær fra kontoret"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:194
+msgid "Exchange Settings"
+msgstr "Innstillinger for Exchange"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:329
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:193
+msgid "A_uthenticate"
+msgstr "A_utentiser"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:336
+#: ../plugins/exchange-account-setup/exchange-ask-password.c:200
+msgid "_OWA Url:"
+msgstr "_OWA-URL:"
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Fjerner abonnement på mappe «%s»"
 
-#: plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
 msgid "Checklist"
 msgstr "Sjekkliste"
 
-#: plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
+msgid "Add Send Options to groupwise messages"
+msgstr ""
+
+#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:20
+msgid "Send Options"
+msgstr "Alternativer for sending"
+
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppføring"
 
-#: plugins/itip-formatter/itip-formatter.c:750
+#: ../plugins/itip-formatter/itip-formatter.c:750
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kunne ikke sende oppføring til kalender «%s». %s"
 
-#: plugins/itip-formatter/itip-formatter.c:761
+#: ../plugins/itip-formatter/itip-formatter.c:761
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som godtatt"
 
-#: plugins/itip-formatter/itip-formatter.c:765
+#: ../plugins/itip-formatter/itip-formatter.c:765
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: plugins/itip-formatter/itip-formatter.c:770
+#: ../plugins/itip-formatter/itip-formatter.c:770
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: plugins/itip-formatter/itip-formatter.c:775
+#: ../plugins/itip-formatter/itip-formatter.c:775
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: plugins/itip-formatter/itip-formatter.c:825
-#, fuzzy
+#: ../plugins/itip-formatter/itip-formatter.c:826
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
+msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
 
-#: plugins/itip-formatter/itip-formatter.c:836
+#: ../plugins/itip-formatter/itip-formatter.c:837
 #, c-format
-msgid "Unable to update attendee statusAttendee status updated. %s"
-msgstr ""
+msgid "Unable to update attendee. %s"
+msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: plugins/itip-formatter/itip-formatter.c:840
+#: ../plugins/itip-formatter/itip-formatter.c:841
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: plugins/itip-formatter/itip-formatter.c:965
+#: ../plugins/itip-formatter/itip-formatter.c:966
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: plugins/itip-formatter/itip-formatter.c:966
+#: ../plugins/itip-formatter/itip-formatter.c:967
 msgid ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1000
-#: plugins/itip-formatter/itip-formatter.c:1056
+#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1057
 msgid "The item in the calendar is not valid"
-msgstr ""
+msgstr "Oppføringen i kalenderen er ikke gyldig"
 
-#: plugins/itip-formatter/itip-formatter.c:1001
-#: plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1002
+#: ../plugins/itip-formatter/itip-formatter.c:1058
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1012
+#: ../plugins/itip-formatter/itip-formatter.c:1013
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1014
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1632
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Meetings and Tasks"
 msgstr "Møter og oppgaver"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid "_Delete message after acting"
 msgstr ""
 
-#: plugins/itip-formatter/itip-formatter.c:1665
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">Søk etter konflikter</span>"
 
 #. Source selector
-#: plugins/itip-formatter/itip-formatter.c:1678
+#: ../plugins/itip-formatter/itip-formatter.c:1694
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:146 ui/evolution-calendar.xml.h:34
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:450
+#: ../plugins/itip-formatter/itip-view.c:146 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:450
 msgid "Today"
 msgstr "I dag"
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:151
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:151
 msgid "Today %H:%M"
 msgstr "I dag %H:%M"
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:155
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:155
 msgid "Today %H:%M:%S"
 msgstr "I dag %H:%M:%S"
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:164
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:164
 msgid "Today %l:%M:%S %p"
 msgstr "I dag %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:172
-#: plugins/itip-formatter/itip-view.c:224
-msgid "%A, %B %e"
-msgstr "%A, %e %B"
+#: ../plugins/itip-formatter/itip-view.c:172
+msgid "Tomorrow"
+msgstr "I morgen"
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:177
-#: plugins/itip-formatter/itip-view.c:229
-msgid "%A, %B %e %H:%M"
-msgstr "%A, %e %B %H:%M"
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:177
+msgid "Tomorrow %H:%M"
+msgstr "I morgen %H.%M"
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:181
-#: plugins/itip-formatter/itip-view.c:233
-msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %e %B %H.%M.%S"
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:181
+msgid "Tomorrow %H:%M:%S"
+msgstr "I morgen %H.%M.%S"
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:186
-#: plugins/itip-formatter/itip-view.c:238
-msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %e %B %l:%M %p"
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:186
+msgid "Tomorrow %l:%M %p"
+msgstr "I morgen %l.%M %p"
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:190
-#: plugins/itip-formatter/itip-view.c:242
-msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %e %B %l.%M.%S %p"
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:190
+#, fuzzy
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "I morgen %l.%M.%S %p"
 
-#. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:198
+#. strftime format of a weekday.
+#: ../plugins/itip-formatter/itip-view.c:198
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#. strftime format of a weekday, a date and a
+#. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:203
+#: ../plugins/itip-formatter/itip-view.c:203
 msgid "%A %H:%M"
 msgstr "%A %H.%M"
 
-#. strftime format of a weekday, a date and a
+#. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "%A %H:%M:%S"
 msgstr "%A %H.%M.%S"
 
-#. strftime format of a weekday, a date and a
+#. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "%A %l:%M %p"
 msgstr "%A %l.%M %p"
 
-#. strftime format of a weekday, a date and a
+#. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:216
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l.%M.%S %p"
 
+#. strftime format of a weekday and a date
+#. without a year.
+#: ../plugins/itip-formatter/itip-view.c:225
+msgid "%A, %B %e"
+msgstr "%A, %e %B"
+
+#. strftime format of a weekday, a date
+#. without a year and a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:231
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e %B %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:235
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e %B %H.%M.%S"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:240
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e %B %l.%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:244
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e %B %l.%M.%S %p"
+
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:248
+#: ../plugins/itip-formatter/itip-view.c:250
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:255
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:259
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B %Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:266
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l.%M.%S %p"
 
-#: plugins/itip-formatter/itip-view.c:291
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:293
+#, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> til og med %s har publisert følgende møteinformasjon:"
+msgstr "<b>%s</b> har via %s publisert følgende møteinformasjon:"
 
-#: plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:295
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> har publisert følgende møteinformasjon:"
 
-#: plugins/itip-formatter/itip-view.c:298
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:300
+#, c-format
 msgid "<b>%s</b> requests the presence of %s at the following meeting:"
-msgstr "<b>%s</b> forespør at %s er tilstede i et møte."
+msgstr "<b>%s</b> forespør at %s er tilstede i følgende møte."
 
-#: plugins/itip-formatter/itip-view.c:301
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:303
+#, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
+msgstr "<b>%s</b> forespør via %s din tilstedeværelse i et møte."
 
-#: plugins/itip-formatter/itip-view.c:303
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:305
+#, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
+msgstr "<b>%s</b> forespør din tilstedeværelse i følgende møte:"
 
-#: plugins/itip-formatter/itip-view.c:309
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:311
+#, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte."
+msgstr "<b>%s</b> ønsker via %s å legge til informasjon i et eksisterende møte:"
 
-#: plugins/itip-formatter/itip-view.c:311
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:313
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte."
+msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte:"
 
-#: plugins/itip-formatter/itip-view.c:314
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:316
+#, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
+msgstr "<b>%s</b> ønsker å motta den seneste informasjon for følgende møte:"
 
-#: plugins/itip-formatter/itip-view.c:317
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:319
+#, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> har sendt en uforståelig melding."
+msgstr "<b>%s</b> har sendt tilbake følgende svar på møteinnkalling:"
 
-#: plugins/itip-formatter/itip-view.c:321
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:323
+#, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
-msgstr "<b>%s</b> har avlyst et møte."
+msgstr "<b>%s</b> har via %s avlyst følgende møte:"
 
-#: plugins/itip-formatter/itip-view.c:323
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:325
+#, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
-msgstr "<b>%s</b> har avlyst et møte."
+msgstr "<b>%s</b> har avlyst følgende møte:"
 
-#: plugins/itip-formatter/itip-view.c:326
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:328
+#, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> har svart på en møteforespørsel."
+msgstr "<b>%s</b> har foreslått følgende endringer i møte:"
 
-#: plugins/itip-formatter/itip-view.c:330
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:332
+#, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> har svart på en møteforespørsel."
+msgstr "<b>%s</b> har via %s avslått følgende endringer for møte:"
 
-#: plugins/itip-formatter/itip-view.c:332
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:334
+#, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> har svart på en møteforespørsel."
+msgstr "<b>%s</b> har avslått følgende endringer for møte:"
 
-#: plugins/itip-formatter/itip-view.c:359
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:361
+#, c-format
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> har publisert informasjon om en oppgave."
+msgstr "<b>%s</b> har via %s publisert følgende oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:361
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:363
+#, c-format
 msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> har publisert informasjon om en oppgave."
+msgstr "<b>%s</b> har publisert følgende oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:366
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:368
+#, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> forespør at %s er tilstede i et møte."
+msgstr "<b>%s</b> forespør at %s tildeles følgende oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:369
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:371
+#, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> har avlyst en oppgave."
+msgstr "<b>%s</b> har via %s tildelt deg en oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:371
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:373
+#, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> har avlyst en oppgave."
+msgstr "<b>%s</b> har tildelt deg en oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:377
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:379
+#, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave."
+msgstr "<b>%s</b> forespør via %s å legge til informasjon i eksisterende oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:379
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:381
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave."
+msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:382
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:384
+#, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
+msgstr "<b>%s</b> ønsker å motta den seneste informasjon for følgende tildelt oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:385
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:387
+#, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> har sendt en uforståelig melding."
+msgstr "<b>%s</b> har sendt tilbake følgende svar på tildelt oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:389
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:391
+#, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
-msgstr "<b>%s</b> har avlyst en oppgave."
+msgstr "<b>%s</b> har via %s avlyst følgende tildelt oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:391
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:393
+#, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
-msgstr "<b>%s</b> har avlyst en oppgave."
+msgstr "<b>%s</b> har avlyst følgende tildelt oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:394
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:396
+#, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> har svart på en oppgavetildeling."
+msgstr "<b>%s</b> har foreslått følgende endringer i oppgavetildeling:"
 
-#: plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
+msgstr "<b>%s</b> har via %s avslått følgende tildelt oppgave:"
 
-#: plugins/itip-formatter/itip-view.c:400
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:402
+#, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> har svart på en oppgavetildeling."
+msgstr "<b>%s</b> har avslått følgende tildelt oppgave:"
 
 #. Comment
-#: plugins/itip-formatter/itip-view.c:846
-#: plugins/itip-formatter/itip-view.c:896
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:898
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: plugins/itip-formatter/itip-view.c:1573
-msgid "_Calendar:"
-msgstr "_Kalender:"
-
 #. org.gnome.mailing-list-actions:no-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
 msgid "Action not available"
 msgstr "Handlingen er ikke tilgjengelig"
 
 #. org.gnome.mailing-list-actions:no-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
 msgid ""
 "This message does not contain the header information required for this "
 "action."
 msgstr ""
 
 #. org.gnome.mailing-list-actions:posting-not-allowed primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
 msgid "Posting not allowed"
 msgstr "Posting er ikke tillatt"
 
 #. org.gnome.mailing-list-actions:posting-not-allowed secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
 
 #. org.gnome.mailing-list-actions:ask-send-message primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
 msgid "Send e-mail message to mailing list?"
 msgstr "Send melding til e-postliste?"
 
 #. org.gnome.mailing-list-actions:ask-send-message secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
 msgid ""
 "An e-mail message will be sent to the URL \"{0}\". You can either send the "
 "message automatically, or see and change it first.\n"
@@ -14109,21 +14362,21 @@ msgid ""
 "has been sent."
 msgstr ""
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
 msgid "_Send message"
 msgstr "_Send melding"
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
 msgid "_Edit message"
 msgstr "R_ediger melding"
 
 #. org.gnome.mailing-list-actions:malformed-header primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
 msgid "Malformed header"
 msgstr "Feilutformet hode"
 
 #. org.gnome.mailing-list-actions:malformed-header secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
@@ -14131,13 +14384,12 @@ msgid ""
 msgstr ""
 
 #. org.gnome.mailing-list-actions:no-action primary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
-#, fuzzy
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
 msgid "No e-mail action"
-msgstr "Loggfør filterhandlinger"
+msgstr "Ingen handling for e-post"
 
 #. org.gnome.mailing-list-actions:no-action secondary
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
 msgid ""
 "The action could not be performed. This means the header for this action did "
 "not contain any action we could handle.\n"
@@ -14145,149 +14397,92 @@ msgid ""
 "Header: {0}"
 msgstr ""
 
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-#, fuzzy
-msgid "Contact list _owner"
-msgstr "Kontaktlisteredigering"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
-#, fuzzy
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get an archive of the list this message belongs to"
-msgstr ""
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-msgid "Get list _archive"
-msgstr ""
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-#, fuzzy
-msgid "Get list _usage information"
-msgstr "Møteinformasjon"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-msgid "Mailing _List"
-msgstr "E-post_liste"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-#, fuzzy
-msgid "Post a message to the mailing list this message belongs to"
-msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-#, fuzzy
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-#, fuzzy
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-#, fuzzy
-msgid "_Post message to list"
-msgstr "Send _melding til liste..."
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-#, fuzzy
-msgid "_Subscribe to list"
-msgstr "_Abonner"
-
-#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-#, fuzzy
-msgid "_Un-subscribe to list"
-msgstr "_Fjern abonnement"
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: ../plugins/new-mail-notify/new-mail-notify.c:66
+msgid "_Generates a D-BUS message when new mail arrives"
+msgstr "_Genererer en D-BUS-melding når nye meldinger ankommer"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
-msgstr ""
+msgstr "Aktiver og deaktiver tillegg"
 
-#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "Manage Plugins..."
 msgstr "Håndter tillegg..."
 
-#: plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:45
 msgid "Author(s)"
 msgstr "Fofatter(e)"
 
-#: plugins/plugin-manager/plugin-manager.c:46
+#: ../plugins/plugin-manager/plugin-manager.c:46
 msgid "Id"
 msgstr "Id"
 
-#: plugins/plugin-manager/plugin-manager.c:47
+#: ../plugins/plugin-manager/plugin-manager.c:47
 msgid "Path"
 msgstr "Sti"
 
-#: plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:48
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Setup the ui
-#: plugins/plugin-manager/plugin-manager.c:188
+#: ../plugins/plugin-manager/plugin-manager.c:188
 msgid "Plugin Manager"
 msgstr "Tilleggshåndterer"
 
-#: plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:201
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 
-#: plugins/plugin-manager/plugin-manager.c:210
+#: ../plugins/plugin-manager/plugin-manager.c:210
 msgid "Plugin"
 msgstr "Tillegg"
 
-#: plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
 msgstr "Vis HTML hvis det finnes"
 
-#: plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
 msgstr "Foretrekk vanlig tekst"
 
-#: plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:107
 msgid "Only ever show PLAIN"
 msgstr "Vis kun vanlig tekst"
 
-#: plugins/prefer-plain/prefer-plain.c:150
+#: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
 msgstr "HTML-modus"
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
 msgstr "Lagre vedlegg..."
 
-#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "Lagre alle vedlegg"
 
-#: plugins/save-attachments/save-attachments.c:331
-#, fuzzy
+#: ../plugins/save-attachments/save-attachments.c:331
 msgid "Select save base name"
-msgstr "Velg en tidssone"
+msgstr "Velg basisnavn for lagring"
 
-#: plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:351
 msgid "MIME Type"
 msgstr "MIME-type"
 
-#: plugins/save-attachments/save-attachments.c:359
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
+#: ../plugins/save-attachments/save-attachments.c:359
+#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Lagre"
 
-#: plugins/save-calendar/csv-format.c:167
+#: ../plugins/save-calendar/csv-format.c:167
 #, c-format
 msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
-msgstr ""
+msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
 
-#: plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:370
 #, c-format
 msgid ""
 "Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
@@ -14295,246 +14490,239 @@ msgid ""
 "sAttendees List%sLocation%sModified%s"
 msgstr ""
 
-#: plugins/save-calendar/csv-format.c:519
+#: ../plugins/save-calendar/csv-format.c:519
 msgid "Advanced options for the CSV format"
-msgstr ""
+msgstr "Avanserte alternativer for CVS-format"
 
-#: plugins/save-calendar/csv-format.c:526
+#: ../plugins/save-calendar/csv-format.c:526
 msgid "Prepend a header"
-msgstr ""
+msgstr "Legg til et hode"
 
-#: plugins/save-calendar/csv-format.c:535
-#, fuzzy
+#: ../plugins/save-calendar/csv-format.c:535
 msgid "Value delimiter:"
-msgstr "Lokal levering"
+msgstr "Skilletegn for verdier:"
 
-#: plugins/save-calendar/csv-format.c:541
+#: ../plugins/save-calendar/csv-format.c:541
 msgid "Record delimiter:"
-msgstr ""
+msgstr "Skilletegn for poster:"
 
-#: plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Encapsulate values with:"
 msgstr ""
 
-#: plugins/save-calendar/csv-format.c:569
+#: ../plugins/save-calendar/csv-format.c:569
 msgid "Comma separated value format (.csv)"
-msgstr ""
+msgstr "Kommaseparert verdiformat (.csv)"
 
-#: plugins/save-calendar/ical-format.c:120
+#: ../plugins/save-calendar/ical-format.c:120
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-format (.ics)"
 
-#: plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:390
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
-#: plugins/save-calendar/save-calendar.c:172
-#: plugins/save-calendar/save-calendar.c:182
+#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:182
 msgid "Select destination file"
 msgstr "Velg målfil"
 
-#: plugins/save-calendar/save-calendar.c:217
+#: ../plugins/save-calendar/save-calendar.c:217
 #, c-format
 msgid ""
 "The suggested filename extension of this filetype (%s) is unused in the "
 "chosen filename. Do you want to continue?"
 msgstr ""
 
-#: plugins/shared-folder/properties.glade.h:1
-#, fuzzy
-msgid ""
-"\n"
-"Share List"
-msgstr "_Telefonliste"
-
-#: plugins/shared-folder/properties.glade.h:4
-msgid "Ad_d"
-msgstr "Le_gg til"
+#: ../plugins/shared-folder/properties.glade.h:2
+msgid "<b>Users :</b>"
+msgstr "<b>Brukere:</b> "
 
-#: plugins/shared-folder/properties.glade.h:5
-msgid "Additional Access"
-msgstr ""
-
-#: plugins/shared-folder/properties.glade.h:7
-msgid "Delet_e"
-msgstr "Sl_ett"
-
-#: plugins/shared-folder/properties.glade.h:8
-msgid "Edi_t"
-msgstr "Red_iger"
-
-#: plugins/shared-folder/properties.glade.h:10
+#: ../plugins/shared-folder/properties.glade.h:4
 msgid "Message"
 msgstr "Melding"
 
-#: plugins/shared-folder/properties.glade.h:12
-msgid "Sen_d Custom Notification"
-msgstr ""
-
-#: plugins/shared-folder/properties.glade.h:13
+#: ../plugins/shared-folder/properties.glade.h:6
 msgid "Shared Folder Notification"
-msgstr ""
+msgstr "Melding om delte mapper"
 
-#: plugins/shared-folder/properties.glade.h:15
+#: ../plugins/shared-folder/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
-msgstr ""
+msgstr "Deltakerene  vil motta følgende varsel.\n"
+
+#: ../plugins/shared-folder/properties.glade.h:11
+msgid "_Contacts..."
+msgstr "_Kontakter..."
 
-#: plugins/shared-folder/properties.glade.h:18
+#: ../plugins/shared-folder/properties.glade.h:12
+msgid "_Cutomize notification message"
+msgstr "_Tilpass varslingsmelding"
+
+#: ../plugins/shared-folder/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Ikke delt"
 
-#: plugins/shared-folder/properties.glade.h:20
+#: ../plugins/shared-folder/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Delt med..."
 
-#: plugins/shared-folder/properties.glade.h:21
+#: ../plugins/shared-folder/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Deling"
 
-#: plugins/shared-folder/share-folder-common.c:315
+#: ../plugins/shared-folder/share-folder-common.c:315
 msgid "Users"
 msgstr "Brukere"
 
-#: plugins/shared-folder/share-folder-common.c:316
+#: ../plugins/shared-folder/share-folder-common.c:316
 msgid "Enter the users and set permissions"
-msgstr ""
+msgstr "Oppgi brukere og sett rettigheter"
 
-#: plugins/shared-folder/share-folder-common.c:402
+#: ../plugins/shared-folder/share-folder-common.c:401
 msgid "Sharing"
 msgstr "Deling"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "Button style"
+#: ../shell/apps_evolution_shell.schemas.in.in.h:1
+msgid "A GNOME Print description of the current printer settings"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+msgid "Button style"
+msgstr "Knappestil"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Buttons are visible"
-msgstr ""
+msgstr "Knapper er synlige"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default width of the folder bar pane"
 msgstr "Forvalgt bredde for mappelinjen"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window height"
 msgstr "Forvalgt vinduhøyde"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Forvalgt vindubredde"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Evolution configuration version"
 msgstr "Konfigurasjonsversjon for Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID eller alias for komponenten som skal være forvalgt ved oppstart."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Last upgraded Evolution configuration version"
 msgstr "Sist oppgradert konfigurasjonsversjon for Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Printer settings"
+msgstr "Innstillinger for skriver"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The style of the displayed buttons. Can be text, icons, both, toolbar. If "
 "toolbar is set, the style of the toolbar is followed as determined by the "
 "GNOME setting."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "Toolbar is visible"
 msgstr "Verktøylinjen er synlig"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Om Evolution skal startes i frakoblet modus"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 #, fuzzy
 msgid "Whether the buttons should be visible."
 msgstr "Om verktøylinjen skal være synlig."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Whether the toolbar should be visible."
 msgstr "Om verktøylinjen skal være synlig."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Whether to skip the development warning dialog"
 msgstr "Om varseldialogen om utviklingsversjonen skal hoppes over"
 
-#: shell/e-active-connection-dialog.glade.h:1
+#: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
 msgstr "<b>Aktive forbindelser</b>"
 
-#: shell/e-active-connection-dialog.glade.h:2
+#: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
 msgstr "Aktive tilkoblinger"
 
-#: shell/e-active-connection-dialog.glade.h:3
+#: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr "Klikk OK for å lukke disse forbindelsene og arbeide frakoblet"
 
-#: shell/e-shell.c:597
+#: ../shell/e-shell.c:597
 msgid "Uknown system error."
 msgstr "Ukjent systemfeil."
 
-#: shell/e-shell.c:805 shell/e-shell.c:806
+#: ../shell/e-shell.c:805 ../shell/e-shell.c:806
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:1249 widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1249 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1251
+#: ../shell/e-shell.c:1251
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1253
+#: ../shell/e-shell.c:1253
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1255
+#: ../shell/e-shell.c:1255
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1257
+#: ../shell/e-shell.c:1257
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: shell/e-shell-folder-title-bar.c:586 shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:586
+#: ../shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:147
 msgid "Choose the type of importer to run:"
 msgstr "Velg type importerer som skal kjøres:"
 
-#: shell/e-shell-importer.c:149
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14548,15 +14736,15 @@ msgstr ""
 "Du kan velge «Automatisk» hvis du ikke vet, så vil Evolution prøve å finne "
 "ut hvilken type det er for deg."
 
-#: shell/e-shell-importer.c:155
+#: ../shell/e-shell-importer.c:156
 msgid "Choose the destination for this import"
 msgstr "Velg mål det skal importeres til"
 
-#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:750
+#: ../shell/e-shell-importer.c:159 ../shell/e-shell-startup-wizard.c:750
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
-#: shell/e-shell-importer.c:161
+#: ../shell/e-shell-importer.c:162
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14568,7 +14756,7 @@ msgstr ""
 "som kunne importeres ble funnet. Hvis du vil prøve igjen\n"
 "kan du klikke på «Tilbake»-knappen.\n"
 
-#: shell/e-shell-importer.c:232 shell/e-shell-importer.c:266
+#: ../shell/e-shell-importer.c:233 ../shell/e-shell-importer.c:267
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14577,30 +14765,30 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring %d."
 
-#: shell/e-shell-importer.c:340
+#: ../shell/e-shell-importer.c:341
 msgid "Select importer"
 msgstr "Velg importerer"
 
-#: shell/e-shell-importer.c:461 shell/e-shell-importer.c:1073
+#: ../shell/e-shell-importer.c:462 ../shell/e-shell-importer.c:1086
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:469
+#: ../shell/e-shell-importer.c:470
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:477
+#: ../shell/e-shell-importer.c:478
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Importerer %s.\n"
 
-#: shell/e-shell-importer.c:487 shell/e-shell-importer.c:488
+#: ../shell/e-shell-importer.c:488 ../shell/e-shell-importer.c:489
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: shell/e-shell-importer.c:506
+#: ../shell/e-shell-importer.c:507
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14609,31 +14797,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: shell/e-shell-importer.c:582
+#: ../shell/e-shell-importer.c:583
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:638
+#: ../shell/e-shell-importer.c:639
 msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
-#: shell/e-shell-importer.c:643
+#: ../shell/e-shell-importer.c:644
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: shell/e-shell-importer.c:655
+#: ../shell/e-shell-importer.c:656
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: shell/e-shell-importer.c:694
+#: ../shell/e-shell-importer.c:695
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: shell/e-shell-importer.c:697
+#: ../shell/e-shell-importer.c:698
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: shell/e-shell-importer.c:765 shell/e-shell-startup-wizard.c:571
+#: ../shell/e-shell-importer.c:766 ../shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14641,41 +14829,41 @@ msgstr ""
 "Vennligst vent...\n"
 "Søker etter eksisterende oppsett"
 
-#: shell/e-shell-importer.c:772
+#: ../shell/e-shell-importer.c:773
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: shell/e-shell-importer.c:898 shell/e-shell-startup-wizard.c:700
+#: ../shell/e-shell-importer.c:899 ../shell/e-shell-startup-wizard.c:700
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1092
+#: ../shell/e-shell-importer.c:1105
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Ingen importfunksjon tilgjengelig for fil %s"
 
-#: shell/e-shell-importer.c:1106
+#: ../shell/e-shell-importer.c:1119
 msgid "Unable to execute importer"
 msgstr "Kan ikke kjøre importprogram"
 
-#: shell/e-shell-importer.c:1220
+#: ../shell/e-shell-importer.c:1235
 msgid "_Import"
 msgstr "_Importer"
 
-#: shell/e-shell-offline-handler.c:589
+#: ../shell/e-shell-offline-handler.c:589
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
-#: shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Innstillinger for Evolution"
 
-#: shell/e-shell-startup-wizard.c:577
+#: ../shell/e-shell-startup-wizard.c:577
 msgid "Starting import"
 msgstr "Starter import"
 
-#: shell/e-shell-startup-wizard.c:797
+#: ../shell/e-shell-startup-wizard.c:797
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14689,181 +14877,184 @@ msgstr ""
 "\n"
 "Vil du avslutte veiviseren nå?"
 
-#: shell/e-shell-utils.c:116
+#: ../shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ingen mappenavn spesifisert."
 
-#: shell/e-shell-utils.c:123
+#: ../shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
 msgstr "Mappenavn kan ikke inneholde linjeskift."
 
-#: shell/e-shell-utils.c:129
+#: ../shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
 msgstr "Mappenavn kan ikke inneholde tegnet «/»."
 
-#: shell/e-shell-utils.c:135
+#: ../shell/e-shell-utils.c:135
 msgid "Folder name cannot contain the character \"#\"."
 msgstr "Mappenavn kan ikke inneholde tegnet «#»."
 
-#: shell/e-shell-utils.c:141
+#: ../shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
-#: shell/e-shell-window.c:341
+#: ../shell/e-shell-window.c:341
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
 
-#: shell/e-shell-window.c:349
+#: ../shell/e-shell-window.c:349
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i ferd med å koble fra."
 
-#: shell/e-shell-window.c:356
+#: ../shell/e-shell-window.c:356
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
 
-#: shell/e-shell-window.c:708
+#: ../shell/e-shell-window.c:708
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: shell/e-shell-window-commands.c:67
+#: ../shell/e-shell-window-commands.c:67
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilot verktøyene ser ikke ut til å være installert på dette systemet."
 
-#: shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:75
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil under kjøring av %s."
 
-#: shell/e-shell-window-commands.c:124
+#: ../shell/e-shell-window-commands.c:124
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy er ikke installert."
 
-#: shell/e-shell-window-commands.c:132
+#: ../shell/e-shell-window-commands.c:132
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: shell/e-shell-window-commands.c:425
+#: ../shell/e-shell-window-commands.c:425
 msgid "translator-credits"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:439
+#: ../shell/e-shell-window-commands.c:439
 msgid "Groupware Suite"
 msgstr "Gruppevareløsning"
 
-#: shell/e-shell-window-commands.c:680
+#: ../shell/e-shell-window-commands.c:680
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: shell/e-shell-window-commands.c:693 ui/evolution.xml.h:51
+#: ../shell/e-shell-window-commands.c:693 ../ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: shell/e-shell-window-commands.c:706 ui/evolution.xml.h:34
+#: ../shell/e-shell-window-commands.c:706 ../ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Ny"
 
-#: shell/evolution-startup-wizard.glade.h:2
+#: ../shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Konfigurasjonsassistent for Evolution"
 
-#: shell/evolution-startup-wizard.glade.h:3
+#: ../shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importerer filer"
 
-#: shell/evolution-startup-wizard.glade.h:4
+#: ../shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Tidssone "
 
-#: shell/evolution-startup-wizard.glade.h:5
+#: ../shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: shell/evolution-startup-wizard.glade.h:6
+#: ../shell/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Velkommen til Evolution. De neste skjermene lar deg konfigurere Evolution til å koble til dine e-post kontoer, og importere filer fra andre applikasjoner. \n"
+"Velkommen til Evolution. De neste skjermene lar deg konfigurere Evolution "
+"til å koble til dine e-post kontoer, og importere filer fra andre "
+"applikasjoner. \n"
 "\n"
 "Vennligst klikk «Fremover» for å fortsette. "
 
-#: shell/evolution-startup-wizard.glade.h:9
+#: ../shell/evolution-startup-wizard.glade.h:9
 msgid ""
 "You have successfully entered all of the information needed to set up "
 "Evolution. \n"
 "\n"
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
-"Du har fullført inntasting av all informasjon som trengs for å konfigurere Evolution.\n"
+"Du har fullført inntasting av all informasjon som trengs for å konfigurere "
+"Evolution.\n"
 "\n"
 "Klikk på «Bruk» for å lagre dine innstillinger. "
 
-#: shell/evolution-test-component.c:140
+#: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Ny test"
 
-#: shell/evolution-test-component.c:141
+#: ../shell/evolution-test-component.c:141
 msgid "_Test"
 msgstr "_Test"
 
-#: shell/evolution-test-component.c:142
+#: ../shell/evolution-test-component.c:142
 msgid "Create a new test item"
 msgstr "Opprett en ny testoppføring"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution skall"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Testkomponent for Evolution"
 
-#: shell/importer/import.glade.h:1
+#: ../shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klikk på «Importer» for å starte import av filen til Evolution."
 
-#: shell/importer/import.glade.h:2
+#: ../shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Importeringsassistent for Evolution"
 
-#: shell/importer/import.glade.h:3
+#: ../shell/importer/import.glade.h:3
 msgid "Import File"
 msgstr "Importer fil"
 
-#: shell/importer/import.glade.h:4
+#: ../shell/importer/import.glade.h:4
 msgid "Import Location"
 msgstr "Importer lokasjon"
 
-#: shell/importer/import.glade.h:5
+#: ../shell/importer/import.glade.h:5
 msgid "Importer Type"
 msgstr "Type import"
 
-#: shell/importer/import.glade.h:6
+#: ../shell/importer/import.glade.h:6
 msgid "Select Importers"
 msgstr "Velg importprogram"
 
-#: shell/importer/import.glade.h:7
+#: ../shell/importer/import.glade.h:7
 msgid "Select a File"
 msgstr "Velg en fil"
 
-#: shell/importer/import.glade.h:8
+#: ../shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -14873,28 +15064,28 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av\n"
 "eksterne filer til Evolution."
 
-#: shell/importer/intelligent.c:193
+#: ../shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "Importerere"
 
-#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
+#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importer"
 
-#: shell/importer/intelligent.c:199
+#: ../shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "Ikke importer"
 
-#: shell/importer/intelligent.c:203
+#: ../shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "Ikke spør meg igjen"
 
-#: shell/importer/intelligent.c:211
+#: ../shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:237
+#: ../shell/main.c:237
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14929,7 +15120,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: shell/main.c:261
+#: ../shell/main.c:261
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -14937,43 +15128,43 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: shell/main.c:268
+#: ../shell/main.c:268
 msgid "Don't tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: shell/main.c:473
+#: ../shell/main.c:473
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: shell/main.c:475
+#: ../shell/main.c:475
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: shell/main.c:477
+#: ../shell/main.c:477
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: shell/main.c:480
+#: ../shell/main.c:480
 msgid "Forcibly shut down all Evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: shell/main.c:484
+#: ../shell/main.c:484
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvungen ommigrering fra Evolution 1.4"
 
-#: shell/main.c:487
+#: ../shell/main.c:487
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:490
+#: ../shell/main.c:490
 msgid "Disable the mono plugin environment."
-msgstr ""
+msgstr "Deaktiver mono-tilleggsmiljø."
 
-#: shell/main.c:493
+#: ../shell/main.c:493
 msgid "Disable loading of any plugins."
-msgstr ""
+msgstr "Slå av lasting av tillegg."
 
-#: shell/main.c:524
+#: ../shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14983,12 +15174,12 @@ msgstr ""
 "  Bruk %s --help for mer informasjon.\n"
 
 #. shell:upgrade-nospace primary
-#: shell/shell-errors.xml.h:2
+#: ../shell/shell-errors.xml.h:2
 msgid "Insufficient disk space for upgrade."
 msgstr "Ikke nok diskplass for oppgraderingen."
 
 #. shell:upgrade-nospace secondary
-#: shell/shell-errors.xml.h:4
+#: ../shell/shell-errors.xml.h:4
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
 "you only have {1} available.\n"
@@ -15002,7 +15193,7 @@ msgstr ""
 "Du må gjøre mer plass tilgjengelig i din hjemmekatalog før du kan fortsette."
 
 #. shell:upgrade-failed primary
-#: shell/shell-errors.xml.h:8
+#: ../shell/shell-errors.xml.h:8
 msgid ""
 "Upgrade from previous version failed:\n"
 "{0}"
@@ -15011,7 +15202,7 @@ msgstr ""
 "{0}"
 
 #. shell:upgrade-failed secondary
-#: shell/shell-errors.xml.h:11
+#: ../shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
 "\n"
@@ -15023,18 +15214,18 @@ msgstr ""
 "Hvis du velger å fortsette vil du kanskje ikke få tilgang til alle dine "
 "gamle data.\n"
 
-#: shell/shell-errors.xml.h:15
+#: ../shell/shell-errors.xml.h:15
 msgid "Continue"
 msgstr "Fortsett"
 
 #. shell:upgrade-remove-1-4 title
 #. shell:upgrade-remove-1-4 primary
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
+#: ../shell/shell-errors.xml.h:17 ../shell/shell-errors.xml.h:19
 msgid "Delete old data from version {0}?"
 msgstr "Slett gamle data fra versjon {0}?"
 
 #. shell:upgrade-remove-1-4 secondary
-#: shell/shell-errors.xml.h:21
+#: ../shell/shell-errors.xml.h:21
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
@@ -15044,22 +15235,22 @@ msgid ""
 "convenience.\n"
 msgstr ""
 
-#: shell/shell-errors.xml.h:25
+#: ../shell/shell-errors.xml.h:25
 msgid "_Remind Me Later"
 msgstr "_Vis påminnelse senere"
 
-#: shell/shell-errors.xml.h:26
+#: ../shell/shell-errors.xml.h:26
 msgid "_Keep Data"
 msgstr "_Behold data"
 
 #. shell:upgrade-remove-1-4-confirm title
 #. shell:upgrade-remove-1-4-confirm primary
-#: shell/shell-errors.xml.h:28 shell/shell-errors.xml.h:30
+#: ../shell/shell-errors.xml.h:28 ../shell/shell-errors.xml.h:30
 msgid "Really delete old data?"
 msgstr "Vil du virkelig slette gamle data?"
 
 #. shell:upgrade-remove-1-4-confirm secondary
-#: shell/shell-errors.xml.h:32
+#: ../shell/shell-errors.xml.h:32
 msgid ""
 "The entire contents of the \"evolution\" directory is about to be be "
 "permanently removed.\n"
@@ -15074,18 +15265,18 @@ msgstr ""
 
 #. shell:noshell title
 #. shell:noshell-reason title
-#: shell/shell-errors.xml.h:39 shell/shell-errors.xml.h:47
+#: ../shell/shell-errors.xml.h:39 ../shell/shell-errors.xml.h:47
 msgid "Cannot start Evolution"
 msgstr "Kan ikke starte Evolution."
 
 #. shell:noshell primary
 #. shell:noshell-reason primary
-#: shell/shell-errors.xml.h:41 shell/shell-errors.xml.h:49
+#: ../shell/shell-errors.xml.h:41 ../shell/shell-errors.xml.h:49
 msgid "Evolution can not start."
 msgstr "Evolution kan ikke starte."
 
 #. shell:noshell secondary
-#: shell/shell-errors.xml.h:43
+#: ../shell/shell-errors.xml.h:43
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -15093,7 +15284,7 @@ msgid ""
 msgstr ""
 
 #. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:51
+#: ../shell/shell-errors.xml.h:51
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -15102,7 +15293,7 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/ca-trust-dialog.c:91
+#: ../smime/gui/ca-trust-dialog.c:91
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -15110,69 +15301,74 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
-#: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
-#: smime/gui/certificate-manager.c:595 smime/gui/certificate-manager.c:603
+#: ../smime/gui/certificate-manager.c:134
+#: ../smime/gui/certificate-manager.c:142
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
 msgid "Select a cert to import..."
 msgstr "Velg et sertifikat som skal importeres..."
 
-#: smime/gui/certificate-manager.c:263 smime/gui/certificate-manager.c:472
-#: smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:263
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
 msgstr "Navn på sertifikat"
 
-#: smime/gui/certificate-manager.c:272 smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:272
+#: ../smime/gui/certificate-manager.c:490
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: smime/gui/certificate-manager.c:281 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:281 ../smime/gui/smime-ui.glade.h:36
+#: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: smime/gui/certificate-manager.c:289
+#: ../smime/gui/certificate-manager.c:289
 msgid "Expires"
 msgstr "Utgår"
 
-#: smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
-#: smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatvisning: %s"
 
-#: smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:145
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
 
-#: smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:149
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
 
-#: smime/gui/component.c:45
+#: ../smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Oppgi passord for «%s»"
 
 #. we're setting the password initially
-#: smime/gui/component.c:68
+#: ../smime/gui/component.c:68
 msgid "Enter new password for certificate database"
 msgstr "Oppgi passordet for «%s»"
 
-#: smime/gui/component.c:70
+#: ../smime/gui/component.c:70
 msgid "Enter new password"
 msgstr "Oppgi nytt passord"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -15181,7 +15377,7 @@ msgstr ""
 "Utstedt til:\n"
 "  Subjekt: %s\n"
 
-#: smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15190,59 +15386,59 @@ msgstr ""
 "Utstedt av:\n"
 "  Subjekt: %s\n"
 
-#: smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Velg sertifikat"
 
-#: smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Ikke en del av sertifikatet>"
 
-#: smime/gui/smime-ui.glade.h:2
+#: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
 msgstr "<b>Sertifikatfelt</b>"
 
-#: smime/gui/smime-ui.glade.h:3
+#: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
 msgstr "<b>Sertifikathierarki</b>"
 
-#: smime/gui/smime-ui.glade.h:4
+#: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
 msgstr "<b>Feltverdi</b>"
 
-#: smime/gui/smime-ui.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
 msgstr "<b>Fingeravtrykk</b>"
 
-#: smime/gui/smime-ui.glade.h:6
+#: ../smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
 msgstr "<b>Utstedt av</b> "
 
-#: smime/gui/smime-ui.glade.h:7
+#: ../smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
 msgstr "<b>Utstedt til</b> "
 
-#: smime/gui/smime-ui.glade.h:8
+#: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
 msgstr "<b>Dette sertifikatet er verifisert for følgende bruk:</b>"
 
-#: smime/gui/smime-ui.glade.h:9
+#: ../smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
 msgstr "<b>Gyldighet</b> "
 
-#: smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "Autoriteter"
 
-#: smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
 msgstr "Sikkerhetskopier"
 
-#: smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
 msgstr "Sikkerhetskopier alle"
 
-#: smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.glade.h:13
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -15250,1748 +15446,1750 @@ msgstr ""
 "Før du stoler på denne CAen for noe formål bør du undersøke sertifikatet og "
 "dets regelsett og prosedyrer (hvis tilgjengelig)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikat"
 
-#: smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
 msgstr "Tillit til sertifikatmyndighet"
 
-#: smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
 msgstr "Detaljer om sertifikat"
 
-#: smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr "Vanlig navn (CN)"
 
-#: smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.glade.h:18
 msgid "Contact Certificates"
 msgstr "Kontaktsertifikater"
 
-#: smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ikke stol på at dette sertifikatet er autentisk"
 
-#: smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Dummyvindu"
 
-#: smime/gui/smime-ui.glade.h:22
+#: ../smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Rediger"
 
-#: smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Email Certificate Trust Settings"
-msgstr "Sertifikatmyndighet for e-post"
+msgstr "Innstillinger for "
 
-#: smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat for e-postmottaker"
 
-#: smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr "Sertifikat for signering av e-post"
 
-#: smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
 msgstr "Utgår"
 
-#: smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr "Utstedt"
 
-#: smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr "MD5-fingeravtrykk"
 
-#: smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.glade.h:31
 msgid "Organization (O)"
 msgstr "Organisasjon (O)"
 
-#: smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.glade.h:32
 msgid "Organizational Unit (OU)"
 msgstr "Organisasjonsenhet (OU)"
 
-#: smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtrykk"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:34 ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-klientsertifikat"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-tjenersertifikat"
 
-#: smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/smime-ui.glade.h:37
 msgid "Trust the authenticity of this certificate"
 msgstr "Stol på at dette sertifikatet er autentisk"
 
-#: smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Stol på denne CAen for å identifisere e-postbrukere."
 
-#: smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Stol på denne CAen for å identifisere programvareutviklere."
 
-#: smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Stol på denne CAen for identifisering av nettsteder."
 
-#: smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Vis"
 
-#: smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.glade.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Du har sertifikater som identifiserer deg fra disse organisasjonene:"
 
-#: smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Du har sertifikater på lager som identifiserer disse sertifikatmyndighetene:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#: smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.glade.h:46
 msgid "_Edit CA Trust"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:48
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
-#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:424
 msgid "Sign"
 msgstr "Signer"
 
-#: smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:425
 msgid "Encrypt"
 msgstr "Krypter"
 
-#: smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versjon"
 
-#: smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versjon 1"
 
-#: smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versjon 2"
 
-#: smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versjon 3"
 
-#: smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:648
+#: ../smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:651
+#: ../smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:654
+#: ../smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:657
+#: ../smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:660
+#: ../smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-kryptering"
 
-#: smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Bruksområde for sertifikatnøkkel"
 
-#: smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape sertifikattype"
 
-#: smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Nøkkelidentifikator for sertifikatmyndighet"
 
-#: smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifikator (%s)"
 
-#: smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algoritmeidentifikator"
 
-#: smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Parametere for algoritme"
 
-#: smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Informasjon om subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritme for subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Feil: Kan ikke prosessere utvidelse"
 
-#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Signeringspart for objekt"
 
-#: smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL-sertifikatmyndighet"
 
-#: smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Sertifikatmyndighet for e-post"
 
-#: smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Signering"
 
-#: smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ingen informasjon"
 
-#: smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Nøkkelchiffer"
 
-#: smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Datachiffer"
 
-#: smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Nøkkelavtale"
 
-#: smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Sertifikatsignerer"
 
-#: smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL-signerer"
 
-#: smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritisk"
 
-#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Ikke-kritisk"
 
-#: smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Utvidelser"
 
-#: smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Signeringsalgoritme for sertifikat"
 
-#: smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Utsteder"
 
-#: smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Unik ID for utsteder"
 
-#: smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Unik ID for subjekt"
 
-#: smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Signaturverdi for sertifikat"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
+#: ../smime/lib/e-cert-db.c:612
 msgid "Certificate already exists"
 msgstr "Sertifikatet eksisterer allerede"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "Passord for PKCS12-fil"
 
-#: smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:264
 msgid "Enter password for PKCS12 file:"
 msgstr "Oppgi passord for PKCS12-fil:"
 
-#: smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Importert sertifikat"
 
-#: tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "Et vedlegg som skal legges til."
 
-#: tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:325
 msgid "Content type of the attachment."
 msgstr "Innholdstype for vedlegget."
 
-#: tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
 msgstr "Filnavnet som skal vises i meldingen."
 
-#: tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:327
 msgid "Description of the attachment."
 msgstr "Beskrivelse av vedlegget."
 
-#: tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
 msgstr "Merk vedlegg for visning i meldingen som forvalg."
 
-#: tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
 msgstr "Forvalgt emne for meldingen."
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:61
+#: ../tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Kunne ikke kjøre «%s»: %s\n"
 
-#: tools/killev.c:76
+#: ../tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Stenger ned %s (%s)\n"
 
-#: ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopier kontakt(er) til en annen mappe..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Copy to Folder..."
 msgstr "Kopier til mappe..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Flytt kontakt(er) til en annen mappe..."
 
-#: ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Forhåndsviser kontaktene som skal skrives ut"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail-message.xml.h:81 ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:81 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Skriv ut valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Lagre valgte kontakter som et VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Velg alle kontakter"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:23
 msgid "Send a message to the selected contacts."
 msgstr "Send en melding til valgte kontakter."
 
-#: ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Send melding til kontakt"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Send valgte kontakter til en annen person."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
 msgstr "Vis vindu for forhåndsvisning av kontakter"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Stopp innlesing"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-mail-global.xml.h:15 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:19
-#: ui/evolution.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-mail-global.xml.h:15 ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:107 ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution.xml.h:36
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt..."
 
-#: ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Forhåndsvisningsvindu"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "Lagre _som VCard..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "_Velg alle"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "_Send melding til kontakt..."
 
-#: ui/evolution-calendar.xml.h:4
+#: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:6
+#: ../ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Slett alle hendelser"
 
-#: ui/evolution-calendar.xml.h:7
+#: ../ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Slett avtalen"
 
-#: ui/evolution-calendar.xml.h:8
+#: ../ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Slett denne hendelsen"
 
-#: ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Slett denne hendelsen"
 
-#: ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Gå til"
 
-#: ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Gå tilbake"
 
-#: ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Gå fremover"
 
-#: ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:13
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Måned"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "Forhåndsviser av kalenderen som skal skrives ut"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:79
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:22
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publiser ledig/opptatt informasjon for denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Fj_ern"
 
-#: ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtaler og møter"
 
-#: ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "Velg _dato"
 
-#: ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Velg en spesifikk dato"
 
-#: ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "Velg i dag"
 
-#: ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Vis denne avtalen"
 
-#: ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Uke"
 
-#: ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
-#: ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Åpne avtale"
 
-#: ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-composer-entries.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ui/evolution-composer-entries.xml.h:3
+#: ../ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
 msgstr "Klipp ut valgt tekst til utklippstavlen"
 
-#: ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:4
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst fra utklippstavlen"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
-#: ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Velg _alle"
 
-#: ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:6
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ../ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Tilpass Min Evolution"
 
-#: ui/evolution-mail-global.xml.h:2
+#: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ui/evolution-mail-global.xml.h:3
+#: ../ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ui/evolution-mail-global.xml.h:4
+#: ../ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Opprett eller rediger definisjoner av virtuelle mapper"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Tø_m søppelkurven"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:7
 msgid "Open a window for composing a mail message"
 msgstr "Åpne et vindu for å skrive en e-post melding"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
 msgstr "Legg ut n_y melding"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Post a message to a Public folder"
 msgstr "Legg ut en melding til en ny offentlig mappe"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "S_ubscribe to Folders..."
 msgstr "_Abonnerer på mapper..."
 
-#: ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Show message preview window"
 msgstr "Vis vindu for forhåndsvisning av melding"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering av virtuelle mapper..."
 
-#: ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-list.xml.h:1
+#: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:2 ../ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopier valgt(e) melding(er) til utklippstavlen"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Klipp ut valgt(e) melding(er) til utklippstavlen"
 
-#: ui/evolution-mail-list.xml.h:4
+#: ../ui/evolution-mail-list.xml.h:4
 msgid "E_xpunge"
 msgstr "T_øm"
 
-#: ui/evolution-mail-list.xml.h:5
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Skjul valgt_e meldinger"
 
-#: ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
 msgstr "Skjul slette_de meldinger"
 
-#: ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
 msgstr "Skjul leste meldinge_r"
 
-#: ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Skjul slettede meldinger heller enn å vise dem gjennomstreket"
 
-#: ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
 msgstr "Me_rk alle som lest"
 
-#: ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Merk alle synlige meldinger som lest"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Lim inn melding(er) fra utklippstavlen"
 
-#: ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
-#: ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr "Velg _tråd"
 
-#: ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Velg alle og bare meldinger som ikke allerede er valgt"
 
-#: ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Velg alle meldinger i samme tråd som den valgte meldingen"
 
-#: ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
 msgstr "_Vis skjulte meldinger"
 
-#: ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
 msgstr "Vis meldinger som er midlertidig skjult"
 
-#: ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Skjul alle leste meldinger midlertidig"
 
-#: ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
 msgstr "Skjul valgte meldinger midlertidig"
 
-#: ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "_Folder"
 msgstr "M_appe"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Reverser utvalg"
 
-#: ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "Meldingsliste med _tråder"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Lukk"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:37
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:41 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution.xml.h:37
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:39
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:39
 msgid "_File"
 msgstr "_Fil"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ui/evolution-mail-message.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr "_Påfør filtre"
 
-#: ui/evolution-mail-message.xml.h:3
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "Legg til avsender i adressebok"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Caret _Mode"
 msgstr "Markør_modus"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:8
 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:11
+#: ../ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr "Lag _virtuell mappe fra melding"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:16
 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:17
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr "Lag en virtuell mappe for disse mottakerene"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr "Lag en virtuell mappe for denne e-postlisten"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr "Lag en virtuell mappe for denne avsenderen"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr "Lag en virtuell mappe for dette emnet"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "Vis neste uleste tråd"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "F_orward As..."
 msgstr "V_ideresend som..."
 
-#: ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter _Junk"
 msgstr "Filtrer s_øppel"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer på e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filtrer på se_nder..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filtrer på mottake_re..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filtrer på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter søppelstatus"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Merk valgt(e) melding(er) for oppfølging"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Følg _opp..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "Last b_ilder"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "Merk som _viktig"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "Merk som _ulest"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "Merk som uv_iktig"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "Merk valgt(e) melding(er) som lest"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "Merk valgt(e) melding(er) som viktige"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr "Merk valgt(e) melding(er) som søppel"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Merk valgt(e) melding(er) som ikke søppel"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Merk valgt(e) melding(er) som ulest"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Merk valgt(e) melding(er) som uviktige"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "Flytt valgt(e) melding(er) til en annen mappe"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr "Ikke søppel"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "Åpne valgt melding i et nytt vindu"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer for editing"
 msgstr "Åpne valgt melding for redigering"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "Opprinnelig st_ørrelse"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr "Legg ut et s_var"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post et svar på en melding i en offentlig mappe"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "Søk i m_elding..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "_Mindre"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "Lagre meldingen som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Sett opp sideinnstillinger for din skriver"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "Vis fulle _headere"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:97
 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:98
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "Vis melding i normal stil"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "Vis melding med fulle e-post headere"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:100
 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:101
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "Tekstst_ørrelse"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "Angre slett av den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder på e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr "VFolder for se_nder..."
 
-#: ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr "VFolder for mottake_re..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr "VFolder på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "Vedl_agt"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Åpne melding"
 
-#: ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:129 ../ui/evolution.xml.h:48
 msgid "_Tools"
 msgstr "Ve_rktøy"
 
-#: ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ui/evolution-message-composer.xml.h:2
+#: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Slett alt unntatt signatur"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Krypter denne meldingen med PGP"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krypter denne meldingen med ditt S/MIME krypteringssertifikat"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:9
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Åpne en fil"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Krypter med PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Signer med PGP"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Krypter med S/MIME"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Signer med S/MIME"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Lagre som"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "L_agre utkast"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Lagre i mappe..."
 
-#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Send meldingen i HTML-format"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Vis/skjul vedlegg"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Vis _vedlegg"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Vis vedlegg"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldingen med din PGP-nøkkel"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer denne meldingen med ditt S/MIME signatursertifikat"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå av/på visning av BCC-feltet"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå av/på visning av CC-feltet"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Slå av/på visning av Fra-feltet"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Slå av/på visning av Post-til feltet"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the To field is displayed"
 msgstr "Slå av/på visning av Til-feltet"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
-#: ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "_Delete all"
 msgstr "_Slett alle"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:47
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Post-To Field"
 msgstr "_Post-til-felt"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:52
 msgid "_To Field"
 msgstr "_Til-felt"
 
-#: ui/evolution-signature-editor.xml.h:1
+#: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "L_ukk"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
-#: ui/evolution-signature-editor.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
 msgstr "Lagre og l_ukk"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Lagre aktiv fil og lukk vinduet"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ../ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Legg til mappe på listen over abonnerte mapper"
 
-#: ui/evolution-subscribe.xml.h:2
+#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "M_appe"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Les listen på nytt"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ../ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Les mappelisten på nytt"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ../ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Fjern mappe fra din liste over abonnerte mapper"
 
-#: ui/evolution-subscribe.xml.h:7
+#: ../ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ../ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
-#: ui/evolution-tasks.xml.h:3
+#: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopier valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:5
+#: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:7
+#: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Slett fullførte oppgaver"
 
-#: ui/evolution-tasks.xml.h:8
+#: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
-#: ui/evolution-tasks.xml.h:9
+#: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "Mer_k som fullført"
 
-#: ui/evolution-tasks.xml.h:10
+#: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Merk valgte oppgaver som fullført"
 
-#: ui/evolution-tasks.xml.h:12
+#: ../ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgave fra utklippstavlen"
 
-#: ui/evolution-tasks.xml.h:13
+#: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Forhåndsviser listen over oppgaver som skal skrives ut"
 
-#: ui/evolution-tasks.xml.h:16
+#: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Skriv ut denne listen over oppgaver"
 
-#: ui/evolution-tasks.xml.h:18
+#: ../ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
 msgstr "Vis valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
 msgstr "_Åpne oppgave"
 
-#: ui/evolution.xml.h:1
+#: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Om Evolution..."
 
-#: ui/evolution.xml.h:2
+#: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Endre innstillinger for Evolution"
 
-#: ui/evolution.xml.h:3
+#: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
 msgstr "Endre synlighet for verktøylinjen"
 
-#: ui/evolution.xml.h:6
+#: ../ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Opprett et nytt vindu som viser denne mappen"
 
-#: ui/evolution.xml.h:7
+#: ../ui/evolution.xml.h:7
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons and text"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ../ui/evolution.xml.h:9
 msgid "Display window buttons with icons only"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ../ui/evolution.xml.h:10
 msgid "Display window buttons with text only"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:11
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:12
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:13
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Glem passor_d"
 
-#: ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:15
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Glem alle passord slik at du vil bli spurt om å oppgi dem igjen"
 
-#: ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:16
 msgid "Hide window buttons"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:17
 msgid "Icons _and text"
 msgstr "Ikoner _og tekst"
 
-#: ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:20
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:21
 msgid "Pi_lot Settings..."
 msgstr "Innstillinger for pi_lot..."
 
-#: ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "_Brukervalg"
 
-#: ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr "Send kølagte oppføringer og hent nye oppføringer"
 
-#: ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:25
 msgid "Set up Pilot configuration"
 msgstr "Konfigurer Pilot"
 
-#: ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbeidsmodus."
 
-#: ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:31
 msgid "Tool_bar"
 msgstr "_Verktøylinje"
 
-#: ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar style"
 msgstr "S_til for verktøylinje"
 
-#: ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:33
 msgid "Window B_uttons"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:41
 msgid "_Hide buttons"
 msgstr ""
 
-#: ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:42
 msgid "_Icons only"
 msgstr "Kun _ikoner"
 
-#: ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:43
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:45
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:46
 msgid "_Send / Receive"
 msgstr "_Send / motta"
 
-#: ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr "Kun _tekst"
 
-#: ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:50
 msgid "_Window"
 msgstr "_Vindu"
 
-#: views/addressbook/galview.xml.h:1
+#: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Etter _firma"
 
-#: views/addressbook/galview.xml.h:2
+#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "_Adressekort"
 
-#: views/addressbook/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
 msgid "_Phone List"
 msgstr "_Telefonliste"
 
-#: views/calendar/galview.xml.h:1
+#: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
 msgstr "Uk_evisning"
 
-#: views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
 msgstr "_Dagvisning"
 
-#: views/calendar/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "_Listevisning"
 
-#: views/calendar/galview.xml.h:4
+#: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Månedsvisning"
 
-#: views/calendar/galview.xml.h:5
+#: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "Ar_beidsukevisning"
 
-#: views/mail/galview.xml.h:1
+#: ../views/mail/galview.xml.h:1
 msgid "As _Sent Folder"
 msgstr "Som _Sendt-mappe"
 
-#: views/mail/galview.xml.h:2
+#: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
 msgstr "Etter s_tatus"
 
-#: views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr "Etter avse_nder"
 
-#: views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:4
 msgid "By Su_bject"
 msgstr "Etter _emne"
 
-#: views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
 msgstr "Etter opp_følgingsflagg"
 
-#: views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:6
 msgid "_Messages"
 msgstr "_Meldinger"
 
-#: views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "Med ferdig-dato"
 
-#: views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
 msgstr "Med _status"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr "UTC"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>Time Zones</b>"
 msgstr "<b>Tidssoner</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "<b>_Selection</b>"
 msgstr "<b>_Utvalg</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Velg en tidssone"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-#, fuzzy
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid "TimeZone Combobox"
-msgstr "Tidssone "
+msgstr "Komboboks for tidssone"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -17001,357 +17199,547 @@ msgstr ""
 "tidssone.\n"
 "Bru høyre musknapp til å zoome ut."
 
-#: widgets/menus/gal-view-menus.c:292
+#: ../widgets/menus/gal-view-menus.c:292
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
-#: widgets/menus/gal-view-menus.c:360
+#: ../widgets/menus/gal-view-menus.c:360
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning..."
 
-#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
-#, fuzzy
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous Button"
-msgstr "Forrige"
+msgstr "Forrige knapp"
 
-#: widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Månedskalender"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1123
+#: ../widgets/misc/e-calendar-item.c:1123
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:444
 msgid "Now"
 msgstr "Nå"
 
-#: widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen må skrives inn på formatet: %s"
 
-#: widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "Sentral-europeisk"
 
-#: widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "Gresk"
 
-#: widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "Japansk"
 
-#: widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "Koreansk"
 
-#: widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "Vest-europeisk"
 
-#: widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Western European, New"
 msgstr "Vest-europeisk, ny"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "Tradisjonell"
 
-#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Forenklet"
 
-#: widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr "Synlig"
 
-#: widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:171
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukjent tegnsett: %s"
 
-#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:216
+#: ../widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Tegnkoding"
 
-#: widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
 msgstr "Skriv inn tegnsett som skal brukes"
 
-#: widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "Andre..."
 
-#: widgets/misc/e-clipped-label.c:111
+#: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:313
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:313
 msgid "Date and Time Entry"
-msgstr "Dato & klokkeslett"
+msgstr "Felt for dato & klokkeslett"
 
-#: widgets/misc/e-dateedit.c:332
+#: ../widgets/misc/e-dateedit.c:332
 msgid "Text entry to input date"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:333
+#: ../widgets/misc/e-dateedit.c:333
 msgid "Text Date Entry"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:350
+#: ../widgets/misc/e-dateedit.c:350
 msgid "Click this button to show a calendar"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:351
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:351
 msgid "Date Button"
-msgstr "Dato sendt"
+msgstr "Datoknapp"
 
-#: widgets/misc/e-dateedit.c:371
+#: ../widgets/misc/e-dateedit.c:371
 msgid "Combo box to select time"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:372
+#: ../widgets/misc/e-dateedit.c:372
 msgid "Time Combo Box"
 msgstr ""
 
-#: widgets/misc/e-error.c:84 widgets/misc/e-error.c:85
-#: widgets/misc/e-error.c:127
+#: ../widgets/misc/e-error.c:84 ../widgets/misc/e-error.c:85
+#: ../widgets/misc/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: widgets/misc/e-error.c:86 widgets/misc/e-error.c:87
-#: widgets/misc/e-error.c:125
+#: ../widgets/misc/e-error.c:86 ../widgets/misc/e-error.c:87
+#: ../widgets/misc/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution advarsel"
 
-#: widgets/misc/e-error.c:124
+#: ../widgets/misc/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution informasjon"
 
-#: widgets/misc/e-error.c:126
+#: ../widgets/misc/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution spørring"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:436
+#: ../widgets/misc/e-error.c:438
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr "<span weight=\"bold\">Intern feil, ukjent feil «%s» etterspurt</span>"
 
-#: widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Utvidet"
 
-#: widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Om utvideren er utvidet eller ikke"
 
-#: widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Tekst for utviderens etikett"
 
-#: widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Bruk understreking"
 
-#: widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
 
-#: widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Mellomrom mellom etiketten og barnet"
 
-#: widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Etikettkomponent"
 
-#: widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "En komponent som vises i stedet for den vanlige utvideretiketten"
 
-#: widgets/misc/e-expander.c:222
+#: ../widgets/misc/e-expander.c:222
 msgid "Expander Size"
 msgstr "Størrelse på utvider"
 
-#: widgets/misc/e-expander.c:223
+#: ../widgets/misc/e-expander.c:223
 msgid "Size of the expander arrow"
 msgstr "Størrelse på utviderpilen"
 
-#: widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indikatormellomrom"
 
-#: widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Mellomrom rundt utviderpilen"
 
-#: widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-filter-bar.c:195
 msgid "_Searches"
 msgstr "_Søk"
 
-#: widgets/misc/e-filter-bar.c:197
+#: ../widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr "Redigering av søk"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr "Lagre søk"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Lagre søk..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede søk..."
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_Avansert..."
 
-#: widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "Velg et bilde"
 
-#: widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:647
 msgid "World Map"
 msgstr "Verdenskart"
 
-#: widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:649
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
 msgstr ""
 
-#: widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Synkroniser med:"
 
-#: widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
 msgstr "Synkroniser private oppføringer:"
 
-#: widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:120
 msgid "Sync Categories:"
 msgstr "Synkroniser kategorier:"
 
-#: widgets/misc/e-search-bar.c:341
-#, fuzzy
+#. To translators: This is the accessibility name of
+#. the search bar's text entry widget
+#: ../widgets/misc/e-search-bar.c:343
 msgid "Search Text Entry"
-msgstr "Kun søkebase"
+msgstr "Felt for søketekst"
 
-#: widgets/misc/e-search-bar.c:545
+#: ../widgets/misc/e-search-bar.c:547
 msgid "_Search"
 msgstr "_Søk"
 
-#: widgets/misc/e-search-bar.c:551
+#: ../widgets/misc/e-search-bar.c:553
 msgid "_Find Now"
 msgstr "_Finn nå "
 
-#: widgets/misc/e-search-bar.c:552 widgets/misc/e-search-bar.c:934
+#: ../widgets/misc/e-search-bar.c:554 ../widgets/misc/e-search-bar.c:941
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: widgets/misc/e-search-bar.c:842
+#: ../widgets/misc/e-search-bar.c:645
+msgid "Search Type"
+msgstr "Type søk"
+
+#: ../widgets/misc/e-search-bar.c:849
 msgid "Item ID"
 msgstr "ID for oppføring"
 
-#: widgets/misc/e-search-bar.c:849
+#: ../widgets/misc/e-search-bar.c:856
 msgid "Subitem ID"
 msgstr "ID for underoppføring"
 
-#: widgets/misc/e-search-bar.c:856
+#: ../widgets/misc/e-search-bar.c:863
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:936
+#: ../widgets/misc/e-search-bar.c:943
 msgid "Find _Now"
 msgstr "Finn _nå "
 
+#: ../widgets/misc/e-send-options.c:505
+msgid "When de_leted:"
+msgstr "Når s_lettet:"
+
+#: ../widgets/misc/e-send-options.glade.h:1
+msgid "<b>Delivery Options</b>"
+msgstr "<b>Alternativer for levering</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:2
+msgid "<b>Replies</b>"
+msgstr "<b>Svar</b> "
+
+#: ../widgets/misc/e-send-options.glade.h:3
+msgid "<b>Return Notification</b>"
+msgstr "<b>Returvarsling</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:4
+msgid "<b>Status Tracking</b>"
+msgstr "<b>Statusoppfølging</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:5
+msgid "A_uto-delete sent item"
+msgstr "Slett sendt-oppføring a_utomatisk"
+
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "C_lassification"
+msgstr "K_lassifisering"
+
+#: ../widgets/misc/e-send-options.glade.h:7
+#, fuzzy
+msgid "Creat_e a sent item to track information"
+msgstr "Hent siste informasjon om oppgaven"
+
+#: ../widgets/misc/e-send-options.glade.h:8
+msgid "Deli_vered and opened"
+msgstr "Le_vert og åpnet"
+
+#: ../widgets/misc/e-send-options.glade.h:9
+msgid "Gene_ral Options"
+msgstr "Gene_relle alternativer"
+
+#: ../widgets/misc/e-send-options.glade.h:10
+msgid ""
+"None\n"
+"Mail Receipt"
+msgstr ""
+"Ingen\n"
+"E-postkvittering"
+
+#: ../widgets/misc/e-send-options.glade.h:12
+msgid ""
+"None\n"
+"Mail Receipt\n"
+msgstr ""
+"Ingen\n"
+"E-postkvittering\n"
+
+#: ../widgets/misc/e-send-options.glade.h:15
+msgid ""
+"Public\n"
+"Private\n"
+"Confidential\n"
+msgstr ""
+"Offentlig\n"
+"Privat\n"
+"Konfidensiell\n"
+
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "R_eply requested"
+msgstr "Svar for_espurt"
+
+#: ../widgets/misc/e-send-options.glade.h:21
+msgid "Sta_tus  Tracking"
+msgstr "Sta_tusoppfølging"
+
+#: ../widgets/misc/e-send-options.glade.h:22
+msgid ""
+"Undefined\n"
+"High\n"
+"Standard\n"
+"Low"
+msgstr ""
+"Udefinert\n"
+"Høy\n"
+"Standard\n"
+"Lav"
+
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "W_ithin"
+msgstr "_Innen"
+
+#: ../widgets/misc/e-send-options.glade.h:27
+msgid "When acce_pted: "
+msgstr "Når go_dtatt: "
+
+#: ../widgets/misc/e-send-options.glade.h:28
+msgid "When co_mpleted:"
+msgstr "Når full_ført:"
+
+#: ../widgets/misc/e-send-options.glade.h:29
+msgid "When decli_ned:    "
+msgstr "Når _avslått:"
+
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_After:"
+msgstr "_Etter:"
+
+#: ../widgets/misc/e-send-options.glade.h:31
+msgid "_All information"
+msgstr "_All informasjon"
+
+#: ../widgets/misc/e-send-options.glade.h:32
+#, fuzzy
+msgid "_Delay message delivery"
+msgstr "Behold meldinger på tjeneren"
+
+#: ../widgets/misc/e-send-options.glade.h:33
+msgid "_Delivered"
+msgstr "_Levert"
+
+#: ../widgets/misc/e-send-options.glade.h:35
+msgid "_Set expiration  date"
+msgstr "_Sett utløpsdato"
+
+#: ../widgets/misc/e-send-options.glade.h:36
+msgid "_Until:"
+msgstr "_Inntil:"
+
+#: ../widgets/misc/e-send-options.glade.h:37
+msgid "_When convenient"
+msgstr "_Når det passer"
+
+#: ../widgets/misc/e-send-options.glade.h:38
+msgid "_When opened:     "
+msgstr "_Når den åpnes:"
+
 #. system:ask-save-file-exists-overwrite primary
-#: widgets/misc/e-system-errors.xml.h:4
+#: ../widgets/misc/e-system-errors.xml.h:4
 msgid "File exists \"{0}\"."
 msgstr "Filen eksisterer «{0}»."
 
 #. system:ask-save-file-exists-overwrite secondary
-#: widgets/misc/e-system-errors.xml.h:6
+#: ../widgets/misc/e-system-errors.xml.h:6
 msgid "Do you wish to overwrite it?"
 msgstr "Vil du overskrive den?"
 
 #. system:no-save-file primary
-#: widgets/misc/e-system-errors.xml.h:9
+#: ../widgets/misc/e-system-errors.xml.h:9
 msgid "Cannot save file \"{0}\"."
 msgstr "Kan ikke lagre fil «{0}»."
 
 #. system:no-load-file primary
-#: widgets/misc/e-system-errors.xml.h:13
+#: ../widgets/misc/e-system-errors.xml.h:13
 msgid "Cannot open file \"{0}\"."
 msgstr "Kan ikke åpne filen «{0}»."
 
-#: widgets/misc/e-task-widget.c:208
+#: ../widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:213
+#: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
+#~ msgid "Address:"
+#~ msgstr "Adresse:"
+
+#~ msgid "Calendar:"
+#~ msgstr "Kalender:"
+
+#~ msgid "PO Box:"
+#~ msgstr "Postboks:"
+
+#~ msgid "State/Province:"
+#~ msgstr "Stat/provins:"
+
+#~ msgid "Title:"
+#~ msgstr "Tittel:"
+
+#~ msgid "This contact belongs to these categories:"
+#~ msgstr "Denne kontakten hører til disse kategoriene:"
+
+#~ msgid "Edit Contact Info"
+#~ msgstr "Rediger kontaktinfo"
+
+#~ msgid "Add to Contacts"
+#~ msgstr "Legg til i kontakter"
+
+#~ msgid "Print Setup"
+#~ msgstr "Skriveroppsett"
+
+#~ msgid "_Enable"
+#~ msgstr "_Aktiver"
+
+#~ msgid "Body does not contain"
+#~ msgstr "Kropp inneholder ikke"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Kropp eller emne inneholder"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Emne inneholder ikke"
+
+#~ msgid "Mailing _List"
+#~ msgstr "E-post_liste"
+
+#~ msgid "Ad_d"
+#~ msgstr "Le_gg til"
+
+#~ msgid "Delet_e"
+#~ msgstr "Sl_ett"
+
+#~ msgid "Edi_t"
+#~ msgstr "Red_iger"
+
 #~ msgid "contact's header: "
 #~ msgstr "topptekst for kontakt: "
 
@@ -19158,9 +19546,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Retrieving POP message %d"
 #~ msgstr "Henter POP-melding %d"
 
-#~ msgid "Leave messages on server"
-#~ msgstr "Behold meldinger på tjeneren"
-
 #~ msgid "Delete after %s day(s)"
 #~ msgstr "Slett etter %s dag(er)"
 
@@ -19509,9 +19894,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Close this item"
 #~ msgstr "Lukk denne oppføringen"
 
-#~ msgid "Delete this item"
-#~ msgstr "Slett denne oppføringen"
-
 #~ msgid "Preview the printed item"
 #~ msgstr "Forhåndsvisning av oppføring som skal skrives ut"
 
@@ -19578,9 +19960,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Cancel this task"
 #~ msgstr "Avbryt denne oppgaven"
 
-#~ msgid "Obtain the latest task information"
-#~ msgstr "Hent siste informasjon om oppgaven"
-
 #~ msgid "Re_fresh Task"
 #~ msgstr "O_ppdater oppgave"
 
@@ -19623,9 +20002,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Only locations within starting point"
 #~ msgstr "Kun lokasjoner innenfor startpunktet"
 
-#~ msgid "Search scope:"
-#~ msgstr "Søkeområde:"
-
 #~ msgid "Starting point and locations within it"
 #~ msgstr "Startpunkt og lokasjoner innenfor dette"
 
@@ -20194,9 +20570,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Path to the default contacts folder"
 #~ msgstr "Sti til forvalgt mappe for kontakter"
 
-#~ msgid "Path to the default mail folder"
-#~ msgstr "Sti til forvalgt e-postmappe"
-
 #~ msgid "Path to the default tasks folder"
 #~ msgstr "Sti til forvalgt oppgavemappe"
 
@@ -20579,9 +20952,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Deleting Mail"
 #~ msgstr "Sletter meldinger"
 
-#~ msgid "Filter Options"
-#~ msgstr "Alternativer for filter"
-
 #~ msgid "Labels and Colors"
 #~ msgstr "Etiketter og farger"
 
@@ -20627,9 +20997,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "_Default signature:"
 #~ msgstr "_Forvalgt signatur:"
 
-#~ msgid "_Full name:"
-#~ msgstr "_Fullt navn:"
-
 #~ msgid "_Identity"
 #~ msgstr "_Identitet"